ïnitial commit
Squashed commit of the following:

commit dbaea99caaa14c7e48992952b4e74a366f9e4d53
Merge: b56012c eaf43d8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun May 18 21:07:38 2014 +0200

    Merge remote-tracking branch 'hci/master'

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

    updated to scala 2.11

commit b56012c57db95de28ded8f1d3e426963a2601e55
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 14 14:23:15 2014 +0200

    readded enabled/disabled state for JVRPickEvent

commit 659bc278a7a6705d31d5b611f1162d67bbe0c4e4
Merge: cc42542 7ee934e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 12 18:04:20 2014 +0200

    Merge remote-tracking branch 'hci/master'

    Conflicts:
    	src/simx/components/renderer/jvr/JVRRenderActor.scala

commit 7ee934eab398129d0db789913607d456a211f91b
Merge: cf246c0 9f826a0
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun May 11 20:49:43 2014 +0200

    Merge branch 'origin/master'

    Conflicts:
    	src/simx/components/renderer/jvr/JVRRenderActor.scala

commit cf246c091eb9f92ba4278b58b0c1812596aba3b3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun May 11 17:56:57 2014 +0200

    moved pick ray into renderactors thread to avoid concurrentmodification exceptions

commit 522058962d506d27c588a365c138afa1ce203f26
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat May 10 23:54:10 2014 +0200

    removed (by comment) presumably unneccessary call to publish event

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

    beautifications

commit 9d958b20b442212a64797589d53c56ed00e9bd7f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 8 22:37:41 2014 +0200

    fixed bug that could have prohibited reuse of entitydescriptions

commit cc4254242a4163458947f805af456ae26fdebd53
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 7 23:21:33 2014 +0200

    modified pickray behaviour

commit 63ad39803f22694bcb6690f5f6cfbd669c3025a7
Merge: ed39abd cfe3afb
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 7 18:22:35 2014 +0200

    Merge branch 'master' of win9148.informatik.uni-wuerzburg.de:hci/simx-jvr

commit ed39abd825a5eb4e7c2d04423fa19491602579ba
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 7 18:20:32 2014 +0200

    added picking

commit 18a32d2149b806bc926f578a2f961dabcacc2802
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 7 18:18:19 2014 +0200

    added pick ray events

commit 9f826a0c0ce8c2537d72818a33fac32b923f2d23
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Apr 29 13:58:22 2014 +0200

    Updated to generated ontology package

commit 54cdcf458721f561a7f9c4230f62fc0a51f21304
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Apr 28 15:22:34 2014 +0200

    adjusted to new core

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

    updated structure

commit 406828019697cf1c05644c76a41b7160bebdfb95
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Apr 24 14:44:06 2014 +0200

    updated structure

commit 2e28da30c16a6a8fcdfba9c0d5cd23947d1a3aa9
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Apr 23 19:15:35 2014 +0200

    update

commit fd715268b45f5cb0847719328b1acb9e30138ba7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Apr 23 18:29:39 2014 +0200

    reverted previous commit

commit dafa3c25d3e7996b6cb6f02f01565a97584075a7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Apr 23 14:11:23 2014 +0200

    intermediate push (will have to be reverted later)

commit 7e929006cf7ff69ed928a9dbbbdec08211b9d8f6
Merge: 35cbcc6 cfe3afb
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 22 19:18:14 2014 +0200

    Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/components/renderer/jvr into unifiedaccess

commit cfe3afbcc9bfae32ffb9ee5ab124e322fbd9653d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 22 19:06:23 2014 +0200

    fixed rendering for new imacs

commit 35cbcc637f0ffb00785789bb30689e40497af10b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 22 12:12:27 2014 +0200

    updates for integration

commit 231f2bae00677a4594333aceb92357e2630e90ac
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Apr 3 22:18:02 2014 +0200

    Fixed bugs

commit 71cca79627754e05e55b23fed0d30ae39fe35658
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Jan 20 13:46:24 2014 +0100

    Updated to jogl 2.1.3

commit 98081505b4df47ece9fdd4ca97bbbf0c80c87392
Merge: 2a7f386 4817cfd
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Jan 15 12:09:11 2014 +0100

    Merge branch 'master' of ssh://hci.uni-wuerzburg.de/var/git/projects/siris-modules/components/renderer/jvr

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

    cleanup

commit 4817cfd7b4e06b1d021612511327459bbcf8eebb
Author: Anke Giebler-Schubert <anke.giebler-schubert@stmail.uni-bayreuth.de>
Date:   Tue Jan 14 16:25:47 2014 +0100

    Added Mesh support

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

    updated typeinfo to use grounded symbols only

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

    commit in between

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

    update

commit 30edc85eabffcf4a45b9f8ed8ddd525901484616
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Dec 4 00:25:21 2013 +0100

    cleanup

commit 0cc2bce691da701ceda450fa5b7412aacb51652f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Nov 29 20:04:16 2013 +0100

    added component config layer

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

    cleanup

commit 9535dd162658d8006936b1676d527b9b3f61491b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 28 17:26:42 2013 +0100

    fixed import

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

    more on component entities

commit fe4a0094243d55f344e47b5d4bda8cac59cb5c7d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 21 11:57:09 2013 +0100

    prepared component entity support

commit 696b9d449da4000f7a3cd1a6f17d95a9f7d07879
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 20 19:21:39 2013 +0100

    cleanup in component section

commit 5136e5a9860dc24a2c3db38d73ba952763713bd6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Nov 11 18:22:04 2013 +0100

    went back to jogl 2.1.0 since 2.1.1 didn't work on mac

