Commit graph

33592 commits

Author SHA1 Message Date
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Brad Hefta-Gaub
6d895942f3
Merge pull request #16350 from ctrlaltdavid/DEV-2391
DEV-2391: Fix Recording.stopRecording() crash
2019-10-16 15:33:13 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed
Fix sliding when stopping from run.
2019-10-16 09:03:00 -07:00
dooglifeSF
0510215240 Move magic number to constant for SLOW_SPEED_THRESHOLD. 2019-10-15 17:48:06 -07:00
Shannon Romano
bebb21fa9e
Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script
Bugfix for legacy sit scripts
2019-10-15 16:19:49 -07:00
Anthony J. Thibault
14e5962675 Bugfix for legacy sit scripts
Don't return additive clip nodes as valid "roles" for users to override.
2019-10-15 15:29:24 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction
First Time User Experience Project
2019-10-15 14:56:25 -07:00
dooglifeSF
a043f0a17e Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s 2019-10-15 14:51:42 -07:00
David Rowe
185d6990eb Add missing threading checks to Recording API methods 2019-10-16 09:17:29 +13:00
Seth Alves
1f8a7cfea7 fix step translate actions 2019-10-15 09:23:35 -07:00
David Rowe
e708cb98bb Fix crash in Recorder.stopRecording() when no recording is being made 2019-10-15 11:29:49 +13:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867
DEV-1867: Fix toolbarTest.js
2019-10-14 11:50:59 -07:00
Shannon Romano
83875089e4
Merge pull request #16328 from Atlante45/fix/account-settings
DEV-2376: Don't post account settings after pull
2019-10-14 08:49:22 -07:00
David Rowe
f944604120 Deprecate Toolbar API's addButton() and removeButton() methods 2019-10-12 10:10:27 +13:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Clement
3b21dfcd0a CR 2019-10-10 17:49:51 -07:00
Clement
390c7b14c9 Don't post account settings after pull
Account settings would always get pushed after a pull even if they
hadn't changed
2019-10-10 15:55:19 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Ken Cooke
8325ee2c8e
Merge pull request #16327 from kencooke/audio-device-sleep-wake
DEV-1901: No audio in Interface when restoring from sleep
2019-10-10 15:12:07 -07:00
Ken Cooke
ec67b67966 On waking from sleep/hibernate, restart the audio devices 2019-10-10 14:10:47 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave
DEV-1811: apply deletion rules to linked entities
2019-10-10 13:24:43 -07:00
Brad Hefta-Gaub
1316f9b046
Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers
Drivekey anim triggers
2019-10-09 18:25:10 -07:00
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13
Qt 5.13 changes
2019-10-09 15:04:07 -07:00
dooglifeSF
85b681e70e switch abs() to fabsf() 2019-10-09 11:07:14 -07:00
dooglifeSF
2a1258968a Change macro to const float, use floats in control flow. 2019-10-09 10:10:45 -07:00
dooglifeSF
8a262a3d1a Merge branch 'master' into drivekey_anim_triggers 2019-10-09 07:37:38 -07:00
dooglifeSF
cfa7df7d1a Refactor the if-logic to remove complexity 2019-10-08 16:14:21 -07:00
Andrew Meadows
960646f117 skip delete entities not in the tree 2019-10-08 16:12:14 -07:00
Brad Davis
06871a707e Fix byteswap 2019-10-08 16:11:48 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals
Added flag to ensure mouse event signals are not connected twice
2019-10-08 15:58:24 -07:00
dooglifeSF
2626f85f49 Handle multiple inputs, bias towards inputZ instead of inputX, and add a deadzone that matches xbox controller analog deadzone 2019-10-08 15:44:06 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
2019-10-08 15:35:22 -07:00
RebeccaStankus
458d3bfb48 Renamed variable and made it private 2019-10-08 13:47:06 -07:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Shannon Romano
7aa28f29d2
Merge pull request #16224 from ctrlaltdavid/DOC-111
DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying
2019-10-08 10:01:21 -07:00
Sam Gateau
6db302990c
Merge pull request #16297 from jherico/frame-capture
DEV-632: New format for captured GPU frames
2019-10-08 09:43:44 -07:00
Shannon Romano
e1de615cbe
Merge pull request #16261 from ctrlaltdavid/BUGZ-491
BUGZ-491: Fix tablet.loadWebScreenOnTop()
2019-10-08 09:05:33 -07:00
David Rowe
1106d8fdfa Doc review 2019-10-08 21:15:16 +13:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
Shannon Romano
32ebaed7d3
Merge pull request #16303 from ctrlaltdavid/DOC-188
DOC-188: Steam JSDoc
2019-10-07 17:05:20 -07:00
jennaingersoll
8d8449d8d7
Merge pull request #16166 from ctrlaltdavid/DOC-159
DOC-159: File JSDoc
2019-10-07 16:37:11 -07:00
Andrew Meadows
052a0c3ebe remove cruft, add comments, change variable name 2019-10-07 16:23:30 -07:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155
DOC-155: EntityViewer JSDoc
2019-10-07 15:45:42 -07:00
David Rowe
ffb73d5dbf Steam JSDoc 2019-10-08 11:22:19 +13:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00