Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19867 commits 71 branches 56 tags 1.2 GiB
Commit graph

19867 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
ccf8d0a787 DefaultScript.js doesn't appear in running scripts 2014-12-10 16:55:40 -08:00
Atlante45
ff372c5f4e Added lobby.js to default scripts 2014-12-10 16:53:21 -08:00
Brad Hefta-Gaub
e82968771e Merge pull request #3944 from ey6es/master 
To prevent allocation error on Windows (in this instance), don't load entire FBX at once; parse it directly from the QNetworkReply.
 2014-12-10 16:39:44 -08:00
ZappoMan
7f887ba75f more spatial audio removal 2014-12-10 15:46:10 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Andrzej Kapolka
d402f767c1 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-10 15:23:27 -08:00
Andrzej Kapolka
c57fd15bc9 Rather than loading the entire FBX file into a byte array, read it straight 
from the QNetworkReply.
 2014-12-10 15:22:48 -08:00
Ryan Downe Karpf
fd69b6b5b4 Merge pull request #3943 from huffman/lobby-reorder 
Lobby reorder
 2014-12-10 14:32:19 -08:00
Ryan Huffman
9c9bfeed33 Add missing 'var' to local variable 2014-12-10 14:27:37 -08:00
Ryan Huffman
961f629074 Fix indentation, 4 -> 2 2014-12-10 14:26:42 -08:00
Ryan Huffman
7515c26d71 Merge remote-tracking branch 'upstream/master' into lobby-reorder 2014-12-10 14:17:47 -08:00
Ryan Huffman
a24acb4858 Fix style 2014-12-10 14:15:43 -08:00
Ryan Huffman
6fa1d7a7bd Update lobby to start on the second row 2014-12-10 14:08:59 -08:00
AndrewMeadows
c9d16c389a Merge pull request #3942 from ZappoMan/rayPickBug 
fix ray picking output distance to be meters
 2014-12-10 13:03:10 -08:00
Brad Hefta-Gaub
c994f30f7d Merge pull request #3941 from Atlante45/mouse_pick_in_oculus 
Chess board correct orientation
 2014-12-10 13:02:30 -08:00
ZappoMan
f2ed1337b5 fix ray picking output distance to be meters 2014-12-10 11:04:32 -08:00
Atlante45
10a6428277 Chess board correct orientation 2014-12-10 10:37:54 -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
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
David Rowe
8cf50b71ea Update some comments to reflect changes 2014-12-09 19:18:37 -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
David Rowe
3ea3a497c6 Update scripts to use new textSize() method 2014-12-09 18:33:29 -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
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -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