commit e1e86fbc78556d160d236ef18bb4dc5739f4f42b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Oct 28 11:02:40 2013 +0100

    update to jogl 2.1.1

commit 1a4b6b68b9cb8cd132e7e4b70a458beb0131c013
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Oct 21 16:29:04 2013 +0200

    update

commit 963b0382ca21e32e21fad7a19746294840584e1e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Oct 18 11:49:33 2013 +0200

    added continuations-get

commit e4a512e223064e00ca98fd472a20a76de186b826
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Oct 14 09:41:20 2013 +0200

    configured renderer settings to work with multiple graphics cards (stereo)

commit 8ddaa4ff4726641d2211060b96612e418d81fd7f
Merge: eb96dd4 f9e3617
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 23 11:09:53 2013 +0200

    Merge branch 'origin/scala-2.10-upgrade'

    Conflicts:
    	src/simx/components/renderer/jvr/JVRRenderActor.scala

commit eb96dd4576942b803faa4dcdddb16f7e954581ff
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 23 10:04:25 2013 +0200

    ...

commit f9e3617ba8220e43daf80bd8c9aee710534d80dc
Author: Bacon <Bacon@butchery.com>
Date:   Thu Sep 19 02:34:47 2013 +0200

    added support for playerhit

commit ff0fa4ec2008e402c43615edf9b728bec48d5973
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Sep 16 15:59:12 2013 +0200

    Restored jVR.jar

commit 16ee5048f3ba384c7af0eb3199b126caac2928b0
Author: Bacon <Bacon@butchery.com>
Date:   Mon Sep 16 14:32:50 2013 +0200

    Fixed bugs concerning simthief

commit ab728832e69784763c551c3eda87600ac74c4255
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun Sep 15 14:03:34 2013 +0200

    updated newtrenderwindow (testing)

commit 7080febe5d3b4d3cb9d7f5ec65a725c9eaa1d149
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Sep 14 01:46:16 2013 +0200

    adjustments for overlay rendering

commit 2a3af80c1b291881bcb09603c766d368a6b91a85
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Sep 12 15:40:10 2013 +0200

    calling display once to avoid strange images on screen

commit ae00a16efbcb8af846c901cf99dc0668f036e68f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 2 20:17:47 2013 +0200

    updated resourcemanager

commit 1f251459fd597f6b7e16a2dd92f09598fc333aa6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 2 15:42:30 2013 +0200

    changed std ambient light

commit 8a1343e234be9b0ed13f84e0317a384f8f4d73dd
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Sep 2 15:42:24 2013 +0200

    changed standard ambient light

commit 9a571614374b208cc35ab5d69e8a1c587ac49061
Merge: 5f753b0 9e28915
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Aug 30 17:19:49 2013 +0200

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

commit 5f753b02221737d00019ac8163635f40b31eb5e0
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Aug 29 12:44:45 2013 +0200

    further modifications for entity assigned shaders

commit 9e28915367c6ab82c02e95cb1feb49bc495e3028
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Aug 29 12:44:45 2013 +0200

    further modifications for entity assigned shaders

commit 2eeb199dd86ff16d4c86d15d8eed031556d7861c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 28 18:41:55 2013 +0200

    bugfix clone subtree

commit cf9fd301980578ebe8e13974d8427d5a656b987d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 28 18:19:57 2013 +0200

    added shader effect support (svars for shader materials)

commit d6a4951fb4203c4d77ae4ace71db830b1624d414
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 12:20:53 2013 +0200

    more cleanup

commit a1a43ae165e54fddf2477f186f95a80ca5f4f98c
Merge: 6d152c7 ede6e54
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 27 12:13:03 2013 +0200

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

    Conflicts:
    	src/simx/components/renderer/jvr/JVRConnector.scala
    	src/simx/components/renderer/jvr/JVRRenderActor.scala
    	src/simx/components/renderer/jvr/PostProcessingEffect.scala
    	src/simx/components/renderer/jvr/types/Types.scala

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

    cleanup

commit 5a2ec32b48795754a9793c2c7ca17853709de6e2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 26 18:07:38 2013 +0200

    updated jVR.jar (shadows are working again)

commit ede6e543f99df2e7dc81f0457ae7f00ecec24f17
Merge: 4a6bd59 723dd06
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Aug 26 16:47:49 2013 +0200

    Merge branch 'origin/siris-boardgame'

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

    Updated SValSet

commit 2a1c741f271035b96ad66663f622912dc83229f6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Aug 13 19:37:36 2013 +0200

    updated jvr.jar and fixed spotexponent bug in spotlight

commit 5e3d38d0888fc3d20d5c64339bccdaaa9f9b2ddc
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 12 11:12:23 2013 +0200

    cleanup

commit 9c1c53379ef7e8af7e3ef214c6ced7872aaf3899
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 12 09:43:26 2013 +0200

    cleanup

commit 44dde7391fd51dde5e9c97b6b0f51dedd6d2f8a2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 12 08:25:44 2013 +0200

    cleanup

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

    scala 2.10 again

commit 2a80f37f11d2b7370dea6f1ae94c2d217cba748d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 5 18:00:52 2013 +0200

    updated to scala 2.10.2

commit 723dd067caba4d0cb447d710c801b9ddc99d5aac
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Jun 27 15:48:20 2013 +0200

    Fixed bug fix

commit ff4a3c11520e80a71023ba269ce0959d5248c825
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Jun 27 15:45:57 2013 +0200

    Fixed bug

