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
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
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
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -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
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
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
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
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
Howard Stearns
ef32853d46
When AvatarData parses the .fst, store the (merged) .fbx filename.
...
(Interface gets the .fbx by a separate path, but agents don't have that chance.)
2015-12-01 11:51:22 -08:00
Ryan Huffman
4d84362757
Fix ScriptEngine setting _isFinished when it shouldn't
2015-12-01 11:30:56 -08:00
Andrew Meadows
ab6367ff4e
remove debug option for disabling physics updates
2015-12-01 11:13:01 -08:00
Stephen Birarda
7dbf29821a
don't persist the octree if it never loaded
2015-12-01 10:00:25 -08:00
Ken Cooke
a725c8b12e
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb
2015-12-01 09:12:24 -08:00
Brad Davis
0023c034c4
Fixing naming of GL classes
2015-11-30 18:27:03 -08:00
Brad Davis
a94b6667b1
Moving most of GLCanvas to gl library
2015-11-30 17:19:42 -08:00
Howard Stearns
6f50d91208
Merge pull request #6461 from hyperlogic/tony/remove-joint-states
...
Refactor of Rig and MyAvatar animation JavaScript interface
2015-11-30 16:28:15 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Atlante45
4aaa9ca02f
Make OctreeElementBag safer to use
2015-11-30 15:23:49 -08:00
Anthony J. Thibault
e2d9e37eb8
Fix for head offset for models with no eyes
...
This was causing in correct body poses while wearing an HMD.
2015-11-30 14:08:21 -08:00
Atlante45
5019f79947
Fix header name
2015-11-30 11:48:34 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
David Rowe
d6b13ef42c
Fix crash when try to remove invalid menu item in JavaScript
2015-11-30 08:33:38 +13:00
Atlante45
a364e85e1d
Remove DeleteHooks
2015-11-25 17:21:56 -08:00
Ken Cooke
a5b64473af
Fix bugs
2015-11-25 16:15:04 -08:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
Andrew Meadows
527408c7c1
Merge pull request #6292 from huffman/physics-continuous-collision-detection
...
Physics continuous collision detection
2015-11-25 15:45:18 -08:00
Atlante45
cd2e610e17
Remove OctreeElement's UpdateHooks
2015-11-25 15:35:15 -08:00
Anthony J. Thibault
5072339a22
Warning fix
2015-11-25 14:04:01 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
