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

38681 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
f13e31c7fc CharacterController: removed unnecessary code. 2016-02-05 10:53:58 -08:00
Anthony J. Thibault
bfeace78f7 AnimInverseKinematics: warning fixes 2016-02-04 18:51:48 -08:00
Anthony J. Thibault
51189cfc50 AnimInverseKinematics: opened up UpLeg and Leg constraints 
This improves the quality of the jump animations, while IK is enabled.
 2016-02-04 17:56:41 -08:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations 
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
 2016-02-04 17:56:07 -08:00
Anthony J. Thibault
a8e092272c AnimStateMachine: added new State parameter interpType 
interpType defines how the interpolation between two states is performed.

   * SnapshotBoth: Stores two snapshots, the previous animation before interpolation begins and the target state at the
     interTarget frame.  Then during the interpolation period the two snapshots are interpolated to produce smooth motion between them.
   * SnapshotPrev: Stores a snapshot of the previous animation before interpolation begins.  However the target state is
     evaluated dynamically.  During the interpolation period the previous snapshot is interpolated with the target pose
     to produce smooth motion between them.  This mode is useful for interping into a blended animation where the actual
     blend factor is not known at the start of the interp or is might change dramatically during the interp.
 2016-02-04 10:32:58 -08:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation 
Fix Agents bidding on simulation ownership
 2016-02-03 13:45:12 -08:00
Andrew Meadows
861082964e Merge pull request #7017 from hyperlogic/tony/fly 
MyAvatar: Improved Jump / InAir / Fly behavior
 2016-02-03 12:22:30 -08:00
Andrew Meadows
00f30201a7 Merge pull request #7003 from sethalves/save-held-adjustments 
automatically save adjustments to offsets of equipped items
 2016-02-03 12:21:17 -08:00
Brad Hefta-Gaub
839ce50bde Merge pull request #7018 from jherico/qml 
QML fixes
 2016-02-03 11:59:27 -08:00
Ryan Huffman
77b86e654e Merge pull request #7006 from birarda/final-overrides 
fix the last of the current override warnings for OS X
 2016-02-03 11:26:46 -08:00
Stephen Birarda
93530fca72 fix the last of the current override warnings for OS X 2016-02-03 11:08:41 -08:00
Seth Alves
ad2a7bfc3c code review 2016-02-03 10:54:08 -08:00
Andrew Meadows
cd56d635e1 Merge pull request #7012 from sethalves/adjust-palm-position 
base palm position on finger joint rather than an offset from hand joint
 2016-02-03 10:34:39 -08:00
Anthony J. Thibault
fff603e4e2 Removed comment 2016-02-03 10:21:27 -08:00
Ryan Huffman
963c71a476 Fix ES rejecting unowned entity physics updates 2016-02-03 09:28:49 -08:00
samcake
4d62df2996 Merge pull request #7011 from zzmp/fix/render-connect-warnings 
Only connect render config if dirty signal present
 2016-02-02 17:46:22 -08:00
samcake
940ef40b69 Merge pull request #6999 from zzmp/refactor/render-init-file 
Migrate stencil and overlay jobs to use plumbers
 2016-02-02 17:45:17 -08:00
Zach Pomerantz
aa10af2851 Revert "Move DrawStencil to use ShapePlumber" 
This reverts commit 671f27e5bc.
 2016-02-02 17:10:21 -08:00
Seth Alves
6503fd6d46 Merge pull request #7009 from PhilipRosedale/calibrateNoBumper 
calibrate hydras using either the 1 or 2 button on each hand
 2016-02-02 17:04:55 -08:00
