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

38788 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
e51edaa117 update some comments 2016-02-04 13:26:06 -08:00
Andrew Meadows
381049acb3 clear simulation ownership when owners vanish 2016-02-04 13:26:06 -08:00
Andrew Meadows
05fb866bb5 fix spelling typo in comment 2016-02-04 13:26:06 -08:00
Andrew Meadows
e3351c05a2 make some methods const 2016-02-04 13:26:06 -08:00
Eric Levin
294a7ee9ad Merge pull request #7027 from birarda/avatars-property 
move two AvatarList invokable methods from AvatarManager to AvatarHashMap
 2016-02-04 11:41:52 -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
James B. Pollack
3c9043987f Merge pull request #7019 from birarda/absolute-paths 
allow absolute path to entity-server persist file
 2016-02-04 08:53:21 -08:00
James B. Pollack
8b09cf3b82 Merge pull request #7024 from birarda/audio-mute-crash 
fix for audio-mixer mute env crash
 2016-02-04 08:53:10 -08:00
Babiuch, Ryan Nicholas
0069849da3 Consider existing velocity in calculating energy costs when editing entities. 2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c Conform to coding standard. 2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06:00
Eric Levin
2af6c08057 Merge pull request #7022 from imgntn/mastertoys 
Fix userData for pistol in toybox reset scripts
 2016-02-03 17:47:21 -08:00
Eric Levin
32fc973698 Merge pull request #7010 from imgntn/cellscience 
Decrease Cell Science Volume
 2016-02-03 17:46:56 -08:00
Stephen Birarda
816fe52c5b mark getAvatarBySessionID as virtual 2016-02-03 17:31:38 -08:00
Stephen Birarda
058bba7b55 move avatar invokables from AvatarManager to AvatarHashMap 2016-02-03 17:13:35 -08:00
Anthony J. Thibault
d2068678f4 MyAvatar: bumped up size of head, w.r.t. head cauterization. 
This is to avoid some issues where face is visible when looking straight down.
Specifically, with the Albert avatar.
 2016-02-03 16:08:11 -08:00
Anthony J. Thibault
027a2166f5 MyAvatar: Use head to turn while flying in HMD mode 2016-02-03 15:44:06 -08:00
Bradley Austin Davis
60d97c45af Support save file dialog 2016-02-03 14:51:10 -08:00
Bradley Austin Davis
8f85abfec8 Support 'naked' selection globs in file dialog 2016-02-03 14:51:07 -08:00
Bradley Austin Davis
320c4d27b5 Force Qt (rather than OS) rendering in a number of places 2016-02-03 14:51:05 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -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
Stephen Birarda
ea9d84bdc4 handle downloading of absolute persist file contents 2016-02-03 13:18:29 -08:00
Babiuch, Ryan Nicholas
786400eb53 Merge branch 'WorkingEnergy' 2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
d7951f4300 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 14:52:08 -06:00
Seth Alves
56679c6a1d Merge branch 'master' of github.com:highfidelity/hifi into dressing-room 2016-02-03 12:50:52 -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
Babiuch, Ryan Nicholas
3d727d76c2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7 Exposed energy cost multiplier to scripting. 
- field: costMultiplier
 2016-02-03 13:29:42 -06: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
Stephen Birarda
0e20392e66 remove debug for mute environment packet 2016-02-03 11:07:16 -08:00
Stephen Birarda
26abca92ae don't move the re-used mute environment packet 2016-02-03 10:55:07 -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
James B. Pollack
51b335c902 reduce cellscience volume 2016-02-03 09:53:14 -08:00
Seth Alves
e0ab6b6716 Merge branch 'dressing-room' of github.com:imgntn/hifi into dressing-room 2016-02-03 09:30:21 -08:00
Ryan Huffman
963c71a476 Fix ES rejecting unowned entity physics updates 2016-02-03 09:28:49 -08:00
Babiuch, Ryan Nicholas
7dd5bca17f Bug fixes and debt reductions on energy calculations. 
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
 2016-02-03 10:46:28 -06: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
James B. Pollack
61daed5376 fix userdata for pistol 2016-02-02 17:39:43 -08:00
Zach Pomerantz
aa10af2851 Revert "Move DrawStencil to use ShapePlumber" 
This reverts commit 671f27e5bc.
 2016-02-02 17:10:21 -08:00
Anthony J. Thibault
03d5bc885b AnimClip: added mirrorFlag anim var 2016-02-02 17:10:15 -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
Anthony J. Thibault
e6abc026c8 AnimClip: mirror animation support 2016-02-02 17:02:29 -08:00