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

19696 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
208d3c8413 remove old unused shaders 2014-12-11 13:59:21 -08:00
ZappoMan
29672aec09 removing VoxelShader and PointShader which were both disabled 2014-12-11 13:55:10 -08:00
Clément Brisset
7f4936770b Merge pull request #3951 from Atlante45/reverb_smoothing 
Don't stop defaultScripts
 2014-12-11 12:06:58 -08:00
Atlante45
b7d9023645 Don't stop defaultScripts 2014-12-11 12:06:24 -08:00
Stephen Birarda
76cf122d74 Merge pull request #3950 from birarda/master 
use higher resolution images in lobby
 2014-12-11 11:24:19 -08:00
Stephen Birarda
230b8740bf add higher resolution images to lobby 2014-12-11 11:23:27 -08:00
AndrewMeadows
84e82cd03b Merge pull request #3947 from ZappoMan/HMDMode 
Make the Chat, Running Scripts, and Address bar "avoid" HMD Screen
 2014-12-11 10:48:32 -08:00
Leonardo Murillo
c24ccfabc6 Merge pull request #3949 from birarda/master 
have ShutdownEventListener handle WM_CLOSE or SIGTERM
 2014-12-11 10:40:02 -08:00
AndrewMeadows
bb6f976699 Merge pull request #3945 from ZappoMan/someCleanup 
AudioRefector-ectomy
 2014-12-11 10:39:41 -08:00
Stephen Birarda
f58d21d6f0 have ShutdownEventListener handle WM_CLOSE or SIGTERM 2014-12-11 10:21:11 -08:00
Brad Hefta-Gaub
cfe0b28504 Merge pull request #3948 from huffman/lobby-black-panels 
Update lobby to use new URLs + black panels in place of H
 2014-12-10 20:16:22 -08:00
Ryan Huffman
0c746168ef Update lobby to use new URLs + black panels in place of H 2014-12-10 19:48:05 -08:00
Brad Hefta-Gaub
de5702157b Merge pull request #3946 from Atlante45/lobby_in_default 
Lobby in defaultScripts
 2014-12-10 17:27:14 -08:00
ZappoMan
ec54b609df dry up code and make chat window avoid the hmd screen 2014-12-10 17:23:39 -08:00
ZappoMan
06d348c399 get have addressbar avoid the hmd screen 2014-12-10 17:13:34 -08:00
ZappoMan
d058b5554e make sure the running scripts widget doesn't start on the HMD screen 2014-12-10 16:58:36 -08:00
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
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