Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 05:57:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35490 commits 25 branches 0 tags 1.1 GiB
Commit graph

14341 commits

Author SHA1 Message Date
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
d07629489c Merge pull request #6543 from Atlante45/pointer 
gpu::Shader::create* return shared_ptr
 2015-12-04 11:17:02 -08:00
Stephen Birarda
ca84fcd7f4 parent the keepalive timer to the NL thread 2015-12-04 11:01:18 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
ab63f19b6a Merge pull request #6546 from kencooke/audio-reverb 
Reverb
 2015-12-04 10:19:56 -08:00
Brad Hefta-Gaub
49a7852d76 Merge pull request #6540 from Atlante45/warnings 
Fix warnings on OS X
 2015-12-04 10:19:25 -08:00
Brad Hefta-Gaub
8b58aa706a Merge pull request #6534 from jherico/homer 
Windows 64 bit updates
 2015-12-04 10:05:45 -08:00
Atlante45
07387ab8c0 Fix most OpenGL warnings 2015-12-04 10:01:43 -08:00
Atlante45
cb758ca6b4 Fix override warnings on XCode 7 2015-12-04 08:55:43 -08:00
Atlante45
cd26422ca0 Fix warnings on OS X 2015-12-04 08:47:06 -08:00
Brad Hefta-Gaub
18e62290f3 fix warnings 2015-12-04 08:37:46 -08:00
Brad Hefta-Gaub
f472b515c3 remove wantsColor support since its always true and required for entities 2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc remove coverage map and occulusion culling, since it was always disabled 2015-12-03 20:29:23 -08:00
Ken Cooke
aad4743bf0 Completely remove Gverb from cmake 2015-12-03 18:06:50 -08:00
Brad Hefta-Gaub
5a75a17174 Revert "Cruft removal" 2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub
46556b7fa5 Merge pull request #6513 from huffman/fix-script-race-condition 
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
 2015-12-03 17:17:42 -08:00
Clément Brisset
fa52b97f61 Merge pull request #6538 from ZappoMan/cruftRemoval 
Cruft removal
 2015-12-03 17:03:04 -08:00
Brad Hefta-Gaub
6fbb67021f Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix 
Fix for mirrored transforms in FBX models
 2015-12-03 17:01:21 -08:00
Brad Hefta-Gaub
ec7d3ffd63 Merge pull request #6536 from huffman/fix-uninitialized-xcolor 
Fix uninitialized xColor value when converting script value
 2015-12-03 16:46:00 -08:00
Brad Hefta-Gaub
528b8e5d3f fix warnings 2015-12-03 16:45:01 -08:00
Brad Hefta-Gaub
1df24dd174 Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval 2015-12-03 16:31:15 -08:00
Ken Cooke
1d01f08324 Fix compiler warnings 2015-12-03 16:27:35 -08:00
Atlante45
3da80f5861 gpu::Shader::create* return shared_ptr 2015-12-03 14:56:07 -08:00
samcake
902b6b8ea1 Merge pull request #6506 from jherico/maggie 
OpenGL class cleanup
 2015-12-03 13:55:29 -08:00
Brad Davis
cc80dfb9e1 Fixing case on gl surface format helper 2015-12-03 13:08:26 -08:00
Brad Hefta-Gaub
1a5bc5d111 removing optional compression 2015-12-03 12:40:24 -08:00
Seth Alves
e5b1cfa920 fix windows build 2015-12-03 11:15:04 -08:00
Brad Hefta-Gaub
849a8707d2 remove wantsColor support since its always true and required for entities 2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-03 11:00:13 -08:00
Seth Alves
6f79b381f9 working toward making children of avatar joints work 2015-12-03 11:00:06 -08:00
Brad Hefta-Gaub
0c05ffe9ce remove coverage map and occulusion culling, since it was always disabled 2015-12-03 10:20:04 -08:00
Ryan Huffman
667d2b728e Fix uninitialized xColor value when converting script value 2015-12-03 09:52:56 -08:00
Brad Davis
3854523787 Fixing 32 bit build breakage 2015-12-03 09:17:41 -08:00
Seth Alves
2d804555de minor cleanups 2015-12-03 08:59:15 -08:00
Brad Davis
7a05a664f4 Updating GPU for 64 bit 2015-12-02 21:34:11 -08:00
Anthony J. Thibault
b56cf58e33 Fix for mirrored transforms in FBX models 
extractScale will now return negative scale for left-handed matrices.
 2015-12-02 16:55:04 -08:00
Andrew Meadows
744da64c50 Merge pull request #6527 from ZappoMan/debugEntitiesSending 
Add some debugging stats to entity server
 2015-12-02 15:51:47 -08:00
Brad Hefta-Gaub
1e51a90204 add edit times and entity ids to the viewer stats 2015-12-02 14:43:00 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
Anthony J. Thibault
9c0b4bc2a2 Fix for model entities with non-uniform scaled mesh 
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.

This should fix the roads in Qbit as well as the blocks in toybox.
 2015-12-02 14:09:47 -08:00
Brad Hefta-Gaub
08ba535c38 add some basic send tracking 2015-12-02 13:43:05 -08:00
Ryan Huffman
d9eddbe738 Remove unnecessary ptr get() in PacketList 2015-12-02 13:32:56 -08:00
Brad Hefta-Gaub
33b859df33 Merge pull request #6416 from kencooke/audio-reverb 
New reverb
 2015-12-02 11:22:12 -08:00
Ken Cooke
fbd7549430 Better reverb script defaults 2015-12-02 11:05:06 -08:00
Brad Hefta-Gaub
112cdaf028 Merge pull request #6512 from AndrewMeadows/remove-debug-cruft 
remove debug option for disabling physics updates
 2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8 Merge pull request #6500 from Atlante45/octree_crash 
Octree crash fix
 2015-12-02 09:59:56 -08:00
Ken Cooke
f005afd7c0 Fix stdint.h includes 2015-12-02 09:33:47 -08:00
Seth Alves
0595ef0938 merge from upstream 2015-12-02 09:30:19 -08:00
Brad Davis
9b6ec34f09 Fixing avatar orientation in recordings 2015-12-01 20:51:07 -08:00
James B. Pollack
52d6fdac1a Merge pull request #6487 from ctrlaltdavid/20740 
Get the Leap Motion working again
 2015-12-01 15:40:48 -08:00