Seth Alves
30e97c2a76 run attachedEntitiesManager.js by default, but without a UI 2016-02-02 16:34:06 -08:00
Bradley Austin Davis
bc7fda0ae9 Set desirable global settings for QML web views 2016-02-02 15:19:47 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Anthony J. Thibault
6cc3b2b47f Fixed unused variable warnings on OSX and Linux 2016-02-02 15:04:28 -08:00
Bradley Austin Davis
cede14fdc6 Don't cut off title of windows without close icons 2016-02-02 14:32:04 -08:00
Brad Hefta-Gaub
a025fab5c8 Merge pull request #7016 from jherico/qml 
QML Fixes
 2016-02-02 14:08:45 -08:00
Ryan Huffman
759b1a347c Merge pull request #7015 from birarda/audio-mute-crash 
rename canAdjustLocks to isAllowedEditor, add debug for crash
 2016-02-02 13:12:06 -08:00
Ryan Huffman
25632b63b7 Adjust Entities.addEntity to not bid on simulation from AC Script 2016-02-02 13:00:35 -08:00
Anthony J. Thibault
656608e2ff Fixes for away.js 2016-02-02 12:08:52 -08:00
Bradley Austin Davis
2c26b32341 Make QML based tool-windows close properly 2016-02-02 12:00:58 -08:00
Bradley Austin Davis
5adf9adb0e Make mirror rectaqngle move with mirror controls 2016-02-02 12:00:17 -08:00
James B. Pollack
43bf7cf679 Merge pull request #7014 from huffman/disable-edit-grid 
Disable gridTool in edit.js
 2016-02-02 11:44:46 -08:00
Stephen Birarda
79dc2d5d55 add some debug for mute environment crash 2016-02-02 11:40:15 -08:00
Anthony J. Thibault
c4e1509aa2 CharacterController: better debug support of internal state machine 
Head is no longer visible when flying fast, in first-person HMD mode.
 2016-02-02 11:26:18 -08:00
Anthony J. Thibault
8b5cf3e49a CharacterController: refined state machine. 2016-02-02 11:26:17 -08:00
Anthony J. Thibault
47f3ce3786 CharacterController jump is more reliable. 2016-02-02 11:26:16 -08:00
Anthony J. Thibault
2936811484 Added takeoff animation, WIP 
Character controller still has some jump/in-air bugs.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
61c55ebf6c Updated character controller with a state enumeration 
Also, adjusted checkForSupport logic such that very slanted walls are not considered support.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd Added inAir animations 2016-02-02 11:23:46 -08:00
Ryan Huffman
eff02d3e3a Fix Agents bidding on simulation ownership 2016-02-02 10:47:51 -08:00
Ryan Huffman
57d92bcfa6 Stop creation of GridTool altogether in edit.js 2016-02-02 10:13:24 -08:00
Ryan Huffman
dad36b73fc Disable gridTool in edit.js 2016-02-02 09:57:52 -08:00
Andrew Meadows
ee96341380 Merge pull request #7001 from imgntn/masterOffsets 
Update reset scripts to use new offset style
 2016-02-02 08:25:32 -08:00
Andrew Meadows
e394f64540 Merge pull request #6991 from seefo/master 
Added camera sensitivity dialog preferences
 2016-02-02 08:22:45 -08:00
James B. Pollack
d25dbfff9f Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger 
doppelganger.js: mirror joint rotations & translations about x-axis
 2016-02-01 19:09:42 -08:00
James B. Pollack
8a70e53131 Merge pull request #7004 from jherico/qml 
Small QML fixes
 2016-02-01 19:08:38 -08:00
Seth Alves
1e69c12e87 move grab position to front of palm 2016-02-01 18:47:26 -08:00
Bradley Austin Davis
4860c7d4f1 Give title to tool window 2016-02-01 18:28:23 -08:00
Bradley Austin Davis
aecf582593 Don't crash on GL error in present thread 2016-02-01 18:26:32 -08:00
Seth Alves
2501be16cb base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere 2016-02-01 18:11:27 -08:00
Zach Pomerantz
0b6cfbe50a Only connect render config if dirty signal present 2016-02-01 17:48:31 -08:00