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

33467 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
20d1a2440c Ignoring unknown types in collision 2015-10-14 11:15:49 -07:00
ericrius1
caacbcbe78 Adjust erase box position 2015-10-14 10:40:55 -07: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
Seth Alves
f61a005ebc cleanups 2015-10-13 17:47:41 -07:00
Brad Hefta-Gaub
c4af4c7b10 basic mono preview for the oculus display plugin 2015-10-13 17:45:29 -07:00
Anthony J. Thibault
e484a904a2 Rotate the avatar to align with the HMD while moving 
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.

* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
  for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.

New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.

Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms.  This hysteresis should help smooth over two issues.

1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
 2015-10-13 17:36:00 -07:00
Seth Alves
74ced250c1 don't compress joint rotations 2015-10-13 17:18:28 -07:00
Andrew Meadows
073b019458 Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup 
Don't reload/recenter some avatar data on startup
 2015-10-13 17:08:00 -07:00
Stephen Birarda
d84994d8e0 fix casing for ubuntu include failure 2015-10-13 17:04:45 -07:00
Stephen Birarda
2caa7f6d64 change getUrl to getATPUrl, use in ATPAssetMigrator 2015-10-13 16:56:20 -07:00
Seth Alves
644076214e fix hang 2015-10-13 16:55:04 -07:00
ericrius1
8e21999e44 erasing board 2015-10-13 16:54:37 -07:00
Stephen Birarda
574089530a make sure request is not nullptr before using it 2015-10-13 16:49:12 -07:00
Andrew Meadows
a331edcee9 Merge pull request #6073 from ZappoMan/comfortModeHack 
implement comfort mode hack
 2015-10-13 16:47:45 -07:00
Stephen Birarda
d22c602041 use categorized logging in ATPAssetMigrator 2015-10-13 16:44:13 -07:00
ericrius1
e42bbbc10d Adding erase board feature to whiteboard 2015-10-13 16:41:05 -07:00
Stephen Birarda
cc93767077 remove some extra spaces 2015-10-13 16:38:00 -07:00
Stephen Birarda
76bfc6218a add back block removed in merge 2015-10-13 16:36:10 -07:00
Seth Alves
4402242c3c allow an action to suppress sending of physics related edits to the entity-server 2015-10-13 16:27:40 -07:00
Brad Hefta-Gaub
8a2e23cae4 CR feedback 2015-10-13 16:20:52 -07:00
Seth Alves
2ecb7e8d29 fix bug that was making action deletes fail 2015-10-13 16:19:12 -07:00
Stephen Birarda
1450305390 fix ATP url scheme constant 2015-10-13 16:13:47 -07:00
ericrius1
2c8b85bb5c Displaying overlay laser pointer, user must past threshold to paint 2015-10-13 16:13:24 -07:00
Stephen Birarda
fc82ea8541 resolve conflicts on merge with upstream/master 2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d Merge pull request #6074 from huffman/fix-empty-hash 
Fix crash when atp url is empty
 2015-10-13 16:02:28 -07:00
ericrius1
4c877e8204 Changing color when grabbing colored boxes 2015-10-13 15:46:10 -07:00
ericrius1
b54b488b9e Adding in color selecting 2015-10-13 15:23:02 -07:00
Stephen Birarda
549043f255 add an option to bulk upload assets in ATPAssetMigrator 2015-10-13 15:20:37 -07:00
Seth Alves
4fa85441b8 tweak 2015-10-13 15:14:34 -07:00
Ryan Huffman
c468cabe7e Fix crash when atp url is empty 2015-10-13 15:12:01 -07:00
Brad Hefta-Gaub
ad96d76921 implement comfort mode hack 2015-10-13 15:06:11 -07:00
ericrius1
a3f948acf8 Adding entity script to each color box 2015-10-13 15:00:38 -07:00
Seth Alves
257e3845de get action type correct 2015-10-13 14:45:20 -07:00
Seth Alves
755b971906 tweak 2015-10-13 14:31:52 -07:00
ericrius1
ad61b89abd setting up colors, adding some functions to utils.js 2015-10-13 14:16:28 -07:00
Seth Alves
fcbb107bc0 tweak 2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6 tweak 2015-10-13 13:50:43 -07:00
James B. Pollack
5f36972cfc Merge pull request #6071 from imgntn/invert_solids 
[Scripts] Toybox Updates
 2015-10-13 13:48:31 -07:00
ericrius1
b490f9e2c1 Drawing line width based on trigger squeeze 2015-10-13 13:33:24 -07:00
Seth Alves
54eac099b9 tweak 2015-10-13 12:52:53 -07:00
Howard Stearns
93e908a592 Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized. 2015-10-13 12:15:13 -07:00
Seth Alves
83780296de don't send physical property updates if there's an action on the object 2015-10-13 12:12:57 -07:00
Seth Alves
7c52849740 change how hold action works 2015-10-13 11:36:58 -07:00