commit 7a47a7349c9233934f15d817d84aad672a11da67
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri May 31 12:13:56 2013 +0200

    Disbaled peroformance log on windows fullscreen

commit e4b7b4d3cef7eb8be91ea8474dd1cc1d6821ae56
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri May 31 00:57:22 2013 +0200

    Commented fix for concurrent modification error

commit 078b6e905d14df7875512b314669ec6659deb222
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu May 30 22:47:05 2013 +0200

    Optimized texture setter

commit de37a267522e3e07bb2903f39a8552ffeb127987
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon May 27 19:03:18 2013 +0200

    Fixed texture bug

commit 37de159b72c94907bc5c2decef00730f8d5f43d1
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun May 26 19:49:36 2013 +0200

    Optimized texture setting

commit ae00b23c8b9870e80842db19c91ec499714dd2cf
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sat May 25 18:12:12 2013 +0200

    Fixed mouse entity update bug:
    Mouse position was not updated while dragging.

commit 147a0b7c9f77aa63eadf8bc0b8776050cc956e88
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sun May 19 18:25:51 2013 +0200

    Added shader bindings for vec4f -> uniformVector4

commit 0acf2558cfce0e3ba21976c8cc0dc65463680bd1
Merge: b44552d e5d6d8d
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Sat May 18 18:10:16 2013 +0200

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

    Conflicts:
    	src/simx/components/renderer/jvr/ResourceManager.scala

commit b44552dfe39e75ad442ec2a66b79a9c1ecdf21ad
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri May 17 09:30:00 2013 +0200

    Fixed bug that occurd when changing a texture once immediatelly in entityCreationComplete in a contributing component

commit e5d6d8dc6f8040370353e2fd5efe6cc08973cc0c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 14 13:02:32 2013 +0200

    .

commit b82ecf662c13bff4a69365dfd61b193b7004974f
Merge: 17e6b23 a828487
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 14 10:34:31 2013 +0200

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

commit 17e6b239570a1c59e48e8c916d619c1b368e6e8b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 14 10:34:28 2013 +0200

    fixed RessourceManager

commit a828487e8c97caaf60bb50ae83a79e76a8c57f51
Merge: 2576595 1355bac
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 14 00:27:15 2013 +0200

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

commit 1355bacd41f80b6d0cbc58984c7cd2059d40843b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:50:55 2013 +0200

    inserted martins changes

commit 25765958b4a5576a0b67a9fd18ce423d369f2cb7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon May 13 15:50:55 2013 +0200

    inserted martins changes

commit 143b76ec1ba40b84fc563c258bb6e425bc5dc57e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 9 17:47:10 2013 +0200

    changed newt window (should be used under windows, not under osx, not vice versa)

commit 23d635b5be219fab41d85ec0dd0096514242ac4e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 9 17:47:10 2013 +0200

    changed newt window (should be used under windows, not under osx, not vice versa)

commit 6e0022193484506d28b617851d97280b597cbaa6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 9 13:54:42 2013 +0200

    beautifications

commit 6443aa4eac9435111279dd3daa87a7c154046829
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 9 13:54:42 2013 +0200

    beautifications

commit 9436ab8af870461e4f19e36631bcab6636cd37a5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 9 01:46:31 2013 +0200

    further ask improvements

commit 472125efae6bd1e86e35b7f97fcedc877741af20
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu May 9 01:46:31 2013 +0200

    further ask improvements

commit c303b23c4d619bd0dd485a48053fc9080a00ee48
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 8 18:51:25 2013 +0200

    adjusted resource manager

commit 84875577cea295f2167e5eaa8b622b5124aa5fbd
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed May 8 18:51:25 2013 +0200

    adjusted resource manager

commit 21f36f40fff438bae051817c2aa9ff815245cf74
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 3 14:24:51 2013 +0200

    Minor fixes

commit ea8bc06594e2078dbd183be43c8374866e0ca319
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 3 14:24:51 2013 +0200

    Minor fixes

commit c22db0108d83f9683cd8470d2814788d52625867
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Apr 30 14:35:04 2013 +0200

    Fixed merge Bugs

commit d0781ee75e9b80e32c3d845169cb177fc28bc528
Merge: 7400065 e8b551b
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Apr 30 13:14:52 2013 +0200

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

    Conflicts:
    	src/simx/components/renderer/jvr/JVRConnector.scala

commit a64d912e1aed291b38708d583d92f0818dd96e7e
Merge: 311696c d2bfcd0
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Apr 15 10:05:16 2013 +0200

    Merge commit 'd2bfcd029c356b62221bf8b1a8a56c0671a9bd23'

commit 14ef89a9da1b8dbc48fdf4cc691a2b1ad2d9b024
Merge: 21cdb15 d2bfcd0
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Apr 15 10:05:16 2013 +0200

    Merge commit 'd2bfcd029c356b62221bf8b1a8a56c0671a9bd23'

commit d2bfcd029c356b62221bf8b1a8a56c0671a9bd23
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Apr 15 10:05:08 2013 +0200

    added top-bottom stereo support

commit b2e1b55dbf640c498e30311f91b02d68f7f79c45
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Apr 10 01:09:35 2013 +0200

    removed references to old scala actors

commit 311696cc344a2caa12f61b02d652dc0c4a24d6db
Merge: e8b551b f65ec68
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 9 16:02:51 2013 +0200

    Merge remote-tracking branch 'refs/remotes/origin/github-release'

    Conflicts:
    	src/simx/components/renderer/jvr/JVRConnector.scala
    	src/simx/components/renderer/jvr/types/Types.scala
    	src/simx/components/renderer/jvr/types/package.scala

