Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 13:13:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32251 commits 71 branches 56 tags 1.2 GiB
Commit graph

32251 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
cf6f77425f Merge pull request #5915 from birarda/test-3.3 
fix for polyvox external CMakeLists in CMake 3.3.2
 2015-09-28 15:04:59 -07:00
Howard Stearns
e6b9cbacf7 Merge pull request #5910 from hyperlogic/tony/small-anim-debug-improvements 
Fix for Head when switching between HMD and Desktop mode
 2015-09-28 14:13:03 -07:00
Brad Hefta-Gaub
ae73a7e97f Merge pull request #5904 from imgntn/grab_updates_1 
[Scripts] Add ability for entities to declare themselves ungrabbable
 2015-09-28 12:55:51 -07:00
samcake
e032ed4811 Merge pull request #5917 from jherico/lisa 
Fix for bad textures when using _glActiveBindTexture
 2015-09-28 12:41:48 -07:00
Brad Davis
203c601e95 Fix for bad textures when using _glActiveBindTexture 2015-09-28 12:26:11 -07:00
Stephen Birarda
2976520061 remove an extra debug in root CMake 2015-09-28 14:53:53 -04:00
Stephen Birarda
386df86fd1 use the OS X version as the desired SDK 2015-09-28 14:52:17 -04:00
Stephen Birarda
3744632122 allow SDK fallback if 10.9 not present 2015-09-28 14:37:59 -04:00
Stephen Birarda
06ca4dfbde fix polyvox double name change command 2015-09-28 14:26:53 -04:00
Anthony J. Thibault
a495a45ed0 unset "lean" when headParams.enableLean is false 
Also added AnimVariantMap::dump() which will print out all the
currently set anim vars and their values.
 2015-09-28 11:10:22 -07:00
James B. Pollack
affb0253db Update handControllerGrab.js 
added a semicolon to the end of a return statement
 2015-09-28 10:26:52 -07:00
James B. Pollack
2d477ad3b9 Merge pull request #5908 from highfidelity/imgntn-patch-1 
[Scripts] Update collectHifiStats.js
 2015-09-28 10:21:53 -07:00
Philip Rosedale
0b450e0bee Merge pull request #5905 from thoys/20694 
CR for Job #20694 - Add audio packet loss to the stats collection capability
 2015-09-28 10:20:15 -07:00
Anthony J. Thibault
c970ff0c0c Reset joint priorities back to 0 for new animation system. 
Added Rig::clearJointStatePriorities() to do this.
 2015-09-27 18:25:28 -07:00
Anthony J. Thibault
4b31d87bf5 renamed magic constant to FRAMES_PER_SECOND. 2015-09-27 17:52:53 -07:00
Anthony J. Thibault
5a24a020ca Fix for HMD rotation sticking between 2d & HMD mode 
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
 2015-09-27 17:44:54 -07:00
Anthony J. Thibault
a2562c92f4 Small changes to Anim System for Debugging 
* Added constant for Rig animation fade time
* Added index output for AnimSkeleton::dump()
 2015-09-27 16:24:55 -07:00
James B. Pollack
b254353b38 Update collectHifiStats.js 
Clears the current batch after we send it to the endpoint.
 2015-09-26 07:09:41 -07:00
Thijs Wenker
14fc39ffa3 Added JS access to the variables 
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
 2015-09-26 02:36:01 +02:00
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean 
Threshold based walking/leaning while in HMD.
 2015-09-25 15:51:39 -07:00
Howard Stearns
9e001f0b4b Merge pull request #5903 from AndrewMeadows/ik-repairs-006 
enforce target rotation during IK calculations
 2015-09-25 15:50:59 -07:00
James B. Pollack
a6c3a601ae Merge pull request #5896 from thoys/20672 
Worklist job #20672 - Create a script to record a users stats
 2015-09-25 15:30:55 -07:00
James Pollack
1f7914766c Add ability to prevent an object from being grabbable by specifying a custom key grabbableKey to grabbable:false 2015-09-25 15:26:29 -07:00
Andrew Meadows
a97f556958 enforce IK target rotation 2015-09-25 15:13:57 -07:00
Thijs Wenker
5fc053cf97 Merge pull request #1 from imgntn/thoys-20672 
Update stat collection to occur in batches
 2015-09-26 00:04:25 +02:00
James Pollack
2c0c2a0979 Merge remote-tracking branch 'upstream/master' into thoys-20672 2015-09-25 14:49:31 -07:00
Anthony J. Thibault
402573dbf1 Remove unused local 2015-09-25 14:11:33 -07:00
James Pollack
9626bed8ca Merge remote-tracking branch 'upstream/master' 2015-09-25 12:24:39 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
Eric Levin
135e2683a6 Merge pull request #5902 from ctrlaltdavid/particles-fixes 
Particles fixes
 2015-09-25 10:56:18 -07:00
James Pollack
1051416ed7 Change stat collection to batch stats together to make fewer network calls 2015-09-25 10:33:16 -07:00
James Pollack
54419301f3 Merge branch '20672' of https://github.com/thoys/hifi into thoys-20672 2015-09-25 10:01:33 -07:00
Andrew Meadows
4f0bd08b62 Merge pull request #5900 from ZappoMan/batchOptimizations 
more work on batch optimzation
 2015-09-25 09:00:38 -07:00
Andrew Meadows
7822d58164 Merge pull request #5870 from howard-stearns/apostrophe 
Apostrophe key resets animation state.
 2015-09-25 08:50:19 -07:00
James B. Pollack
857a7f8a83 Merge remote-tracking branch 'upstream/master' 2015-09-24 22:19:02 -07:00
David Rowe
d233d3f81b Fix particle emitter corner cases 2015-09-24 19:17:02 -07:00
David Rowe
629128c17f Fix particle emit directions for point emitter 2015-09-24 19:16:28 -07:00
David Rowe
d063f3488d Back out fromSpherical code addition 2015-09-24 19:14:26 -07:00
Anthony J. Thibault
474c847ef1 Updated constants and units. 2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD. 
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
 2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
James B. Pollack
b2bbaf4e7b Merge pull request #5899 from ericrius1/grabAPI 
Fixed a one line bug
 2015-09-24 16:52:43 -07:00
Eric Levin
6ea07f1e41 Merge pull request #6 from imgntn/ericrius1-grabAPI 
re add allTouchedIDs object
 2015-09-24 16:39:13 -07:00
James Pollack
fd43956502 re add allTouchedIDs object 2015-09-24 16:35:59 -07:00
Brad Hefta-Gaub
8a8da58dfd Merge pull request #5898 from kencooke/audio-src 
Completely remove SOXR from cmake
 2015-09-24 15:59:23 -07:00
Brad Hefta-Gaub
c75284ccde Merge pull request #5891 from imgntn/doll_updates_1 
[Scripts] Doll Updates
 2015-09-24 15:58:57 -07:00
Brad Hefta-Gaub
8fef47a488 Merge pull request #5873 from ericrius1/grabAPI 
[Scripts] handControllerGrab.js now handles touches.  Also handles grabs on non-colliding objects
 2015-09-24 15:58:14 -07:00
Brad Hefta-Gaub
be4fda3493 Merge pull request #5882 from imgntn/flashlight_updates_2 
[Scripts] Flashlight Updates
 2015-09-24 15:56:22 -07:00
Eric Levin
a453b7f7cd Merge pull request #5 from imgntn/ericrius1-grabAPI 
fix weird multi line thing
 2015-09-24 15:36:26 -07:00