ïnitial commit
Squashed commit of the following:

commit 67199b5c98b583c94cefec4ceba07142069e044b
Merge: 13db878 c86b7d2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun May 18 21:06:28 2014 +0200

    Merge remote-tracking branch 'hci/master'

commit c86b7d2482700d6972057e809195a51167846ee4
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat May 17 17:46:14 2014 +0200

    updated to scala 2.11

commit 13db878af1a8dfeb38e526cbb51b8ea436d0421a
Merge: 5268197 65f56d1
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 12 18:01:59 2014 +0200

    Merge remote-tracking branch 'hci/master'

    Conflicts:
    	src/simx/components/physics/jbullet/JBullet.scala

commit 65f56d13acb9a0763ef650f895bb0b15f925a7ee
Merge: 1dfe1bf 2b72f58
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun May 11 20:45:14 2014 +0200

    Merge branch 'origin/master'

commit 1dfe1bfc63eaf12c645682698fbc80acdf076fc5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun May 11 19:47:36 2014 +0200

    performance boost (emitting events per simulation step instead of per internal tick now)

commit e4f21869ac0fbe6e82351a50cac7f349706221f5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 9 14:16:30 2014 +0200

    implemented small example for enabling/disabling aspects

commit 21b55f90aa9ba42529d7e9746d98cdd06ff8ed74
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 9 13:03:37 2014 +0200

    beautifications

commit b287110b748c0093d26f24872ba170aa7f3531ba
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 8 22:38:44 2014 +0200

    fixed bug that could result in re-attached entities to be not simulated by the physics

commit 526819749db8b48a8b091a55ac0863aa151a5d81
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 7 23:23:51 2014 +0200

    fixed bug regarding reattaching entities (sometimes where not affected by gravity immediately)

commit 2b72f58c525d7276feeb776e1d3097ae021655a9
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Apr 29 15:29:17 2014 +0200

    Updated autogen onto package (jbullte)
    Fixed typos

commit 36e78c8e9bd161ed4df56bf190abc22b6ba29232
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Apr 24 17:49:22 2014 +0200

    updated structure

commit 456fd950d83c137108bbe4436839fdeb27a89f9d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 22 12:13:43 2014 +0200

    updates for integration

commit 2b85ab78b649d32459dc8eecb6a75a4235a27bc6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Apr 17 18:56:34 2014 +0200

    ...

commit a87fda264711a204520d9fbae7752ebab01ccd12
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun Apr 6 23:14:34 2014 +0200

    Component Aspect

commit f28890947fb01bea44b1e7944e3b54d0a9f4b452
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Jan 31 19:00:58 2014 +0100

    updated event system

commit 8088ec1da75f1ab2be21512fa8b8da8824d5822a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Jan 15 12:09:36 2014 +0100

    cleanup

commit 6fb601172d5845cb2779594583c7bd2d100de182
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun Dec 29 14:04:51 2013 +0100

    updated typeinfo to use grounded symbols only

commit e5deae33f3b90e9ed2b6bc16eedbc359aee07faf
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Dec 12 19:52:38 2013 +0100

    commit in between

commit 8005dbe9f9dd833700597d98a0a0d5383e8cd924
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Dec 9 20:09:58 2013 +0100

    update

commit 725916c6d7eaa8f4a1e0ce1e61b9ed387f08f794
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 29 20:05:02 2013 +0100

    added component config layer

commit e5133308ec803eeb7b7b511783efdfda28f08e78
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 28 22:05:43 2013 +0100

    cleanup

commit 2388d4b97e8708611ca231a9b7c8ec55befc6334
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 21 20:13:15 2013 +0100

    more on component entities

commit a9669fb536f94eeac41c658aee878d0f4dff2da1
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 30 10:48:05 2013 +0200

    upgrade

commit 713a9a1dc4e0b062c05b01e506c107a4cb283de8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Sep 27 13:40:57 2013 +0200

    merge

