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

13866 commits

Author SHA1 Message Date
ericrius1
bbfb282e37 reverted accidental change in AvatarData.h 2015-11-16 17:21:29 -08:00
Eric Levin
eca11d3a99 sending message in correct format 2015-11-16 12:47:16 -08:00
Eric Levin
a2abc11df1 Merge pull request #6351 from huffman/script-path-resolution 
Update script engine path resolution behavior to behave consistently
 2015-11-10 14:10:42 -08:00
samcake
d3d5d3a19e Removing useless code 2015-11-10 12:02:20 -08:00
samcake
2cf2257783 Fix warning 2015-11-10 09:20:43 -08:00
samcake
d1df6854ac Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-10 09:16:28 -08:00
Brad Hefta-Gaub
0ea901fd72 fix various warnings 2015-11-10 08:34:58 -08:00
Sam Gateau
06a87012ad Removing the setJointTranslations which is not helping... 2015-11-09 23:38:51 -08:00
Sam Gateau
b47c5dbff2 Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays 2015-11-09 23:12:04 -08:00
samcake
77e21b7190 Trying to fix the animation recording and playback, but still not good 2015-11-09 18:18:30 -08:00
Brad Hefta-Gaub
021a6e689d added some asserts to test future mistakes that would cause render item leaks 2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub
e47b049200 fix render item leak on Model::reset() 2015-11-09 16:41:40 -08:00
U-GAPOS\andrew
390310f822 swap the order of checks 2015-11-09 14:15:09 -08:00
U-GAPOS\andrew
c07b97920e fix for avatars created with blender 2015-11-09 14:11:45 -08:00
U-GAPOS\andrew
2716a9f2b4 fix IK for feet targets 2015-11-09 13:11:03 -08:00
samcake
5bc827981d Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-09 12:32:10 -08:00
Eric Levin
7700e67734 Merge pull request #6326 from imgntn/entity_params 
Add Ability to Pass Parameters When Calling Methods on Entities
 2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266 Update script engine path resolution behavior 
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
 2015-11-09 12:04:17 -08:00
samcake
25d67656e9 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-09 11:35:43 -08:00
James B. Pollack
1812444614 Merge pull request #6278 from ericrius1/particleSorting 
Added additiveBlending property to particle effect entity
 2015-11-09 11:32:44 -08:00
Brad Davis
07be03dc7e Bad merge fix, PR feedback 2015-11-09 09:30:18 -08:00
samcake
2078c753ae Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-09 09:23:59 -08:00
Brad Davis
2ecc4f8a5c Prevent sixense manager from triggering continuous reset 2015-11-09 09:16:32 -08:00
Clément Brisset
2c27d18922 Merge pull request #6282 from jherico/externals 
Runtime plugins fixes
 2015-11-06 19:30:40 -08:00
Brad Davis
e84f3af483 Merge pull request #6343 from Atlante45/sixense 
Sixense cleanup
 2015-11-06 17:50:12 -08:00
Atlante45
68a72b0f41 Bit of cleanup 2015-11-06 17:28:51 -08:00
samcake
cbeb56aba4 using the frameInterpolatorCOrrectly 2015-11-06 17:25:50 -08:00
Brad Davis
6122fa145d More PR feedback 2015-11-06 17:17:26 -08:00
Atlante45
137a2c1c48 Fix file headers 2015-11-06 17:15:34 -08:00
samcake
07fb3a0532 Merge pull request #6341 from howard-stearns/for-sam 
Make life easier for Sam.
 2015-11-06 17:13:22 -08:00
Howard Stearns
314c11e8d4 Make life easier for Sam. 2015-11-06 16:59:46 -08:00
Brad Davis
37a9538f10 PR feedback, ensure destruction of shared objects 2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f Allow shared libraries to access core global objects 2015-11-06 16:57:31 -08:00
Atlante45
6323728d7a Added perfect forwarding of arguments 2015-11-06 16:56:48 -08:00
Atlante45
d95709ee73 Added input plugins logging category 2015-11-06 16:45:23 -08:00
Atlante45
0a65bb145b Some more code cleanup 2015-11-06 16:44:28 -08:00
samcake
7890aa6ec1 Merge pull request #6333 from jherico/rec2 
Adding clip serialization implementation, tests
 2015-11-06 16:38:39 -08:00
Atlante45
6ad20e417b Typo 2015-11-06 16:33:36 -08:00
Atlante45
e3b54f0272 Cleanup 2015-11-06 16:33:29 -08:00
Atlante45
503e03d4a8 Remove unused using 2015-11-06 16:33:22 -08:00
Atlante45
96aa5be457 Implement all Sixense methods for OS X 2015-11-06 16:33:16 -08:00
Atlante45
298ac650d8 Isolate sixense dynamic linking for OSX 2015-11-06 16:33:07 -08:00
samcake
5fb2c3ccd1 resolve merge conflict 2015-11-06 16:27:47 -08:00
samcake
4dbca68767 Updating the legacy file format to support the joint translation and also fix the replay problem oof the joints going to the moon 2015-11-06 16:24:19 -08:00
Clément Brisset
143e92ee1b Merge pull request #6300 from jherico/lisa 
Breaking up InputDevices and InputPlugins, cleanup of some shared_ptr madness
 2015-11-06 16:15:53 -08:00
Brad Davis
bf70ae4724 PR feedback 2015-11-06 15:59:13 -08:00
Brad Davis
7c433f47c0 Breaking up input devices and input plugins classes. 2015-11-06 15:20:00 -08:00
Andrew Meadows
e410030dd9 Merge pull request #6320 from hyperlogic/tony/blender-avatar-ik-fix 
IK fix for avatars exported from Blender
 2015-11-06 15:00:25 -08:00
Brad Davis
4513b638db Adding clip serialization implementation, tests 2015-11-06 14:40:21 -08:00
James B. Pollack
8eea7ff67c Merge pull request #6329 from sethalves/fix-grab-release 
send to server upon grab release
 2015-11-06 14:33:08 -08:00