Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 04:17:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36161 commits 76 branches 59 tags 1.2 GiB
Commit graph

36161 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
4a5b9bd523 start position 2015-12-05 16:57:09 -08:00
James B. Pollack
4999b34327 cleanup interval 2015-12-05 16:54:55 -08:00
James B. Pollack
f33f4cbcae cleanup 2015-12-05 16:22:17 -08:00
James B. Pollack
1f2d726211 awesome stuff 2015-12-05 16:16:58 -08:00
Seth Alves
d518a4573e if script sets parent or jointIndex, don't pop entity off to someplace 2015-12-05 15:15:33 -08:00
Seth Alves
1f0150f65f add parentID and parentJointIndex to terse logging 2015-12-05 15:12:44 -08:00
Seth Alves
44285dab25 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-05 14:31:53 -08:00
James B. Pollack
3b6cd4c2d1 initial live earthqukes commit 2015-12-05 14:11:59 -08:00
David Rowe
404deba78d Adjust avatar thumb root joint angle to look better 2015-12-05 16:26:21 +13:00
David Rowe
560b9f012f Get hand positioning and orientation working again 2015-12-05 16:25:28 +13:00
Clément Brisset
2ace061893 Merge pull request #6564 from sethalves/fix-line-overlays 
fix 3d line overlays
 2015-12-04 17:38:15 -08:00
Clément Brisset
3c83f1be8b Merge pull request #6566 from sethalves/fix-avatar-mixer-parents-crash 
fix avatar-mixer parents-related crash
 2015-12-04 17:03:15 -08:00
Seth Alves
f9d8793bab Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-04 16:46:05 -08:00
Seth Alves
7448d9f262 Merge pull request #6565 from hyperlogic/tony/thread-safe-rig-joint-getters 
Make Avatar::getJointRotation and getJointTranslation thread-safe
 2015-12-04 16:45:56 -08:00
Seth Alves
62b4eac875 fix avatar-mixer parents-related crash 2015-12-04 16:41:56 -08:00
Seth Alves
3828a72dc0 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-04 16:17:49 -08:00
Anthony J. Thibault
7abfc93ff9 Avatar::getJointRotation and getJointTranslation is thread-safe 
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
 2015-12-04 16:16:17 -08:00
Howard Stearns
fa0ad1fe4d Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-04 16:12:22 -08:00
Seth Alves
817f0307a0 fix 3d line overlays 2015-12-04 15:51:19 -08:00
James B. Pollack
bfe12cf8db stability improvments 2015-12-04 15:49:04 -08:00
Brad Hefta-Gaub
5bbff7534d Merge pull request #6560 from birarda/log-handler-crash 
don't stop a non-started timer, debug cleanup
 2015-12-04 15:46:51 -08:00
Brad Hefta-Gaub
2c2813e06e Merge pull request #6563 from howard-stearns/fix-present-rate 
Fix present rate stats display
 2015-12-04 15:27:45 -08:00
James B. Pollack
b8e731fd22 adjustments 2015-12-04 15:25:55 -08:00
James B. Pollack
f867ebf1d1 every sixth rat 2015-12-04 15:18:35 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
1eb5b21e48 fix warning 2015-12-04 15:17:16 -08:00
James B. Pollack
b1ec1eb113 make injectors more stable 2015-12-04 15:17:13 -08:00
Anthony J. Thibault
ba001ef4b0 Rig: split Poses into internal and external sets. 
In preparation for making some accessors thread safe.
 2015-12-04 15:15:18 -08:00
howard-stearns
0a9b42ad3c Fix present rate stats display, which was counting (roughly) twice for 2D 
display, and flickering.
 2015-12-04 15:10:46 -08:00
Brad Hefta-Gaub
2a243ccd17 Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux 2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
be4bc7b2ca going a different way, same packet version, but always send feature requests to old servers 2015-12-04 14:55:16 -08:00
Philip Rosedale
06c8235b19 Merge pull request #6544 from sethalves/distance-grab-adjustment 
distance-hold adjustment
 2015-12-04 14:34:10 -08:00
Brad Hefta-Gaub
7faf9c2f22 bump protocol version 2015-12-04 14:33:45 -08:00
Brad Hefta-Gaub
46946212cf remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true 2015-12-04 14:24:31 -08:00
Stephen Birarda
ad4f818b21 only attempt to stop QTimer if active 2015-12-04 14:12:41 -08:00
Seth Alves
f940a5c1c5 Merge branch 'distance-grab-adjustment' of github.com:sethalves/hifi into parents 2015-12-04 14:11:58 -08:00
James B. Pollack
51b0c48866 splicing and dicing 2015-12-04 14:05:31 -08:00
Brad Hefta-Gaub
f44a9daa21 remove WANT_DELTA from OctreeQuery 2015-12-04 14:04:57 -08:00
James B. Pollack
3211bec7ce increase distance for rat to be in the nest and deleted 2015-12-04 13:57:59 -08:00
James B. Pollack
7ed0e3d8ae change clear rat order 2015-12-04 13:56:38 -08:00
Stephen Birarda
d2fdf6a04b Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash 2015-12-04 13:55:57 -08:00
James B. Pollack
a9aecb5c49 add rat sounds 2015-12-04 13:54:59 -08:00
Brad Hefta-Gaub
f71d2d00d2 Merge pull request #6548 from jherico/threaded_present 
Threaded present
 2015-12-04 13:42:09 -08:00
Brad Hefta-Gaub
0d9d5375c7 remove optional WANT_COMPRESSION from OctreeQuery 2015-12-04 13:29:18 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Ryan Downe Karpf
950d020d77 Merge pull request #6553 from ericrius1/noBlockCollisions 
Blocks dont collide when held
 2015-12-04 11:59:39 -08:00
Stephen Birarda
165db97cb2 cleanup double reset debug on assignment-client restart 2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1 Merge pull request #6559 from birarda/log-handler-crash 
reset the NodeList on its own thread
 2015-12-04 11:44:06 -08:00
ericrius1
3bb1dedaf9 fixed syntax error 2015-12-04 11:41:23 -08:00
Brad Hefta-Gaub
79d60f74ba Merge pull request #6558 from sethalves/parents 
fix an AC race/crash
 2015-12-04 11:40:21 -08:00