Commit graph

38448 commits

Author SHA1 Message Date
Stephen Birarda
4115d52d91 default shortcut options off for PR builds 2016-01-26 11:46:37 -08:00
Stephen Birarda
068de5203c use specific shortcut names for PR builds 2016-01-26 11:40:50 -08:00
Anthony Thibault
81b04f2e75 Merge pull request #6942 from ctrlaltdavid/20792
Fix Quat.equal()
2016-01-26 11:28:23 -08:00
Stephen Birarda
79a2b7f213 make sure shell var context is correct for AppData 2016-01-26 11:17:54 -08:00
David Rowe
4e9fc02af5 Fix typos noticed in passing 2016-01-27 08:03:14 +13:00
David Rowe
1bfb941057 Fix Quat.equal() 2016-01-27 08:03:13 +13: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
James B. Pollack
64cb053c16 update it in the other spawner script 2016-01-26 10:30:26 -08:00
James B. Pollack
ce97fae1be update dice location 2016-01-26 10:27:55 -08:00
Ryan Huffman
f4925d72ed Merge pull request #6931 from Atlante45/fix/quit-wording
Change server exit popup wording
2016-01-26 10:09:18 -08:00
Atlante45
1f44222ed2 Change server exit popup wording 2016-01-26 10:02:45 -08:00
Ryan Huffman
b56668892e Fix else style 2016-01-26 09:39:11 -08:00
U-GAPOS\andrew
2728290ffb fix bug in IK and tune head/neck constraints 2016-01-26 09:37:33 -08:00
Ryan Huffman
3160aa3068 Change 0LL to INT64_C(0) 2016-01-26 09:36:52 -08:00
Ryan Huffman
5268ef8ac2 Fix else indentation 2016-01-26 09:36:40 -08:00
Ryan Huffman
0e1742588b Fix indentation 2016-01-26 09:35:35 -08:00
Ryan Huffman
641a6e9c30 Fix injector handling for when it falls behind 2016-01-26 09:29:02 -08:00
Andrew Meadows
e2e7a60c0f Merge pull request #6936 from hyperlogic/tony/prevent-hover-over-cracks
CharacterController: Improve ground support detection
2016-01-26 07:51:45 -08:00
David Rowe
2834dee00d Remove erroneous edit.js call with missing entity ID 2016-01-26 22:07:42 +13:00
David Rowe
956e70e415 Make entity properties return undefined value after entity is deleted 2016-01-26 22:07:05 +13:00
Anthony J. Thibault
bc9621baab CharacterController: Improve ground support detection
In addition to the existing line probe ground check, also check if the bottom sphere of the capsule is contact with any geometry before going into hover mode.
This should prevent going into the fly animation when standing or walking on collision shapes with small gaps between elements.
2016-01-25 21:54:35 -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
b55856da08 Merge pull request #6933 from highfidelity/revert-6919-20790
Revert "Make entity properties be undefined after entity is unloaded"
2016-01-25 18:30:07 -08:00
Brad Hefta-Gaub
1ef01d670d Revert "Make entity properties be undefined after entity is unloaded" 2016-01-25 18:07:14 -08:00
Stephen Birarda
e4110ea401 install for all users, EXCEPT the startup menu item 2016-01-25 17:22:39 -08:00
ericrius1
793654cbca Merge branch 'master' into junkyardReset 2016-01-25 17:10:58 -08:00
Brad Hefta-Gaub
18375f42bd Merge pull request #6929 from howard-stearns/old2new-dialogs
Old2new dialogs (set avatar popup)
2016-01-25 16:22:29 -08:00
Stephen Birarda
f4ece26271 use install dir written to registry as potential default 2016-01-25 16:20:44 -08:00
Eric Levin
d92b527f99 Merge pull request #6928 from imgntn/bow-parented-string
Fix Separation of Bow and Bowstring
2016-01-25 16:19:57 -08:00
Stephen Birarda
57f9d82efa remove shortcuts from custom start menu location 2016-01-25 16:13:39 -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
Brad Hefta-Gaub
7d8a3de711 Merge pull request #6927 from AndrewMeadows/zero-velocities
entity.js will zero velocities when entities cease to be dynamic
2016-01-25 16:00:54 -08:00
Stephen Birarda
c7228ce020 ensure current user context for uninstaller 2016-01-25 15:59:17 -08:00
Stephen Birarda
9d4b529223 remove any old admin desktop/sm shortcuts 2016-01-25 15:57:42 -08:00
Stephen Birarda
eabafa800c clarify application close behaviour 2016-01-25 15:51:47 -08:00
Stephen Birarda
aeb097664e remove InstallOptionsPage from list of pages 2016-01-25 15:38:57 -08:00
Stephen Birarda
150a8d388c allow user to close running exec and continue 2016-01-25 15:37:11 -08:00
Stephen Birarda
aa2d19a611 remove two unused utility functions 2016-01-25 15:32:23 -08:00
Stephen Birarda
f393c5eeda remove CMake templated code for path changes 2016-01-25 15:28:44 -08:00
Stephen Birarda
6934594bb9 always use current context, ignore CPack InstallOptions 2016-01-25 15:20:51 -08:00
Zach Pomerantz
59ac93485e Propogate configuration changes through tasks 2016-01-25 15:18:13 -08:00
Zach Pomerantz
e73902899b Explicitly emit dirty for AO/Debug 2016-01-25 15:18:12 -08:00
Zach Pomerantz
46c937325e Make Job MEMBER enabled explicit 2016-01-25 15:18:11 -08:00
Zach Pomerantz
14d907206e Clean out job enable logic from Job 2016-01-25 15:17:44 -08:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
Zach Pomerantz
b42ab2179e Call QConfig QConfigPointer 2016-01-25 15:17:39 -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
Ryan Huffman
5b361fa638 Merge pull request #6925 from birarda/audio-mixer-coma
add some debug for stream overflows in audio-mixer
2016-01-25 15:11:56 -08:00