Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 23:51:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31714 commits 25 branches 0 tags 1.1 GiB
Commit graph

12597 commits

Author SHA1 Message Date
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae more work on proper threading of ScriptEngine 2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
096a6cb4b9 Merge pull request #5800 from jherico/marge 
Fix over-calculation of cluster matrices
 2015-09-14 19:38:01 -07:00
Brad Davis
7a843b3610 Merge pull request #5798 from AndrewMeadows/minor-ik-tuning 
minor tuning of IK behavior
 2015-09-14 18:55:31 -07:00
Andrew Meadows
d74628720f fix bug using unitialized std::vector elements 2015-09-14 17:14:04 -07:00
Brad Davis
35e4440c4f Don't do an O(N^2) operation on cluster matrices 2015-09-14 16:09:13 -07:00
Ryan Huffman
b0ffb50fdf Move assertion in AssetRequest below error checking 
If the request had an error then there is no reason the assertion should
be true.
 2015-09-14 15:48:11 -07:00
Philip Rosedale
15e3678eab Merge pull request #5793 from kencooke/master 
bugfix for audio pops at startup
 2015-09-14 15:31:23 -07:00
Brad Hefta-Gaub
18fbf896f1 first cut at moving entity scripts into ScriptEngine 2015-09-14 15:13:43 -07:00
Andrew Meadows
a72199a7df minor IK tuning 2015-09-14 14:44:17 -07:00
Ryan Huffman
15b809bd16 Merge pull request #5795 from birarda/phrc 
fix high resolution timing for VS2012 in networking
 2015-09-14 13:49:20 -07:00
Stephen Birarda
d82fd9a6ed Merge pull request #5797 from huffman/fix-assert 
Fix assert in AssetResourceRequest
 2015-09-14 13:40:13 -07:00
Ryan Huffman
f3b513866a Fix assert in AssetResourceRequest 2015-09-14 13:39:14 -07:00
Stephen Birarda
8308dbf4a3 Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill 
DO NOT MERGE: Cleanup asset requests on node kill
 2015-09-14 13:08:01 -07:00
Ken Cooke
a818ed5377 Merge branch 'master' of https://github.com/kencooke/hifi 2015-09-14 12:28:16 -07:00
Ryan Huffman
29d26a1f9a Fix namespace issues std:: template specialization 2015-09-14 12:17:36 -07:00
Ken Cooke
6fe30e7156 Style fix, and use size_t instead of unsigned int. 2015-09-14 12:06:13 -07:00
Ryan Huffman
42d21e4dc1 Update AssetClient's node killed handling to check if node is asset server first 2015-09-14 11:56:47 -07:00
Ryan Huffman
e87fcb78cd Add proper cleanup of AssetRequest in AssetResourceRequest 2015-09-14 11:34:51 -07:00
Brad Davis
1bb15e28d6 Fixing differing highlights between left and right eyes in stereo modes 2015-09-14 11:24:28 -07:00
Ryan Huffman
b8c1c279c6 Update AssetRequest::State enum to use camelcase 2015-09-14 11:22:55 -07:00
Ryan Huffman
6468046c68 Update AssetClient callbacks to return whether a response was received 2015-09-14 11:22:34 -07:00
Stephen Birarda
302fd923b8 Merge branch 'master' of https://github.com/highfidelity/hifi into phrc 2015-09-14 11:21:37 -07:00
Stephen Birarda
f7f54010f5 fixes for portable hrc class on win 2015-09-14 11:21:25 -07:00
Stephen Birarda
2737e74432 fix includes for portable hrc 2015-09-14 11:21:18 -07:00
Stephen Birarda
9b926f6f04 add an hrc with proper resolution for < VC2015 2015-09-14 11:21:08 -07:00
Ken Cooke
bc5532bd0d Style fix, and use size_t instead of unsigned int. 2015-09-14 11:20:38 -07:00
Ken Cooke
984ea6f2e2 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-audio-pop 2015-09-14 10:35:59 -07:00
Ken Cooke
6afb6c80d0 Fix the loud audio pops at startup, due to SOXR returning less than desired output samples because of internal buffering. 2015-09-14 10:33:40 -07:00
Brad Hefta-Gaub
1f8599de13 Merge pull request #5790 from sethalves/quiet-compiler 
quiet compiler
 2015-09-14 09:24:08 -07:00
Brad Davis
61fb9924bf Fix procedural vec3 uniforms 2015-09-12 13:19:33 -07:00
Seth Alves
93dc0714f7 quiet compiler 2015-09-12 10:10:53 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub
56118e4204 migrate Agent to use standard APIs of ScriptEngine 2015-09-11 22:12:42 -07:00
Brad Hefta-Gaub
54c56a92f1 move agent specific code out of ScriptEngine 2015-09-11 21:56:00 -07:00
Brad Hefta-Gaub
8395fb6eff normalize how ScriptCache::getScript() works relative to ResourceManager 2015-09-11 21:24:39 -07:00
Brad Hefta-Gaub
f85cb2c888 first cut at cleaning up ScriptEngine class 2015-09-11 19:12:09 -07:00
Seth Alves
e65ef93663 Merge pull request #5778 from jherico/homer 
Fixing some entity race condition crashes
 2015-09-11 17:54:53 -07:00
Howard Stearns
4ffe2d0747 Merge pull request #5786 from AndrewMeadows/ik-with-constraints 
inverse kinematics works with rotation constraints
 2015-09-11 17:34:50 -07:00
Ryan Huffman
2bb633d370 Merge pull request #5788 from birarda/master 
make node timeout less brittle (by giving it more time)
 2015-09-11 16:59:04 -07:00
Andrew Meadows
94b0074165 Merge pull request #5765 from ctrlaltdavid/20669-tidy 
Move cubic interpolation method to shared library
 2015-09-11 16:58:22 -07:00
Andrew Meadows
9c6060160a Merge pull request #5784 from howard-stearns/rationalize-rig-settings 
Rationalize rig settings
 2015-09-11 16:56:44 -07:00
Brad Davis
2daa5c3bf6 PR comment, fix extra variable decl 2015-09-11 16:54:18 -07:00
Andrew Meadows
1500a36f72 oops forgot to uncomment constraint initialization 2015-09-11 16:49:49 -07:00
Stephen Birarda
6da388f2af cleanup UDT_CONNECTION_DEBUG, add time for node timeout 2015-09-11 16:38:14 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Howard Stearns
140ecc8e2c Get rid of implicit int->bool cast. 2015-09-11 16:28:41 -07:00
Brad Davis
e458eb7ae9 Merge pull request #5734 from sethalves/octree-shared-pointers 
octree uses shared pointers
 2015-09-11 16:00:04 -07:00
Andrew Meadows
d01c5d1ae5 fix crash bug 2015-09-11 15:01:31 -07:00