commit 21cdb15fc3270e636a195a579d54c597e41e1e7f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Apr 9 16:02:51 2013 +0200

    Merge remote-tracking branch 'refs/remotes/origin/github-release'

    Conflicts:
    	src/simx/components/renderer/jvr/JVRConnector.scala
    	src/simx/components/renderer/jvr/types/Types.scala
    	src/simx/components/renderer/jvr/types/package.scala

commit f65ec68546a5f23503a928ce2c1a58dea328b8e2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Mar 29 00:18:40 2013 +0100

    .

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

    initial_commit

commit 7400065e2435c76b90e2207d06c14a355be47f4c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Mar 28 13:15:02 2013 +0100

    fixed types

commit 4da81b230fd63ab7103d4c0e2c7989808e31d41d
Merge: 4cbb2c1 86241dd
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Mar 28 13:02:19 2013 +0100

    Merge commit '86241ddcef1aa6a07a5528bd2824d1b990300426' into siris-boardgame

    Conflicts:
    	src/simx/components/renderer/jvr/JVRRenderActor.scala
    	src/simx/components/renderer/jvr/types/Types.scala

commit e8b551b6d8755803e6a41a23f208a29f408b9bf8
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Mar 25 15:12:05 2013 +0100

    changed converter

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

    Cleand up

commit 74bf6eb956d7f2380b3ac5a2ff7dc732c2c4993f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Mar 20 18:06:50 2013 +0100

    changes on converter definition

commit 0a3fd92d4b9636089d333ab6fbd5d43da3abf898
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Mar 15 17:24:17 2013 +0100

    renamings

commit c99bd3714d574085aba6250d6df17e06fff1f671
Merge: 26d745b 093d5e2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 16:26:36 2013 +0100

    Merge branch 'akka-migration-dennis'

    Conflicts:
    	src/simx/components/renderer/jvr/JVRMessage.scala

commit 093d5e27cc2f2a58f44fa7096883ffc6c2d9fd5d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 10:41:08 2013 +0100

    renamings

commit 44e16104fd32878cafdeeff10dfe1e150c9520fc
Merge: 7fcfbb6 cb9f55d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 09:45:51 2013 +0100

    Merge commit 'cb9f55dadc0909e3b58edd24da74219f34d6ebd1' into akka-migration-dennis

commit cb9f55dadc0909e3b58edd24da74219f34d6ebd1
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 12 09:45:20 2013 +0100

    renamed IEntityDescription to GeneralEntityDescription

commit 7fcfbb6cd54718ced842146b36500e99b8e6690a
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Mar 11 19:23:11 2013 +0100

    - Removed by debbunging println's

commit cb78010dd36d3c8f904fa4f3ecb1957503cb5f0f
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Mar 11 19:10:36 2013 +0100

    - I don't know why, but if you
    're using akka, also the parent classes need to be seralizable

commit 4f928642161f73b6d14b7c6e33e6d333b3060f5f
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sat Mar 9 11:06:27 2013 +0100

    - Compiles again

commit 1ae762576d0942241ef190464cbb5027bfa07afb
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sat Mar 9 10:46:20 2013 +0100

    Removed old clustering subsystem

commit 4bd352920b7c4da48b89008b7228d71a7019e22f
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Mar 7 09:38:29 2013 +0100

    - Fixed library

commit 26d745b0a0fceaa9ad1623f4d52065f91c95bcd4
Merge: c0cd8b5 4936e9a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Mar 5 19:05:24 2013 +0100

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

    Conflicts:
    	src/simx/components/renderer/jvr/JVRMessage.scala

commit 444f15afbb107a4b02adf4cbe6278857c76b0ad2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Mar 1 16:55:27 2013 +0100

    replaced actor context

commit 5a4a65707e31eab7ac362cdb810fa2b4ddb54865
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Feb 28 21:30:04 2013 +0100

    worked on simthief

commit c7206838adbdedbe84f211ccbbbe90c7f4f2a3c0
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Feb 28 16:06:12 2013 +0100

    minor fix

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

    started switch to akka

commit 4936e9a350db0cb92189e56a4d15a25423bf0db2
Merge: 75b8ebe 86241dd
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:34:34 2013 +0100

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

commit 75b8ebebee50f88e733f6f649377a58ef02912db
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Feb 24 11:28:15 2013 +0100

    - Changes

commit c0cd8b5a49acc18801173123de15ceafdc562755
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun Feb 24 00:20:06 2013 +0100

    cleanup

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

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

commit 9540accdf32c53042030fbcbae1b837cdccb77ae
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Feb 19 16:00:18 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 a1a6ac8ea5a4a02389169c86300f325a256567fa
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Feb 15 18:20:04 2013 +0100

    worked on annotations

commit 11e2b215916311f8474a0bfdd1ac97dda1c6833c
Merge: 1be38c6 830b86c
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Feb 15 11:48:29 2013 +0100

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

commit 1be38c64936394f6625adfdcf44b9d04e4bdbb0b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Feb 15 11:42:46 2013 +0100

    new types

commit 830b86c68ebb81f21c927a60099467b0e9b1f1fa
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Fri Feb 15 10:34:41 2013 +0100

    Adepted TuioExample and ExampleApplication, removed PhysicsEditorExample
    Improved Configurations usage and error handling

commit e7705988b9948e736b37ea30be6055b72ea02b45
Merge: b8ad7c6 9f53c59
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Dec 23 08:33:25 2012 +0100

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

