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
33284 commits 71 branches 56 tags 1.2 GiB
Commit graph

33284 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
359a318568 fold kinematic hold into normal hold (disabled by default, an argument enables) 2015-10-15 20:23:06 -07:00
Seth Alves
0964180f2c code review 2015-10-15 17:10:47 -07:00
Seth Alves
462918ffcf cleanups 2015-10-15 14:55:17 -07:00
Seth Alves
487131dde1 cleanups 2015-10-15 14:52:38 -07:00
Seth Alves
36a523478f Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-15 14:21:30 -07:00
Seth Alves
4903db45b1 give other avatars an anim-skeleton 2015-10-15 14:21:06 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
James B. Pollack
e63ed5cf84 Merge pull request #6087 from thoys/20708 
CR for Job #20708 - Script Editor Improvements
 2015-10-15 12:28:32 -07:00
Stephen Birarda
b6a2cc396c Merge pull request #6089 from ZappoMan/fixStat 
fix Queue OUT stat
 2015-10-15 11:53:34 -07:00
Seth Alves
a70ba4cd5a add some accessors 2015-10-15 11:42:53 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00
Seth Alves
1d8db13f41 switch to low-entity-server traffic hold 2015-10-15 10:56:47 -07:00
Seth Alves
c884f466bc adjust timing of action refresh 2015-10-15 10:40:58 -07:00
Seth Alves
64c5cde2d2 further unmangle branch split 2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b further unmangle branch split 2015-10-15 10:29:25 -07:00
Seth Alves
e571cb7ca4 more lock adjustments 2015-10-15 10:22:25 -07:00
Seth Alves
8195145dc7 further unmangle branch split 2015-10-15 10:13:00 -07:00
Seth Alves
d833fb08d7 further unmangle branch split 2015-10-15 10:03:32 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613 remove line that leaked over from other branch 2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c fix up AvatarActionHold 2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1 remove some debugging 2015-10-15 09:07:35 -07:00
Howard Stearns
2b32b23299 Merge pull request #6052 from thoys/JS_Rotation_FIX 
Fix avatar joint rotations / translations to be set by script
 2015-10-15 07:09:02 -07:00
Thijs Wenker
c99573ea64 Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now! 2015-10-15 15:35:35 +02:00
Thijs Wenker
8111432088 Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-15 14:50:20 +02:00
Clément Brisset
efd106e68c Merge pull request #6075 from birarda/default-asset-server 
add a migrator to move assets to ATP
 2015-10-14 17:02:10 -07:00
Andrew Meadows
982476d02b Merge pull request #6076 from hyperlogic/tony/turn-hips-while-moving 
Rotate the avatar to align with the HMD while moving
 2015-10-14 15:09:39 -07:00
samcake
4554d65230 Merge pull request #6077 from ZappoMan/monoOculusPreview 
basic mono preview for the oculus display plugin
 2015-10-14 15:07:46 -07:00
Anthony J. Thibault
3e7a6fd490 Change to boom offset for 3rd person HMD camera. 
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.

Now it is computed in world space, and is always behind the character's
position/orientation.  This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
 2015-10-14 14:43:59 -07:00
Seth Alves
21519c6418 debugging 2015-10-14 14:13:08 -07:00
Seth Alves
5ce39b74fd debugging 2015-10-14 13:58:19 -07:00
Seth Alves
9a2aa9a337 locking 2015-10-14 13:40:20 -07:00
Thijs Wenker
7df5ba01e6 JSConsole: 
executeCommand works async now
 2015-10-14 22:21:51 +02:00
Seth Alves
9937b6a3ef quiet some debugging 2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87 more locking 2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f more lock fixing 2015-10-14 12:49:06 -07:00
Thijs Wenker
9d2ae661e1 removed some XML from start-script button which possible caused an error before 2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10 ScriptEditor Improvements: 
- fixed run icon
 2015-10-14 21:00:50 +02:00
Seth Alves
fa2bf2b2d9 tighten up locking in actions 2015-10-14 11:43:03 -07:00
Thijs Wenker
96b6067d88 ScriptEditor Improvements: 
- Script restart works proper again
- Fixed on and off icon switch
- Replaced regular script output box with fully functional JSConsole!
 2015-10-14 20:37:47 +02:00
Thijs Wenker
880d34d483 JSConsole improvements 
- ability to set Script Engine
- clear function for clearing the output
- only show evaluation output for executeCommand, print() and error output is still being printed
 2015-10-14 20:35:15 +02:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d terse entity-edit logging 2015-10-14 09:31:44 -07:00
Seth Alves
2a9b1c0fc3 fix refresh of hold action 2015-10-14 09:31:29 -07:00
Seth Alves
698a4001a8 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511 rename a function 2015-10-14 06:17:55 -07:00
Thijs Wenker
660bf6b3ea ScriptEditor: single quotes support and spelling fix 2015-10-14 14:47:29 +02:00
Thijs Wenker
c9312803bd Merge branch 'master' of https://github.com/worklist/hifi 2015-10-14 14:12:42 +02:00
Anthony J. Thibault
1c1221597d Merge branch 'master' into tony/turn-hips-while-moving 2015-10-13 18:38:27 -07:00