commit 248c5d784f39a8ca8024bb66fabe7d71f130be68
Merge: ad70c3c f84c099
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Sep 27 13:39:59 2013 +0200

    Merge branch 'scala-2.10-upgrade'

commit ad70c3cbc83c68b687f449e42a8308a64545ce4e
Merge: fd76fc2 fc25ad8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Sep 27 13:39:55 2013 +0200

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet

    Conflicts:
    	src/simx/components/physics/jbullet/JBullet.scala

commit f84c099abdf7221050a84855a2f80bcca4a0e20c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 2 15:44:26 2013 +0200

    updated settings

commit 9713902cef6759f6df8f3b4b05529ba93de48ace
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 12:21:03 2013 +0200

    more cleanup

commit b8f392d87747f23585e36baf3a919420edb61396
Merge: 7e37b81 fc25ad8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 11:52:48 2013 +0200

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet into scala-2.10-upgrade

    Conflicts:
    	src/simx/components/physics/jbullet/JBullet.scala

commit 7e37b810924625e245c644e3c2c6dbc8791802d2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 10:39:30 2013 +0200

    cleanup

commit fc25ad875bbe490fab2bf72a6832535096f2b03f
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Aug 26 16:47:58 2013 +0200

    Updated SValSet

commit fd76fc2d321bc5d65babf84246a615c42dd6f0f6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Aug 9 09:53:16 2013 +0200

    finished updated to scala 2.10

commit 2b56ab6339cea2a54962540b13184e036a26ea90
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 7 18:43:59 2013 +0200

    scala 2.10 again

commit cde7eb42c8f578dc8f8ce25cce91459dedb0a372
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 5 17:51:20 2013 +0200

    updated to scala 2.10.2

commit aaa6df023309da783c538917e931d19676ea8476
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 5 17:51:10 2013 +0200

    updated to scala 2.10.2

commit 9810d6a389cd345740eccfc179723e8e0f1a86c7
Merge: ce5346f 9e44235
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 14 00:34:57 2013 +0200

    Merge branch 'master' of ssh://trinity/var/git/projects/siris-modules/components/physics/jbullet

commit ce5346f0d90300828cdb468ec8bff7e89610058e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:51:42 2013 +0200

    updated svallist to svalset

commit 9e442359596f9c1406302d83c24bbedceb466fee
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:51:42 2013 +0200

    updated svallist to svalset

commit f78d4912ad01416344f495bb02390b7c369cd4c1
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 9 15:57:13 2013 +0200

    Merge branch 'github-release' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet

    Conflicts:
    	src/simx/components/physics/jbullet/JBullet.scala
    	src/simx/components/physics/jbullet/JBulletColladaLoader.scala
    	src/simx/components/physics/jbullet/JBulletConverters.scala
    	src/simx/components/physics/jbullet/JBulletCreateParameter.scala
    	src/simx/components/physics/jbullet/JBulletDiscreteDynamicsWorld.scala
    	src/simx/components/physics/jbullet/JBulletMath.scala
    	src/simx/components/physics/jbullet/JBulletMessages.scala
    	src/simx/components/physics/jbullet/JBulletRigidBody.scala
    	src/simx/components/physics/jbullet/types/Types.scala

commit f0b9e423f8d37cbe904ded668a8312e2ca14e1fc
Merge: a3c147b c59b0e3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 9 15:57:13 2013 +0200

    Merge branch 'github-release' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet

    Conflicts:
    	src/simx/components/physics/jbullet/JBullet.scala
    	src/simx/components/physics/jbullet/JBulletColladaLoader.scala
    	src/simx/components/physics/jbullet/JBulletConverters.scala
    	src/simx/components/physics/jbullet/JBulletCreateParameter.scala
    	src/simx/components/physics/jbullet/JBulletDiscreteDynamicsWorld.scala
    	src/simx/components/physics/jbullet/JBulletMath.scala
    	src/simx/components/physics/jbullet/JBulletMessages.scala
    	src/simx/components/physics/jbullet/JBulletRigidBody.scala
    	src/simx/components/physics/jbullet/types/Types.scala

