Commit graph

19664 commits

Author SHA1 Message Date
Atlante45
14cda00ebc First implementation of the DependencyManager 2014-12-12 20:52:41 -08:00
Brad Hefta-Gaub
3e7f9ee1fe Merge pull request #3940 from ZappoMan/master
fix joystick pick
2014-12-09 20:05:18 -08:00
ZappoMan
74a6fd5ca7 fix joystick pick 2014-12-09 20:03:00 -08:00
Brad Hefta-Gaub
edb79ccbd9 Merge pull request #3939 from Atlante45/mouse_pick_in_oculus
fix action events for gamepad;
2014-12-09 19:47:33 -08:00
Atlante45
88a576f846 fix action events for gamepad; 2014-12-09 19:35:38 -08:00
Leonardo Murillo
8d88c537bf Merge pull request #3938 from ZappoMan/fixcrash
potential fix to crash on windows startup
2014-12-09 19:12:53 -08:00
Brad Hefta-Gaub
69f7a89003 Merge pull request #3937 from Atlante45/mouse_pick_in_oculus
Mouse pick improvments
2014-12-09 18:33:25 -08:00
Brad Hefta-Gaub
d54d7c70e9 Merge pull request #3936 from samcake/tot
Fix the shadow bug
2014-12-09 18:27:39 -08:00
ZappoMan
628046f13c potential fix to crash on windows startup 2014-12-09 18:26:59 -08:00
Sam Gateau
cf081f0deb Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-09 18:13:07 -08:00
AndrewMeadows
9aaaae6759 Merge pull request #3934 from ZappoMan/bugfixes
fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities
2014-12-09 18:08:14 -08:00
Brad Hefta-Gaub
9c1be46893 Merge pull request #3929 from huffman/new-entities-default
New entities default
2014-12-09 18:00:25 -08:00
Atlante45
dc4c9cd545 Correctly Hide/Show cursor 2014-12-09 18:00:14 -08:00
Sam Gateau
01c13cd6f1 Fix the broken shadows by simply calling the needed setViewTransform which is used for rendering the ENitites and avatars 2014-12-09 17:58:17 -08:00
Atlante45
43dc35d549 Use correct mouse coordinate 2014-12-09 17:53:23 -08:00
AndrewMeadows
1697636db5 Merge pull request #3933 from ZappoMan/entityCollisions
move emit of collisions to after done moving entities, so that callbacks can delete entities
2014-12-09 17:46:41 -08:00
AndrewMeadows
23a8557b08 Merge pull request #3927 from ey6es/master
Use the 1450 limit everywhere, in case other places are running into the...
2014-12-09 17:44:42 -08:00
Philip Rosedale
756e1b4d63 Merge pull request #3935 from PhilipRosedale/master
option to suppress lobby text for now, defaults to true
2014-12-09 17:40:03 -08:00
Philip Rosedale
96c3a0edbd option to suppress lobby text for now, defaults to true 2014-12-09 17:39:05 -08:00
Sam Gateau
8617c319d4 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-09 17:30:26 -08:00
ZappoMan
426517b072 fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities 2014-12-09 17:11:01 -08:00
Atlante45
b197558b87 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 16:46:13 -08:00
Atlante45
8765d9a9b3 Mouse cursor modifications 2014-12-09 16:30:37 -08:00
Atlante45
0a4f74cf9c Single reticle in the lobby 2014-12-09 16:29:45 -08:00
Andrzej Kapolka
fa8f4e3b06 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-09 12:16:09 -08:00
Ryan Huffman
ec62c6833c Make editEntities a default script and remove editVoxels.js 2014-12-09 12:15:22 -08:00
Ryan Huffman
a63d0e7770 Rename newEditEntities.js to editEntities.js 2014-12-09 12:15:22 -08:00
Andrzej Kapolka
5fb9905186 Rather than reducing rate on first drop, wait until three consecutive packets
have been dropped.
2014-12-09 12:14:21 -08:00
Stephen Birarda
55ec455f77 Merge pull request #3928 from huffman/entity-tool-settings
Entity tool settings
2014-12-09 12:14:17 -08:00
Stephen Birarda
0af3baf947 Merge pull request #3932 from ZappoMan/cleanupMenus
remove debug ryans rotate problem
2014-12-09 12:13:34 -08:00
Stephen Birarda
ada325da2b Merge pull request #3931 from Atlante45/mouse_pick_in_oculus
Misc fixes
2014-12-09 12:13:24 -08:00
Stephen Birarda
68c7985412 Merge pull request #3930 from ZappoMan/crashOnSwitch
fix to crash on rapidly switching domains
2014-12-09 12:13:05 -08:00
ZappoMan
895e22fcdb removed debug code 2014-12-09 12:12:04 -08:00
ZappoMan
79fc8a5a71 remove debug ryans rotate problem 2014-12-09 11:58:01 -08:00
Atlante45
36eecf1d15 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 11:53:47 -08:00
Atlante45
649940de24 wrong pickray function 2014-12-09 11:53:32 -08:00
Atlante45
eaaaa0687c spacing 2014-12-09 11:53:14 -08:00
Atlante45
a6f7a1ce15 guard against NULL _models 2014-12-09 11:52:20 -08:00
ZappoMan
1eaa2caa6c fix to crash on rapidly switching domains 2014-12-09 11:40:47 -08:00
Ryan Huffman
19ba2a1f84 Remove print statement 2014-12-09 08:56:29 -08:00
Ryan Huffman
2696f71be9 Update edit entities to disable on wasd or arrow keys 2014-12-09 08:54:28 -08:00
Ryan Huffman
e5aee44ceb Add setting save/load to grid tool 2014-12-09 08:51:04 -08:00
Andrzej Kapolka
343f610442 Use the 1450 limit everywhere, in case other places are running into the issue
I experienced with metavoxels.
2014-12-08 18:45:05 -08:00
ZappoMan
3c09ca71cb move emit of collisions to after done moving entities, so that callbacks can delete entities 2014-12-08 18:09:49 -08:00
Andrzej Kapolka
dbbfccc309 Merge pull request #3926 from ey6es/master
Reduce the MTU size to deal with Windows networking issue.
2014-12-08 18:08:52 -08:00
Andrzej Kapolka
d0ca75dd2c Reduce the MTU size to deal with Windows networking issue. 2014-12-08 18:04:45 -08:00
Brad Hefta-Gaub
651e550063 Merge pull request #3925 from AndrewMeadows/thermonuclear
fix for non-animating models
2014-12-08 16:58:16 -08:00
Atlante45
ba81030aa1 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:53:56 -08:00
Clément Brisset
db751ca0c4 Merge pull request #3924 from ZappoMan/entityCollisions
make collision callbacks work as entity methods
2014-12-08 16:47:25 -08:00
Atlante45
fa73730359 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:46:34 -08:00