commit b8ad7c679d39a690105697089aa141f62cb41f40
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Dec 23 08:28:21 2012 +0100

    -

commit 9f53c598f58c83f3b25181f954b4e36c70dbc29f
Merge: 30ab273 372ac4a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Dec 18 17:56:31 2012 +0100

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

commit 4cbb2c1c4dfae5cc5041a69adef1265a64dc8deb
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Dec 12 11:50:27 2012 +0100

    Post merge

commit 650380bc7fee3c5490d4ee042efae12280557817
Merge: 2ce2951 372ac4a
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Dec 11 17:15:52 2012 +0100

    Merge remote-tracking branch 'origin/master' into siris-boardgame

    Conflicts:
    	src/simx/components/renderer/jvr/JVRConnector.scala
    	src/simx/components/renderer/jvr/JVRRenderActor.scala
    	src/siris/components/renderer/jvr/types/Types.scala

commit 372ac4ad5e50ffd3ba025b7c0ede2133667482a9
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Dec 6 17:43:29 2012 +0100

    Removed println

commit 7377647ec7a4cebdc018b49ebfd42346def59d6f
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Dec 5 10:43:45 2012 +0100

    - May be fixes the saturation problem

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

    renamings according to renamings in core

commit 0343bb15e3cd8482015cd975f30c7eb5500572bd
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Mon Dec 3 15:13:32 2012 +0100

    - Current state

commit 991d92138c804740d61372488ad7c3fe4150909e
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Mon Dec 3 14:32:44 2012 +0100

    - Some fixes

commit 1ee563a9c310158fbbe7b0e45d06c79e6086437d
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Dec 3 11:17:39 2012 +0100

    - Fix

commit 3f2d215f166a7c1ae08d758c41a560cf71b36389
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Dec 2 22:27:56 2012 +0100

    - Several adjustments for the benchmarks

commit a5bb7bfdf01109669187f7c1363d8f7ece3f6b3b
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun Dec 2 19:03:06 2012 +0100

    more for multi-aspect entities

commit 16d5f06e0bef72b26d7ad80e9bc047344b4162a9
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sun Dec 2 15:57:51 2012 +0100

    made jvrconnector support multiple aspects in one entity

commit 2804a0e874ea8344c3a569803d2f48f8ad69cc62
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 29 19:34:07 2012 +0100

    - Fix for cm dm bug

commit 4879d06c0b95b58678a8a8b2ca5a3584e828ff3f
Merge: 2b590c9 d2494b0
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 29 18:37:20 2012 +0100

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

commit 2b590c9ed66e9d0db056138313bdac9eef5a0674
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 29 14:59:56 2012 +0100

    - Temp

commit d2494b0c77d218930166be1b28de547199458a26
Merge: f7330ba 1699232
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 29 10:40:51 2012 +0100

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

    Conflicts:
    	src/simx/components/renderer/jvr/JVRConnector.scala

commit f7330ba3db490e8e798f2d9120c6825a7f22f420
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 29 10:31:08 2012 +0100

    fixed jvrconnector bug which caused svars to be provided multiple times. previously this was filtered by the entity creation mechanism, but due to the subentity feature this is not possible anymore (anyway, it was implemented wrong and should be like it is now ;) )

commit 169923282bec7b230806b98c95a2bd786844a54e
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Nov 29 10:16:19 2012 +0100

    adepetd to new configuration

commit 8da8e2054d062915fd1a249d3528d767b2b65cc6
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 28 14:20:20 2012 +0100

    - Added copyright notice to all files
    - Added LICENSE file

commit 754dc0bdada6ada0022d5b8aea2aef99f9b7740d
Author: martin <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Nov 26 14:47:07 2012 +0100

    Continued automatic native library loading.

commit 41d16e84fd3e716d48dc10f16406d8621f24e3bf
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Nov 25 12:24:57 2012 +0100

    - Removed TextureSVar

commit dd8e4a460e6a91962c90ae9ef2c7c6179b27c880
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 22 16:42:49 2012 +0100

    added texture svar

commit 2f66f68b910fde5742df03c97bba3eb2777cd94a
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 21 14:37:49 2012 +0100

    - Disabled native path system

commit e2925cca09c5a84e1a17ff7653894bfc5276a829
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 21 14:28:28 2012 +0100

    - Some changes for the benchmarks

commit 754cb729430d9feaeb56ca7c0d4f096cd75ad1ff
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Tue Nov 20 16:53:14 2012 +0100

    Started automatic native library configuration.

commit 800730cf5ce9c35b2256f12ab56507f42c0998f6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 15 16:40:38 2012 +0100

    fixed skybox bug in render actor

commit b628c95255598632b4c7f88a21fea99f62c7f8b7
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 14 13:59:51 2012 +0100

    More modifications

commit 4982f6760d30b3310e9af88a8277302a26d5b71d
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 14 13:55:18 2012 +0100

    More modifications

commit 1b7b6126f8fc076db76990956d090c957a59a395
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 14 13:50:13 2012 +0100

    More modifications

commit 04cc51d66761ba82447902bf0e62bcb3c6fbe245
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 14 13:36:31 2012 +0100

    - New jVR Version with serializable color

commit 370ce9ab01e49b91f1f40ba154d8cdd27377154d
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 14 13:20:27 2012 +0100

    - Shader effect should be serializable now

commit 2ce2951f3e1c63a0319d9cbb773235c32fed51d5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 14 12:02:13 2012 +0100

    added texture svar support (testing state)

