Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-19 09:59:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38280 commits 28 branches 28 tags 1.2 GiB
Commit graph

15401 commits

Author SHA1 Message Date
Anthony J. Thibault
33993b8c44 AnimClip: removed unused static member. 2016-01-26 13:34:21 -08:00
Anthony J. Thibault
69d833a6c0 AnimClip: consistent application of translations 
Apply animation translation the same way regardless of state of usePreAndPostPoseFromAnimation.
 2016-01-26 10:53:21 -08:00
Anthony J. Thibault
3b062b7a31 AnimClip: special case the translation on the eyes 2016-01-25 18:52:14 -08:00
Anthony J. Thibault
3cee3cbb5a Avatar Developer Menu: added animation debug options 
This options are for for developers only and might help debug animation related issues.

* Enable Inverse Kinematics: this can be toggled to disable IK for the avatar.
* Enable Anim Pre and Post Rotations: this option can be used to use FBX pre-rotations from source avatar animations, instead of the current default, which is to use them from the source model.
  This only effects FBX files loaded by the animation system, it does not affect changing model orientations via JavaScript.
 2016-01-25 18:52:13 -08:00
Anthony J. Thibault
1bdeeeceeb AnimSkeleton: Added getPre and Post rotation accessors 2016-01-25 18:52:12 -08:00
Brad Hefta-Gaub
1ef01d670d Revert "Make entity properties be undefined after entity is unloaded" 2016-01-25 18:07:14 -08:00
Zach Pomerantz
15ff106947 Merge pull request #6917 from AndrewMeadows/cf-empty-model-url 
fix crash for empty modelUrl in ModelEntityItem
 2016-01-25 16:09:00 -08:00
James B. Pollack
4cff1ab9df Merge pull request #6919 from ctrlaltdavid/20790 
Make entity properties be undefined after entity is unloaded
 2016-01-25 15:12:10 -08:00
David Rowe
8a8e14f54a Rework initializers 2016-01-25 11:22:31 +13:00
Brad Davis
bbefafcb07 Break up preferences dialogs 2016-01-23 23:11:41 -08:00
Brad Hefta-Gaub
e3f861b20a Merge pull request #6918 from jherico/running-scripts-filter 
Several Small QML fixes
 2016-01-23 22:36:36 -08:00
Brad Hefta-Gaub
7258bd9e3f Merge pull request #6915 from samcake/hdr 
Fixing the Anitialising breaking the transparent rendering
 2016-01-23 22:30:04 -08:00
Brad Davis
a843331626 Still trying to kill OSX warning 2016-01-23 22:07:00 -08:00
David Rowe
840bf7cfb4 Fix OSX and Linux build warning 
And a typo noticed in passing.
 2016-01-24 10:53:40 +13:00
David Rowe
d020114e59 Make entity properties return undefined value after entity is deleted 2016-01-24 08:39:49 +13:00
Andrew Meadows
d25f54485c fix crash for emtpy modelUrl in ModelEntityItem 2016-01-22 22:01:30 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
samcake
483d20d7a3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-22 18:31:30 -08:00
samcake
9f87089c05 Fixing the Anitialising breaking the transparent rendering 2016-01-22 18:25:26 -08:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
27fdb523cb Add directory & avatar browsing preferences 2016-01-22 17:30:10 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
2026821d9e Moving preferences to dependency mananger 2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Brad Hefta-Gaub
0c64d45c18 Merge pull request #6909 from hyperlogic/tony/fly 
MyAvatar: fly animation
 2016-01-22 17:04:53 -08:00
samcake
338342cdec Merge pull request #6859 from zzmp/flag/shadows 
Add shadows behind a render-menu flag
 2016-01-22 16:28:17 -08:00
Brad Hefta-Gaub
74c37104f6 Merge pull request #6905 from jherico/focus_fix 
Fix initial keyboard focus problems
 2016-01-22 15:19:57 -08:00
Andrew Meadows
86162094c1 Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation 
MyAvatar: Recenter when the head turns away from the hips
 2016-01-22 14:07:40 -08:00
Andrew Meadows
200676ac68 Merge pull request #6896 from AndrewMeadows/another-crash-fix 
fix crash when deleting entities quickly
 2016-01-22 14:04:46 -08:00
Anthony J. Thibault
7af20e90c8 Hooked up fly animation to json and Rig 2016-01-22 13:47:09 -08:00
Brad Davis
89b8eb2efa Fix initial keyboard focus problems 2016-01-22 13:41:06 -08:00
Anthony J. Thibault
8bfa80d5fc Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation 2016-01-22 13:37:43 -08:00
Brad Hefta-Gaub
9ec2cf1ab9 Merge pull request #6902 from sethalves/no-nan 
check values in location updates for NaN before using them
 2016-01-22 13:34:15 -08:00
Anthony J. Thibault
61b760038a Address feedback from code review 2016-01-22 11:54:28 -08:00
Seth Alves
2633cb1f27 rename NaN functions for vec3 and quat 2016-01-22 11:54:24 -08:00
samcake
f98f8d5bbb Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque" 2016-01-22 11:51:02 -08:00
Seth Alves
7a3401a8d7 Merge pull request #6867 from AndrewMeadows/collision-group-prep 
cleanup in preparation for smarter collision grouping
 2016-01-22 11:45:42 -08:00
Seth Alves
673182c091 formatting 2016-01-22 11:22:02 -08:00
Seth Alves
a9cf836cb0 added isVec3NaN and isQuatNaN functions 2016-01-22 11:13:55 -08:00
Seth Alves
6294939095 missed one 2016-01-22 10:37:11 -08:00
Seth Alves
6b15beb88a use isNaN rather than a self-comparison 2016-01-22 10:36:21 -08:00
Zach Pomerantz
b62fc50557 Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:32:54 -08:00
Andrew Meadows
d8fb61e820 fix crash when deleting entities quickly 2016-01-22 10:25:10 -08:00
Zach Pomerantz
dee8e0ba9d Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-22 10:03:06 -08:00
samcake
24d1f113f8 Fixing the warning maybe 2016-01-22 09:44:32 -08:00
Seth Alves
451464cb47 check values in location updates for NaN before using them 2016-01-22 09:41:46 -08:00
samcake
6d89f6d7b0 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-22 09:30:31 -08:00
samcake
6bcd7f10ad Try the constant gaussian values which are more stable on mac... 2016-01-21 23:54:51 -08:00
Brad Hefta-Gaub
58b7708315 Merge pull request #6899 from birarda/fix-go-home 
repairs to index path behaviour
 2016-01-21 21:29:24 -08:00