Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 08:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

32492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Downe Karpf
9c71d5fd4d Merge pull request #5750 from ZappoMan/boombox 
lower volume
 2015-09-09 09:30:29 -07:00
Brad Hefta-Gaub
b0329a58a6 lower volume 2015-09-09 09:29:31 -07:00
Brad Hefta-Gaub
86aa14a351 Merge pull request #5749 from jherico/marge 
Reduce logging spam in omniTools/magBalls
 2015-09-09 09:20:22 -07:00
Seth Alves
7b656d5ead make a couple variable names better 2015-09-09 03:30:09 -07:00
Anthony J. Thibault
39aef6edc9 AnimController fix for crash if underPoses vector was empty. 2015-09-08 21:42:42 -07:00
Brad Davis
75a05ff15d Reduce logging spam in omniTools/magBalls 2015-09-08 20:56:54 -07:00
Anthony J. Thibault
75ecf0020d WIP commit, added AnimController node. 2015-09-08 20:34:21 -07:00
Seth Alves
4a65f1fc6d Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers 2015-09-08 19:20:27 -07:00
Seth Alves
babe6179c3 Merge branch 'octree-shared-pointers' of github.com:sethalves/hifi into octree-shared-pointers 2015-09-08 19:19:59 -07:00
Seth Alves
4fa1818807 remove a line that leaked over from other branch 2015-09-08 19:19:49 -07:00
Andrew Meadows
e86e760118 remove debug stuff and nerfed constriants 2015-09-08 19:14:31 -07:00
Andrew Meadows
381828dac3 remove hackery for bad length units in AnimSkeleton 2015-09-08 19:02:16 -07:00
Andrew Meadows
ee265aba4a add AnimInverseKinematics class 2015-09-08 18:20:22 -07:00
Andrew Meadows
3d661095dc fix some bugs in RotationConstraints 2015-09-08 18:20:03 -07:00
Andrew Meadows
b6cef3d1a9 fix Qt includes 2015-09-08 18:19:33 -07:00
Andrew Meadows
00c446d1b0 sort includes 2015-09-08 18:19:18 -07:00
Andrew Meadows
c3e16d33c1 add InverseKinematics type 2015-09-08 18:18:50 -07:00
Brad Hefta-Gaub
ae8c3a19ed Merge pull request #5746 from imgntn/bubblewand_hotfix_1 
Run cleanup when createWand.js ends; Don't delete bubbles on collision (for now)
 2015-09-08 18:18:36 -07:00
Leonardo Murillo
841b5dc47a Merge pull request #5747 from ZappoMan/fixDefaultScripts 
fix issue with default scripts
 2015-09-08 19:09:45 -06:00
Brad Hefta-Gaub
ece8addf81 fix issue with default scripts 2015-09-08 18:08:30 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
James Pollack
66b6d5178f Cleanup wand when createWand.js script ends 2015-09-08 17:25:39 -07:00
Andrew Meadows
614c0be59a HACK so legless avatars don't drag their knuckles 2015-09-08 17:09:37 -07:00
Seth Alves
e06461ea15 Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements 
AnimDebugDraw Improvements
 2015-09-08 17:07:51 -07:00
Howard Stearns
ad411d1bae Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:22 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Brad Hefta-Gaub
0612ee498d Merge pull request #5742 from ericrius1/defaultGrab 
handControllerGrab.js is active by default
 2015-09-08 16:49:03 -07:00
Anthony J. Thibault
387d50c217 Added a flag to enable and disable lean. 
This should help improve our idle and walk animations, because
animation on the "lean" joint was being lost, even when we did
not require procedural leaning.
 2015-09-08 16:35:06 -07:00
Brad Davis
ec566a63fc Merge pull request #5736 from ZappoMan/breakdanceToy 
Breakdance Toy - better positioning on puppet
 2015-09-08 16:29:29 -07:00
Howard Stearns
2c856e4b08 Work around animation cache misbehavior wrt threads. 2015-09-08 16:22:06 -07:00
Ryan Huffman
0e1945fd3c Merge pull request #5743 from birarda/master 
put DomainServerConnectionToken back in NON_SOURCED
 2015-09-08 16:20:18 -07:00
Stephen Birarda
a3feff1bd4 put DomainServerConnectionToken back in NON_SOURCED 2015-09-08 16:19:15 -07:00
Eric Levin
e9ea42f9ad Merge pull request #5740 from ZappoMan/boombox 
add a boom box entity script
 2015-09-08 16:16:41 -07:00
ericrius1
717cbf3d5b handControllerGrab.js is active by default 2015-09-08 16:13:17 -07:00
Brad Hefta-Gaub
ca6c413221 tweak THE_SONG 2015-09-08 16:02:10 -07:00
Brad Hefta-Gaub
8c4d7b98fd fix header comment 2015-09-08 16:01:07 -07:00
Brad Hefta-Gaub
fe90af0e07 Merge pull request #5737 from ericrius1/grabChanges 
hydraGrab is now called handControllerGrab.js now grabs entities based on how they want to be grabbed (th…
 2015-09-08 15:59:28 -07:00
Seth Alves
ab82d12f96 Merge pull request #5694 from birarda/protocol 
Asset Transfer Protocol and UDT in networking layer
 2015-09-08 15:57:41 -07:00
ericrius1
572b120bf0 removed print statements 2015-09-08 15:57:31 -07:00
Stephen Birarda
c670c9a0d5 fix for AnimNodeLoader use of Resource loaded 2015-09-08 15:31:37 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Seth Alves
8a60bba4eb Merge branch 'master' of github.com:highfidelity/hifi into octree-shared-pointers 2015-09-08 15:28:46 -07:00
Stephen Birarda
e1a31f4dbe put back TextureCache headers 2015-09-08 15:23:26 -07:00
Stephen Birarda
255f896f7b remove extra cmake debug 2015-09-08 15:21:34 -07:00
Stephen Birarda
a3959109f1 resolve conflicts on merge with upstream/master 2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9 Merge pull request #5735 from hyperlogic/tony/no-particle-fix 
Fix for RenderableParticleffectEntityItem assert.
 2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f Merge pull request #5732 from jherico/selma 
Procedural skyboxes
 2015-09-08 15:12:59 -07:00
Andrew Meadows
4a40781e2f remove some commented out cruft 2015-09-08 15:11:19 -07:00
Andrew Meadows
281e4f21fc fix avatar bounding capsule calculations 2015-09-08 15:03:12 -07:00
Andrew Meadows
90fe54e6d6 remove cruft and minor cleanup 2015-09-08 15:03:12 -07:00