commit 46a00214cc5867f9069965856a48c7625111db7d
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 9 12:55:26 2012 +0100

    - Closing the window in a clustered envrionment works again

commit 65750c7700c2302081eb61cf49f3a9f1dbc71b4c
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 8 13:43:55 2012 +0100

    - Fixed a PPE Bug

commit 1910b399d23c37871a1c87c51c221ac8ccdfb4f2
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 8 13:31:11 2012 +0100

    - Fixed water material

commit 362b4edc2a7d1cff18c8ac979ddd8ee5474dcb85
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 8 12:56:44 2012 +0100

    - Removed nearly all sim thief specific stuff

commit 5877f123c8bb792e23ab70294edaa32086a810c9
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 8 12:31:40 2012 +0100

    - Removed more sim thief spefific stuff

commit e5b2f5f38938999f178c6c03b5a32b68e818e530
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 8 10:20:14 2012 +0100

    - Removed some jvr specific stuff

commit 059d43a1b916bb892c40aa9f095c7ed0ac39e8be
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 7 11:45:32 2012 +0100

    - Adjusted package name

commit d8910e32f75e8c35693e06deeb354caa757c4e8a
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 7 11:29:21 2012 +0100

    - Typo

commit c57f43a500c8659139123c9350f82d24d835c262
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 2 14:41:09 2012 +0100

    - Some changes

commit 68aad8ca40418321df50dd0910f74787f3f24d9a
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 2 13:50:45 2012 +0100

    - Adjusted a package name

commit 9753e1aca7b3a11278363782373c450a059bc5f2
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 2 10:58:14 2012 +0100

    - Finished documentation and adding for require statement

commit 44f0bd0d8f7ab1518beb363c174b142694f434b8
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 1 15:54:52 2012 +0100

    - More documentation

commit f6016f19b3320e4e7bc802d2ba1a80b0000563e6
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 1 11:58:14 2012 +0100

    - Documentation and clean up

commit 5609f027360d7b2a4362462c783d1a3d18061cb0
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Oct 22 16:56:48 2012 +0200

    - Reordered some functions
    - Some documentation

commit 1dd9dd08b711c19c99a8400fc236a612a9f413c6
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Oct 22 12:33:36 2012 +0200

    - Special create parameter for loading a shape from file and applying a new shader material

commit d55cbb2718b125995acc0e33f36cb05afec439a2
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Oct 22 12:11:54 2012 +0200

    - Shader effects activated

commit 4d3df62dba1001f010852cb3ce4913c364f38841
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 19 09:52:00 2012 +0200

    - Renamed package from siris to simx

commit 0c6d940b34902a50abc69c3504678fb0d3ec116f
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 18 15:59:42 2012 +0200

    - whitespace

commit 94dba7ddd136e1091423a800949e0c9e3aea5864
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Oct 14 14:41:44 2012 +0200

    - Added default error handler

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

    - Removed auto render flag
    - bound rendor actors to component
    - using execution strategy

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

    - Removed TimeMeasurement Trait

commit f2a7c1fee176782c7d8f2fb3e4a17d2d05217fca
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 23:39:00 2012 +0200

    - Set Triggered mode

commit 270677d151778a5eb92e192d9f2edd9cacb3d0b1
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 16:19:51 2012 +0200

    - Removed SVarActorLW

commit 62c4295cc7005d9c2e2ab13032ab293c85285077
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 15:45:06 2012 +0200

    - Removed SVarActorHW and SVarActorImpl

commit 365930900323e5412ebc141165d3a8c32ec0ce29
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 14:38:03 2012 +0200

    - Using the complete function

commit 0d1e6ee3f06f4ba6a089cc6830a87802b28d35b6
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 11:46:20 2012 +0200

    - Removed verbose line

commit 51af3c64e3828c35d366fdd7291e6faea0a3a946
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Oct 12 11:10:59 2012 +0200

    - Moved RenderNextFrame message into jvr binding package
    - Implemented new Component interface function

commit d5ab77f9f4e498ee732b253e0a277a6f086022ae
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 11 15:06:45 2012 +0200

    - Eye separation in display description

commit 33652aee66ba7f981e32764a7d9f89f26afbb862
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 11 14:49:49 2012 +0200

    - Next

commit d832b77ec21d2eb76979b8ac4f9f4cfb3d1d1e26
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 11 14:38:56 2012 +0200

    .

commit 2d2163ac3c52288e295b5990b6723f69e57a7d94
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 11 14:37:29 2012 +0200

    - Next try

commit ea77674c5c42769aa45675a99409c2fff1fc46e4
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 11 14:27:42 2012 +0200

    - Trying again

commit bb0c60450b3da8b9324cf76a3f618df265c1c15a
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Thu Oct 11 14:20:32 2012 +0200

    - Maybe fixed eye seperation

commit 843e2747187e68788c04c8a2b8e273dea6c73bfa
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Oct 10 17:16:52 2012 +0200

    - Fixed user entity publish

commit c38e9c1c0b1bfba4031d18f68a19943e877deecb
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Oct 10 13:45:46 2012 +0200

    - New jVR Version

commit 2ea29f1a384fa690d367c00a86d49ff7c4e0c6c7
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Wed Oct 10 11:49:29 2012 +0200

    - Restructured libraries

commit a48b2e6081e0d30b43251116a04b0fa147f0129a
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sun Oct 7 14:57:37 2012 +0200

    - Minor changes

