Brad Davis
5f38c5265c
Fixing potential crash in dialog popups
2016-01-26 16:59:19 -08:00
Brad Davis
cea57a111b
Desktop cleanup
2016-01-26 16:56:33 -08:00
Brad Davis
8dc066fc00
Fix the recursive launching of load script from URL
2016-01-26 16:49:23 -08:00
Ryan Huffman
2717c027e8
Merge pull request #6932 from birarda/console
...
various installer fixes and improvements
2016-01-26 16:39:31 -08:00
Stephen Birarda
8ba0e3bc6e
give dev shortcuts a specific name too
2016-01-26 16:21:18 -08:00
Zach Pomerantz
5009e8702e
Cleanup new render settings
2016-01-26 15:58:50 -08:00
Stephen Birarda
e6a8fd192c
use the VS2011 DLLs bundled with sixense for installer
2016-01-26 15:54:08 -08:00
James B. Pollack
d8dbb717d5
Update junkyardResetEntityScript.js
2016-01-26 14:06:17 -08:00
Ryan Huffman
a731a571e0
Update entity server to always make resource directory if it does not exist
2016-01-26 13:50:58 -08:00
Anthony J. Thibault
33993b8c44
AnimClip: removed unused static member.
2016-01-26 13:34:21 -08:00
samcake
462758ebdd
Merge pull request #6863 from zzmp/feat/boom-shadow
...
Tie shadow frustum to boom offset
2016-01-26 13:33:57 -08:00
Seth Alves
1cc0aa18bb
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-26 13:31:07 -08:00
Seth Alves
1fefe0fa0e
when an avatar moves a child entity around, it has to invoke MovingEntitiesOperator to keep the local octree up-to-date
2016-01-26 13:30:55 -08:00
Ryan Huffman
8d3d4b1e02
Merge pull request #6946 from birarda/audio-mixer-coma
...
add some debug for audio injector wrap case
2016-01-26 13:29:58 -08:00
Stephen Birarda
b6f478e087
add some debug for audio injector wrap case
2016-01-26 13:10:02 -08:00
ericrius1
e6379fcaa8
Naming changes
2016-01-26 12:57:41 -08:00
Zach Pomerantz
2d0d542765
Fix friend class typedef confusion in gcc
2016-01-26 12:44:56 -08:00
Zach Pomerantz
5b1834d7be
Fix Wreorder for Job::Models
2016-01-26 12:44:37 -08:00
Zach Pomerantz
2da2bc60db
Tie shadow frustum to boom offset
2016-01-26 12:26:16 -08:00
Stephen Birarda
0a413904a0
use non PR-specific names for close prompt
2016-01-26 12:09:45 -08:00
Stephen Birarda
6daeefef68
remove the correct startup shortcut during uninstall
2016-01-26 12:08:26 -08:00
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
