Commit graph

80887 commits

Author SHA1 Message Date
David Rowe
07d8013e21 Don't display "CLOSE" and "BACK" buttons at top of Blocks screen 2019-09-28 11:30:57 +12:00
David Rowe
cd6d9b57c4 Fix Blocks script displaying a blank page 2019-09-28 11:30:56 +12:00
Howard Stearns
f513b65e9d
Merge pull request #16256 from SimonWalton-HiFi/supress-repeated-socket-logging
BUGZ-1543: Suppress repeated socket logging
2019-09-27 12:45:17 -07:00
Shannon Romano
d342f3efcd
Merge pull request #16257 from kencooke/android-clang-warnings-fix
Fix Android clang warnings due to unused compiler flags
2019-09-27 09:25:44 -07:00
Shannon Romano
7e74753a71
Merge pull request #16255 from luiscuenca/lookAtFixes
BUGZ-1599: Free camera fixes
2019-09-27 09:16:30 -07:00
Simon Walton
93a1cbdcf9 Use direct initialization instead of copy initialization for atomics 2019-09-26 16:45:29 -07:00
Andrew Meadows
f3aa534327
Merge pull request #16239 from AndrewMeadows/cleanup-mortal-entities
BUGZ-1510: don't forget to cleanup expired mortal entities
2019-09-26 16:20:27 -07:00
Simon Walton
f17a1c17f3 Only print Qt event-queue size on change of error code 2019-09-26 15:46:11 -07:00
Ken Cooke
97dab24a69 Fix Android clang warnings due to unused compiler flags 2019-09-26 15:45:26 -07:00
luiscuenca
ea23a82f33
Make mouse pitch less sensitive 2019-09-26 15:14:47 -07:00
luiscuenca
1b064a0ebe
Fix Q key on first person cam. Let camera control flying Y axis 2019-09-26 14:29:01 -07:00
Shannon Romano
1e67f1e914
Merge pull request #16249 from roxanneskelly/bugz1381
BUGZ-1381 - domain server creates blank/undefined group when adding groups
2019-09-26 12:28:39 -07:00
Simon Walton
85c9f4d95f Use the FCDEBUG mechanism to throttle udt::Socket log-spam 2019-09-26 12:10:59 -07:00
Simon Walton
bbf43050b1
Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused
BUGZ-1503: Don't move unused Connection class upon address change
2019-09-26 11:42:50 -07:00
Amer
1e94a82ee6
Merge pull request #16196 from amerhifi/dev469
DEV-469: Default Audio device
2019-09-25 16:28:00 -07:00
Howard Stearns
d507c06a3b
Merge pull request #16250 from Atlante45/fix/account-settings
DEV-648: Limit the amount of account settings pull retries
2019-09-25 15:55:08 -07:00
Atlante45
ff3f26eeae Limit the amount of account settings pull retries 2019-09-25 14:55:44 -07:00
Roxanne Skelly
434c63b7e3 BUGZ-1381 - domain server creates blank/undefined group when adding
groups
2019-09-25 14:14:29 -07:00
amer cerkic
73f14d812f addressing cr comments 2019-09-25 13:22:50 -07:00
Simon Walton
6ccfc37f27 Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused 2019-09-25 13:06:32 -07:00
MiladNazeri
7d7024f5eb
Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings
Dev 148/add mirror mode to settings
2019-09-25 12:08:09 -07:00
Brad Hefta-Gaub
06c7a92c27
Merge pull request #16243 from Atlante45/fix/account-settings
DEV-648: Add flag for account settings feature
2019-09-25 11:20:14 -07:00
milad
aba6a28d54 updated camera modes 2019-09-25 11:05:32 -07:00
Brad Hefta-Gaub
068fb0e177
Merge pull request #16240 from ctrlaltdavid/BUGZ-577
BUGZ-577: Implement Recording.setPlayerVolume()
2019-09-25 10:31:57 -07:00
Simon Walton
6d7f711990 Remove typo that somehow got into a comment 2019-09-25 09:33:49 -07:00
milad
39d96b76a6 fixed help text 2019-09-25 08:41:38 -07:00
Clement
5067729c52 Add flag for account settings feature 2019-09-24 17:40:34 -07:00
milad
103b10e2f9 restored modified file 2019-09-24 16:52:37 -07:00
milad
af5e01f96b restored modified file 2019-09-24 16:51:35 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
milad
677dbe59cc fixed qml typo 2019-09-24 16:47:07 -07:00
milad
edb135776a Added selfie view and updated help 2019-09-24 16:44:34 -07:00
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00
milad
e275fe1da8 Merge branch 'master' of github.com:highfidelity/hifi 2019-09-24 16:07:04 -07:00
milad
b8e7b23ba3 Merge branch 'master' of github.com:MiladNazeri/hifi 2019-09-24 16:06:51 -07:00
Shannon Romano
73c558bc51
Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle
Transition between walk/emote should be faster
2019-09-24 15:49:31 -07:00
Shannon Romano
0c2ca7500d
Merge pull request #16241 from RebeccaStankus/removeInspect
Undo removal of User Inspection
2019-09-24 15:41:35 -07:00
amer cerkic
9daf670678 Merge branch 'master' into dev469 2019-09-24 15:38:07 -07:00
amer cerkic
20045836aa Merge branch 'master' of https://github.com/highfidelity/hifi 2019-09-24 15:35:32 -07:00
Andrew Meadows
50f0c90519 don't forget to cleanup expired mortal entities 2019-09-24 14:00:21 -07:00
Anthony Thibault
6fbcc9151e
Merge pull request #16235 from luiscuenca/resetLookAtOnGoTo
BUGZ-1553: Reset look at params when the avatar's location is set
2019-09-24 13:20:26 -07:00
Brad Hefta-Gaub
5ff4dc5a35
Merge pull request #16242 from highfidelity/revert-16229-allow-qt-prefix
Revert "BUGZ-1551: Do not download Qt if Qt_CMAKE_PREFIX_PATH is set as an environment variable"
2019-09-24 13:15:00 -07:00
David Rowe
2fe24b39db Code review 2019-09-25 07:50:56 +12:00
Brad Hefta-Gaub
54dae34abe
Revert "BUGZ-1551: Do not download Qt if Qt_CMAKE_PREFIX_PATH is set as an environment variable" 2019-09-24 11:26:50 -07:00
RebeccaStankus
978bcaffeb Undo removal of User Inspection 2019-09-24 11:18:16 -07:00
Shannon Romano
b491d00c00
Merge pull request #16238 from RebeccaStankus/fullSizeWindow
Prereq work for 'Reduce User Friction'
2019-09-24 10:58:39 -07:00
RebeccaStankus
e06e458634
Merge pull request #16236 from RebeccaStankus/removeInspect
Removing connections to use inspect mode on mouse events
2019-09-24 09:49:26 -07:00
David Rowe
f60e863b66 Remove wayward comment 2019-09-24 16:36:11 +12:00
David Rowe
b174e002a9 Implement Recording.setPlayerVolume() 2019-09-24 12:52:51 +12:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00