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

52372 commits

Author SHA1 Message Date
Bradley Austin Davis
9fc9253eeb Fixing warnings 2017-03-28 09:54:18 -07:00
Bradley Austin Davis
2cf7ba4119 Fixing pending transfer calculation 2017-03-27 16:34:08 -07:00
Bradley Austin Davis
638364497d Trying a different tactic to avoid multiple concurrent file access 2017-03-27 16:18:04 -07:00
Bradley Austin Davis
f764cd614b Don't hold KTX files open for longer than transfers require 2017-03-27 13:33:00 -07:00
Seth Alves
e5326d146e Merge pull request from hyperlogic/feature/my-avatar-jsdoc 
Added jsdoc documentation for some of MyAvatar properties and methods
 2017-03-26 07:55:41 -08:00
Seth Alves
90db9af2f9 Merge pull request from Triplelexx/fix-tablet-users-typo 
fix myVisibility typo
 2017-03-26 07:36:11 -08:00
Seth Alves
7455dcc2db Merge pull request from jherico/cmake_threads 
Force thread linkage
 2017-03-26 07:27:07 -08:00
Seth Alves
66f8e4063d Merge pull request from Atlante45/fix/warnings 
Fix warnings
 2017-03-26 07:03:33 -08:00
samcake
8b1a0be754 Merge pull request from jherico/ktx_cache_fix 
Correctly initialize a file cache with the proper key
 2017-03-25 09:58:32 -07:00
Anthony J. Thibault
f7de74109b Added jsdoc documentation for some of MyAvatar properties and methods 2017-03-24 15:10:26 -07:00
Brad Davis
82d502ae9f Correctly initialize a file cache with the proper key 2017-03-24 13:35:37 -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
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
Brad Davis
5a5eb6e168 Still trying to fix build error 2017-03-23 14:09:34 -07:00
Brad Davis
8116de7c14 Force thread linkage 2017-03-23 13:45:13 -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
Atlante45
d4353e1d19 Fix warnings 2017-03-23 11:39:42 -07:00
samcake
73227f6598 Merge pull request from highfidelity/smarter_textures 
New texture streaming system
 2017-03-23 09:44:31 -07: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
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00: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
Triplelexx
2fc8dd48de change testFront to testForward 2017-03-22 17:13:45 +00:00