commit c59b0e343af4efa6ab0ea7d02817d9a3b89508b8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Mar 28 23:57:17 2013 +0100

    initial_commit

commit a3c147b4c056938c68eb11cddc0ee4a697e2dace
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Mar 22 10:33:37 2013 +0100

    Cleand up

commit e7f82360f58b8db8eae8436a4fda980ed29aae5c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Mar 20 18:07:03 2013 +0100

    changes on converter definition

commit d52002ff418f467746f0c87930162f7c0ed9b16a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 18:11:47 2013 +0100

    added jbullet srcs

commit a23015f8465d872ca0a9bc2c2cb4b2e4619b8053
Merge: accd51f ce5cdd7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 16:03:15 2013 +0100

    Merge branch 'akka-migration-dennis'

    Conflicts:
    	src/simx/components/physics/jbullet/JBullet.scala

commit ce5cdd728f39664a984dd172853757e2106db979
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 10:50:28 2013 +0100

    set java to project sdk, one should not have to set the java version to use per module but per project

commit cfe4e051d6fca0d00e01e018c32ee75edbe10a00
Merge: 3d09d6f 5e8dcf3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 10:40:08 2013 +0100

    Merge branch 'akka-migration-dennis' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet into akka-migration-dennis

commit 3d09d6f735860cc654373d7a3b8bad7185b3a2a6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 10:39:56 2013 +0100

    renamings

commit 5e8dcf373109b804b6b8bee4a3a849f962113488
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Mar 7 09:38:11 2013 +0100

    - Fixed library

commit accd51f34f097b5d74db4dcb8f8e42d4b63b25cd
Merge: 616c4a9 9d4ca4a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 5 19:05:54 2013 +0100

    Merge remote-tracking branch 'refs/remotes/origin/master' into HEAD

commit a3a82af44c03e47250a8aa661dc657e38a69fa7e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 27 21:49:27 2013 +0100

    started switch to akka

commit 9d4ca4a6dc3cf2618b20ec0afb4d39251c5eb3bb
Merge: 5db92c4 f788cea
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:34:10 2013 +0100

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet

commit 5db92c445b8bd1c26662e6dc553b6683f31ac812
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:27:51 2013 +0100

    - changes

commit f788cea7451f33a1ff7eb9b998111118852416fb
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 19 17:05:43 2013 +0100

    Removed scala version dependency in sbt output path and in .iml files

commit 57e614c765c1e466cf2b5e68a6330a0f5f090bf1
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 19 16:00:33 2013 +0100

    Removed hard wired scalaVersion from sbt files.
    The sbt version is now configurable in the main Build.scala and referenced in the local .sbt files.

commit 616c4a94729a20c880ba60ac2322f18a6565ec7b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Feb 15 18:20:37 2013 +0100

    worked on annotations

commit ffd9f4dcc62e3ace10c4fa4a4a84745abb271102
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Feb 15 11:43:12 2013 +0100

    new types

commit df4e58b4f4593a2f4a42697f8972b18018ea107e
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Feb 14 17:29:11 2013 +0100

    Added constructor

commit 6df834f40de5cae3ce8f35df54cf31df2cdc11d8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Jan 19 17:15:35 2013 +0100

    fixed timing issue

commit 6505d58bd49a95bcd5349decaac78166050719c0
Merge: 3ad7011 f939790
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Dec 18 17:56:57 2012 +0100

    Merge branch 'master' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet

commit 3ad70113f7b7d206c2d77315af7bcaa9c8f30bba
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Dec 4 17:52:51 2012 +0100

    renamings according to renamings in core

commit f939790d15a59ae1dad05dcfa061d7a51ce4a6a8
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 29 19:33:19 2012 +0100

    - Temporary fix for loading assets. All information from the collada file are divided by 10.0 to fix the cm dm bug

commit 866f4e46b693c3e7f35eabb124c775e60de1f2b6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 15 15:37:22 2012 +0100

    removed imports

commit 4ffceddacc3701e3a4d567013d3c21d152dd8c74
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Oct 21 12:33:18 2012 +0200

    - Removed plugable sync layer