commit e721200ff567874393e990a6d87ce10ea571a6c2
Author: Stephan <rehfeld@beuth-hochschule.de>
Date:   Mon Oct 1 16:27:49 2012 +0200

    - Repaired Sky box

commit def8a0dae0410471dfbb42a8817bb69cffb2cd0e
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Oct 1 10:27:24 2012 +0200

    - Several changes

commit 5ec9a24afb62251607c79944c1114c8b69ff0545
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Sat Sep 22 16:56:50 2012 +0200

    - Fixed shadow and light bug

commit 5ddff9cccb5dbcbacb68e6400be80c621776bdd2
Author: unknown <Stephan Rehfeld@Hades.(none)>
Date:   Wed Sep 19 20:19:09 2012 +0200

    - jVR with concurrency fix

commit 91a77020a19a50a7091e56e325f8f727c0da29d7
Merge: 4ab849e 68acc41
Author: unknown <Stephan Rehfeld@Hades.(none)>
Date:   Wed Sep 19 20:17:45 2012 +0200

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

commit 4ab849ec21761de802c152d8daa399508e0213ba
Author: unknown <Stephan Rehfeld@Hades.(none)>
Date:   Wed Sep 19 20:17:17 2012 +0200

    - Fixed the ToggleAutoRender functions

commit 68acc411cd4f5e7ba49d3f20c3bea7f124c8caf5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Sep 18 14:32:41 2012 +0200

    added new jVR version (without display lists)

commit 8b0ebd2b54a44c18ebb44373e48bb641eacf022d
Merge: 0acfd65 4bbec76
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Sep 1 01:07:47 2012 +0200

    Merge branch 'simthief-repair'

commit 0acfd65eb49f9c65fdf32156957e5b631f6a17e7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 16:44:17 2012 +0100

    ...

commit 4bbec7694545800ccf9dfe8b145334b01612bc1e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Aug 27 18:05:10 2012 +0200

    added some error handling

commit 9620cd34833d951c3984e785a4303f42bb21e7d4
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 22 15:07:00 2012 +0200

    added useGet = true in connect method

commit 6cbe47c772e6dc38cdde464b48a8f28f45211482
Merge: ce2f5ed aa026be
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 22 13:18:56 2012 +0200

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

commit ce2f5ed3fcca35204f83fc43470bc103c5b74df7
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Aug 22 13:18:50 2012 +0200

    commit before re-implementation of ghost behavior

commit aa026be681b979153b5f4912f689a8e64a46816a
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Mon Jul 30 14:30:23 2012 +0200

    Removed sbt temp files

commit de0fd20dd6d2620bf236b7928a9537600f1c77c5
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Jul 4 16:55:10 2012 +0200

    Restored the editor component.
    Some GreenIT.
    Added the editor to a bsic example.

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

    cleanup

commit 9119a71bc6897e5cc4ab783e00ad9af2d7b23a9a
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Jun 21 17:24:40 2012 +0200

    adjusted for new jvr version

commit 2b689646b612e945bbe7d29b0a49ceed3ce556fc
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Jun 19 09:39:47 2012 +0200

    added jar with sources

commit 71012ac52c3996c18e9f9578950dcace2752d0e3
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue Jun 19 09:28:31 2012 +0200

    added new jVR version (performance issues fixed by marc rossbach)

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

    Revert "..."

    This reverts commit 46caa2c90dffe581ec28213c44464207edf28ac5.

commit 5622b90c1daabd0581d57bc31d7db104d5abaa6f
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Tue May 22 12:00:06 2012 +0200

    added iodevicehandling trait

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

    added implicits to svar methods

commit 4d747fecaff4a77b794b33086f64ecfc8220bc0e
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri May 18 17:07:21 2012 +0200

    added newer jvr version

commit 5ce7b27a6315e01bd20919e856f81696fcd26ab2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Fri Feb 24 17:24:55 2012 +0100

    minor changes

commit 50dc4e007ddd8ac55ed9b37af50c4522085ac5ec
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 22 17:00:03 2012 +0100

    ...

commit 46caa2c90dffe581ec28213c44464207edf28ac5
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Feb 15 16:44:17 2012 +0100

    ...

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

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

    This reverts commit 712bed8d2cb3d3b3fba6920b203142febd1a8e82.

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

    reinserted EntityCreation component (commented out by stephan)

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

    jvr render actor compiles

commit c26cac8a8f904dcec6255ba3b993026c6524674c
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Feb 13 17:52:55 2012 +0100

    Changed API

commit 94730be4aa29bd2f4cb9280d5d89fc25feb031b1
Merge: ea2c4b3 750aa0a
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Jan 25 17:41:17 2012 +0100

    Merge branch 'cluster-integration' into stephan

    Conflicts:
    	src/siris/components/renderer/jvr/JVRInit.scala

commit 750aa0a1dd2e1a0701e761c65ec273ec544fa9e5
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Jan 25 17:12:28 2012 +0100

    - Migrated entity creation mechanism

commit 41899aca5544a5fd356e0c8e97a0f3e0df26c98b
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Jan 20 15:09:31 2012 +0100

    - Using createActor instead of new

commit bc24896bb3535698cfc244ce0fca8db4653ad235
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Jan 4 10:55:37 2012 +0100

    - Fixed shutdown bug

commit a63fd7df7f5479f5b77e4fd26423e346138fbe45
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Dec 29 11:05:41 2011 +0100

    - Construstor parameters for clustering

commit 414bb3335bab2e5b8c7ac3ec682646bf8036a092
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Dec 28 10:41:13 2011 +0100

    - Parameter free constructor

