Commit graph

38432 commits

Author SHA1 Message Date
Howard Stearns
91b0f69312 When the avatar marketplace is chosen from avatar preferences, let it be moveable so that the user can move it aside to see their avatar. 2016-01-26 21:02:16 -08:00
Zach Pomerantz
49c1285837 Add suffix Mode to DebugMode enum to avoid collision 2016-01-26 19:11:59 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
Brad Davis
0a6be80578 Added some disabled modal focus protection code 2016-01-26 18:50:55 -08:00
Brad Hefta-Gaub
f178fc789c fix for animations stopping after domain restart 2016-01-26 18:44:34 -08:00
Brad Davis
fbee221966 Fix tool window breaking when visible while edit.js reloads 2016-01-26 18:15:41 -08:00
Zach Pomerantz
4354eae129 Fix type, gaussion->gaussian 2016-01-26 18:09:18 -08:00
Zach Pomerantz
61f337b490 Hold Varying constant over task ctor 2016-01-26 17:43:41 -08:00
Zach Pomerantz
5d157b059f Collapse all Job/Task Models to one, including TaskIO 2016-01-26 17:40:32 -08:00
Brad Davis
9a8d56da77 Center new windows without a defined position 2016-01-26 17:25:36 -08:00
Brad Davis
fee920723a Cleaning up test project 2016-01-26 17:25:20 -08:00
Anthony Thibault
0fdfb69cae Merge pull request #6938 from AndrewMeadows/reduce-hip-swing
reduce hips swing driven by head orientation when wearing HMD
2016-01-26 17:00:31 -08:00
Brad Davis
940b095013 Removing menu logspam 2016-01-26 16:59:37 -08:00
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