commit 561879bb53582330913e20d0a721a608d98b4dc5
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 19 09:51:45 2012 +0200

    - Renamed package from siris to simx

commit e78e9e2643e248f58eb795effc5a4afe141f58c9
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Oct 14 13:16:01 2012 +0200

    -Using execution strategy

commit 6df37b2f68719ab2b1f6caf1eabeb4b057d7c339
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sat Oct 13 21:04:13 2012 +0200

    - Removed TimeMeasurement Trait

commit e423778c0e55bea42685b1d582af559e2294d477
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 23:38:53 2012 +0200

    Removed TimeMeasure Trait

commit 040c53d9d285b8b4103287ce61e98b28fb882a5c
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 16:19:20 2012 +0200

    - Removed SVarActorLW

commit caf68135b9804d383dffd71c65a6d258636eded1
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 15:44:51 2012 +0200

    - Removed SVarActorHW and SVarActorImpl

commit ea7f765c1c414de3e9bb42790ae56f371905d6e6
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 14:37:31 2012 +0200

    - Using the complete function

commit 3761683de6a861876d73c59ba8db0ce73ceb3289
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 11:10:28 2012 +0200

    - Removed JBullet specific simulation message and implemented new component interface function

commit 4cda7da900407be9376b5598da5c54ff24d90c84
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Oct 10 11:48:40 2012 +0200

    - Restructured libraries

commit 19a015afa5860af0d5c31c5cbc152901da5da82e
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sat Sep 22 15:10:08 2012 +0200

    - libraries

commit 4d4416d9c8a3de9a70fd530910f9b95af0dbdfae
Merge: 391d40d 069ed42
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Sep 1 01:05:39 2012 +0200

    Merge branch 'simthief-repair' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet

commit 391d40d1eb43af2296b3780f58b01de947e92f66
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 16:43:48 2012 +0100

    ...

commit 069ed42775fcb4c13ea35385aa363d154b0af99c
Merge: d298434 99df93f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Aug 24 11:32:20 2012 +0200

    Merge branch 'simthief-repair' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet into simthief-repair

commit d298434026d303265d1a330ab0a67502636657da
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Aug 24 11:32:03 2012 +0200

    added geometric flight hotfix for ghosts

commit 99df93f4ee250c931ea3b1624327c05ac398125b
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Jul 30 14:29:07 2012 +0200

    Removed sbt temp files

commit f4e2cf57c7ee65460eca21e9cd5900dfffc906a5
Merge: 1fe134a b895df2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Jun 27 15:44:51 2012 +0200

    Merge branch 'simthief-repair' of ssh://trinity.informatik.uni-wuerzburg.de/var/git/projects/siris-modules/components/physics/jbullet into simthief-repair

commit 1fe134a1137764cc119541ed091fc12e688b66ae
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Jun 27 15:44:33 2012 +0200

    added jbullet doc

commit b895df2470f10aed4b5f49d6583763f88482f458
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Jun 27 15:39:24 2012 +0200

    Fixed ignoredWriters bug and some more

commit 05eefaaf10233225b8ad85f4020138a36eef2a98
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Jun 26 10:46:56 2012 +0200

    adjusted physics package

commit 4a44ec7188b6aaf6baaa603b3ff43d412e8ef3d1
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Jun 22 15:29:29 2012 +0200

    cleanup

commit 1cdc0b8c8be47326514839deab699857d1821043
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 22 12:40:07 2012 +0200

    Revert "..."

    This reverts commit 42c1a1cf6ad2041212e22daa16c0bf1ec294a63f.

commit 3760b860fa14fea3bef2feae96b4bd45f37d2eeb
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 21 09:11:32 2012 +0200

    added implicits to svar methods

commit f77178aa83e54429789c85681af27e289c024ced
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 18 17:09:02 2012 +0200

    simthief compiles again

commit 42c1a1cf6ad2041212e22daa16c0bf1ec294a63f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 16:43:48 2012 +0100

    ...