commit 9b038c77da088860cfd67fbfc3f80507d37c9631
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Tue Dec 27 11:27:20 2011 +0100

    - Error handling if a node was not found

commit f729e4cad3a6589b9ebc754c897f15f45634ca82
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Dec 22 19:52:00 2011 +0100

    - Renamed getActorOn to createActorOn

commit ea2c4b39a57a7426943af4e4a089a7a246eec761
Merge: 1a39554 c55d83b
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Dec 22 17:04:01 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 1a39554ef79f5a5af05572c2108e66025a172ef4
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Thu Dec 22 17:01:51 2011 +0100

    Fixed on close notification bug

commit c55d83b5e327e3f7a3102c9b8f1a8c48b91872c6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Dec 22 14:38:50 2011 +0100

    added *.log to gitignore

commit bd5e78acdd6d04461a14f5cbf08181eabfacd1b5
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Dec 21 17:17:09 2011 +0100

    - Removed some printlns

commit 6b1caf68bd6e5f6d481283410e38e4d9f3833700
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Dec 21 16:47:59 2011 +0100

    - Opening a window on other node works now

commit 25467c04277eabea7cd207be6bbbc589658ce46c
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Dec 21 15:20:02 2011 +0100

    - Removed a bug

commit e89dac1773f0970d9f91362922209479dd0ae495
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Dec 12 19:16:11 2011 +0100

    - Big fixing

commit 9551b276b09646085215e0471027763be397bbae
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Dec 7 15:00:40 2011 +0100

    - Version4 API

commit 36eae988adce1bafa5e69fdd1d818a4f7f76da15
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 25 17:11:47 2011 +0100

    - Minor changes

commit 5703a3ab11a66124ca473e9b61e0b377947ad968
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 25 15:15:11 2011 +0100

    - Some API changes

commit 4e37e32f4f21156b56858ee61629afa88d1f1ace
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Fri Nov 25 10:43:23 2011 +0100

    - Changed parameter for connector

commit 0f1e4fd0c4b51c5b76482f0af94c4690d5c747a4
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 24 16:18:07 2011 +0100

    - merge with master

commit f47624dcaf8f31205ed8d73f4e87b7350210f89f
Merge: 2fc444a f5c8939
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 24 16:17:51 2011 +0100

    Merge branch 'master' into cluster-integration

commit 2fc444a475341ebc2fc0b8e0d6807f0038c33617
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Thu Nov 24 16:15:50 2011 +0100

    - Change of SIRISMessage

commit f5c8939cc20efa73cc13a303b909e01a61c701c2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 24 09:23:47 2011 +0100

    did sth

commit a2c284a3cd158ede20d00189b77d6b37f9be79b8
Author: martin fischbach <martin.fischbach@uni-wuerzburg.de>
Date:   Wed Nov 23 17:33:26 2011 +0100

    Fixed compile error

commit 79e9f89a39533aea26e3fa0d88321f2dc8f241e8
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 23 16:33:28 2011 +0100

    - Minor changes

commit 6796c0a348d0f3a4784f038082fb3ab110d5e759
Merge: 055c5bb 53acf49
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 23 15:46:03 2011 +0100

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

commit 055c5bb64e4dcbf8dcef0a6d2682a37ad57f37d9
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Wed Nov 23 15:45:49 2011 +0100

    - Removed old unused stuff

commit 53acf4902e650417e6fda971e9d32710ccad0be8
Merge: 31a9454 f6a92fd
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Nov 21 17:13:33 2011 +0100

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

commit 31a9454f85f4a642b09aa454fe32776da6c1f057
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Mon Nov 21 17:13:16 2011 +0100

    added sync section to ResourceManager

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

    - runnable

commit 98c7e17727ee90d8ef9da758424af73f17b834f6
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 17 14:55:06 2011 +0100

    more on subelements

commit cf6a9e686ed27f354d9f377da775401774e1b08d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Thu Nov 17 10:41:21 2011 +0100

    reworked Execute schemes

commit 0ca8e8cf2bf9a6988ed2aaeaf42ce02f3a2e13e2
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 23:17:36 2011 +0100

    .

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

    fixed-paths

commit 103b1d8c9a3b9c2bfc05a3212b6698ff08e1ba32
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Wed Nov 16 21:49:01 2011 +0100

    sbt 0.11.1 now

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

    ...

commit 352279ebffaae8952235740fd8b2eb73083bd611
Author: Stephan Rehfeld <rehfeld@beuth-hochschule.de>
Date:   Mon Nov 14 15:40:16 2011 +0100

    - Commit before branch

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

    .

commit a96e478ea6dfb2dbf5e4ec9c050a7be93f625d1d
Author: Dennis Wiebusch <dennis.wiebusch@uni-wuerzburg.de>
Date:   Sat Nov 12 09:29:40 2011 +0100

    .

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

    ...

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

    .

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

    added app configs

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

    added app configs

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

    .

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

    more settings

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

    more settings

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

    more settings

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

    more settings

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

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

Conflicts:
	build.sbt
	ivy.xml
	jvr.iml
	lib/jVR.jar
	src/simx/components/renderer/jvr/JVRConnector.scala
	src/simx/components/renderer/jvr/JVRCreateParam.scala
	src/simx/components/renderer/jvr/JVRMessage.scala
	src/simx/components/renderer/jvr/JVRRenderActor.scala
	src/simx/components/renderer/jvr/PostProcessingEffect.scala
	src/simx/components/renderer/jvr/ResourceManager.scala
	src/simx/components/renderer/jvr/ShaderEffect.scala