Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 08:16:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
52722 commits 71 branches 56 tags 1.2 GiB
Commit graph

52722 commits

Author SHA1 Message Date
Vladyslav Stelmakhovskyi
edb66ae704 Merge branch 'tablet-ui' into tablet-ui-audio-screen 2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
Seth Alves
70c7ba92f7 Merge pull request from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-24 14:18:42 -08:00
Seth Alves
f1470e34f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-24 15:17:52 -07:00
Seth Alves
0d2e0eb9c3 Merge pull request from sethalves/avoid-deadlock-on-10k-mesh-fbx 
Avoid deadlock on 10k mesh fbx
 2017-03-24 12:34:37 -08:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request from Triplelexx/21208 
21208 - Muted microphone indicator
 2017-03-24 13:07:43 -07:00
Ryan Huffman
bb09dd9414 Merge pull request from huffman/fix/touch-detection-after-launch 
Fix Oculus Touch + Remote not being detected after initial launch
 2017-03-24 11:37:57 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
Seth Alves
aaa78d108b if a model has too many meshes, give up. 2017-03-24 11:17:24 -07:00
Seth Alves
e1e51614d9 don't hang loop if entity isDead 2017-03-24 11:16:54 -07:00
Clément Brisset
5ff7dbb254 Merge pull request from Atlante45/fix/entity-bad-url 
Show entity bounding box for bad URLs
 2017-03-24 10:56:06 -07:00
Brad Hefta-Gaub
1972b140b9 Merge pull request from mittens/21215 
Worklist  - Removing Duplicate Status Icons for Submeshes
 2017-03-24 08:52:12 -07:00
Seth Alves
154cd444ad Merge pull request from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-24 07:21:00 -08:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Brad Hefta-Gaub
aa1883ba85 Merge pull request from jherico/crash_fix 
Fix crash in render-perf-test
 2017-03-24 08:10:37 -07:00
Atlante45
4f8d9b190b Show green box when model entity has bad url 2017-03-23 17:56:33 -07:00
Ryan Huffman
56c5f06365 Fix Oculus Touch + Remote not being detected after initial launch 2017-03-23 16:29:08 -07:00
Brad Hefta-Gaub
20bc32fc89 Merge pull request from birarda/bug/ac-agent-audio 
make sure the AC agent has an AudioScriptingInterface
 2017-03-23 15:13:24 -07:00
Zach Fox
a231b57472 Merge pull request from birarda/cmake-with-space 
Fix failing POST_BUILD steps on Windows with spaces in build path
 2017-03-23 11:41:38 -07:00
Seth Alves
9a59d4d83e Merge pull request from sethalves/tablet-ui 
Tablet ui -- merge from upstream
 2017-03-23 08:52:18 -08:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Seth Alves
1c62a80bc2 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:45 -07:00
Seth Alves
817a5335a0 Merge pull request from druiz17/tablet-popup 
Use loadQMlSource if no stack is aviable when calling PushOnToStack
 2017-03-23 08:49:41 -08:00
samcake
73227f6598 Merge pull request from highfidelity/smarter_textures 
New texture streaming system
 2017-03-23 09:44:31 -07:00
Seth Alves
ec331f495d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:56 -07:00
Seth Alves
62f10204d9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:48 -07:00
Seth Alves
4799c33c25 Merge pull request from hyperlogic/bug-fix/tablet-spawn-location 
Tablet spawn orientation now takes hand orientation into account.
 2017-03-23 08:22:25 -08:00
Dante Ruiz
af97c7275e Use loadQMlSource if no stack is aviable 2017-03-23 17:03:24 +01:00
Stephen Birarda
b53cb5934b make sure the AC agent has an AudioScriptingInterface 2017-03-22 23:35:29 -07:00
Brad Davis
944255a37b Fix crash in render-perf-test 2017-03-22 22:44:05 -07:00
Brad Davis
3a40fd886f Fix comparison between GL stamps and GPU stamps 2017-03-22 18:11:20 -07:00
Brad Davis
4868a1618a Add initialization to sampler stamp 2017-03-22 18:10:54 -07:00
Brad Davis
893fcba283 Return the correct format and internal format combo for depth textures 2017-03-22 17:14:40 -07:00
Brad Davis
9a3686fc1a Fixing merge conflict 2017-03-22 14:55:11 -07:00
Triplelexx
09cbace975 remove unused getBodyForwardDirection 2017-03-22 21:54:21 +00:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Andrew Meadows
a463013d90 Merge pull request from samcake/blue 
Fix Ambient Lighting equation
 2017-03-22 14:13:31 -07:00
Chris Collins
05c40d2930 Merge pull request from mittens/hotfix/obj-texture-fix 
Fixed the texture assignment for the OBJ loader
 2017-03-22 13:19:01 -07:00
trent
c71e57753b Removing changes (albeit benign ones) from another PR. 2017-03-22 15:23:40 -04:00
Triplelexx
c7b9492620 revert removing rightUnitVec 
.....
 2017-03-22 19:14:20 +00:00
trent
36619cd2e4 Fixed issue with duplicate physics status icons per sub-object. 2017-03-22 15:07:29 -04:00
Triplelexx
216f20ed2c rename fronts to forwards 2017-03-22 19:03:39 +00:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00
Triplelexx
fd312f6bf8 rename fronts to forwards 2017-03-22 18:49:34 +00:00
Triplelexx
31ec9b832f rename fronts to forwards 2017-03-22 18:43:30 +00:00
Triplelexx
c2cff55427 rename fronts to forwards 2017-03-22 18:41:06 +00:00
trent
83d69e65b3 Merge branch 'master' of https://github.com/highfidelity/hifi into 21215 2017-03-22 14:20:37 -04:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account. 
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
 2017-03-22 11:03:03 -07:00
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00