commit e2c216a6f8e6e9d8e3cedd3772a115c47de5b126
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Feb 15 14:44:24 2012 +0100

    Revert "reinserted EntityCreation component (commented out by stephan)"

    This reverts commit 1093d11ef319bf2f71afdfc8d36bbd2a7596788c.

commit 1093d11ef319bf2f71afdfc8d36bbd2a7596788c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 13:47:35 2012 +0100

    reinserted EntityCreation component (commented out by stephan)

commit 2f422903fb0df03312849181084c67be90ced590
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Feb 14 10:08:07 2012 +0100

    made jbullet component compile again

commit 490c9d155186f596c51119a1bf2e981aff607544
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Feb 13 17:53:07 2012 +0100

    Changed API

commit 8c2c9fd0689f1d5291f9316c3c0985f3e4c59fd1
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Dec 12 22:13:33 2011 +0100

    - Removed my debug println's

commit 75eb230fafc8be25916205ce97e274c74b86355e
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Dec 7 14:59:39 2011 +0100

    - Version4 API

commit 09021446e83c31a1031b5e38ee51263d704fc00e
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Tue Dec 6 18:57:47 2011 +0100

    - Some changes

commit e4387a97f005f5d312ecee3d562c312df54f8816
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 25 13:27:28 2011 +0100

    - Fix for new API structure

commit 3df183153383a07caf6426320b28f491491a11b5
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 18 16:51:03 2011 +0100

    - runnable

commit 2d345fe823c35965d83f6f834c9b528a742e7115
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 22:06:34 2011 +0100

    fixed-paths

commit 4107571c999153e94a7ed6462a52e222f3af4bf0
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 21:48:38 2011 +0100

    sbt 0.11.1 now

commit 621f218251175f86f8855ec64264fae4672bbbbd
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Nov 14 17:59:35 2011 +0100

    ...

commit 8837a1b5b72ba1151ea6e3f2fbba275ee5ba1c93
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Nov 14 15:40:02 2011 +0100

    - Commit before branch

commit 00d18e3674d7a2b9bf6bf2286784332169152d01
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Nov 12 10:11:12 2011 +0100

    .

commit b45828d8e33da9ead93659f4fe74d5ec81193110
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Nov 12 09:30:13 2011 +0100

    .

commit 9ed0a87a19c122f73cb50347f9cf9722dabec66b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 15:22:02 2011 +0100

    ...

commit 17e85deca1107ca352141132ba1ed85528925aae
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 15:08:01 2011 +0100

    .

commit ce172f5e2ba294f5787d199bef3379349e26707d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 14:54:33 2011 +0100

    added app configs

commit 7e973ce0ddbd562296be5404be504bd023c13299
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 14:44:15 2011 +0100

    added app configs

commit ffa94095914d8f80e4599e9d62cad67b121b4fa8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 12:08:19 2011 +0100

    .

commit 93736033ac4127f969ae26ae2750294dab436b21
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 12:01:16 2011 +0100

    more settings

commit 5d95a2ef2e8407d9e151bce705886835760342a6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 11:32:11 2011 +0100

    more settings

commit 59e384f09c0b4af7d24ef61e627151e4c6300457
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 11:23:12 2011 +0100

    more settings

commit ff330c6936769027b83ed84cf2c9a2cca5c219e3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 10:29:02 2011 +0100

    more settings

commit 39e49640bf36569ff0660fb14a27082d56b61de3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 11 09:46:13 2011 +0100

    .
updated to current production version
Merge remote-tracking branch 'origin/master' into github-release

Conflicts:
	build.sbt
	jbullet.iml
	src/simx/components/physics/jbullet/JBullet.scala
	src/simx/components/physics/jbullet/JBulletColladaLoader.scala
	src/simx/components/physics/jbullet/JBulletConverters.scala
	src/simx/components/physics/jbullet/JBulletCreateParameter.scala
	src/simx/components/physics/jbullet/JBulletMessages.scala
	src/simx/components/physics/jbullet/JBulletRigidBody.scala