Sam Gateau
|
c8663f7fe6
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-30 09:18:23 -07:00 |
|
Shannon Romano
|
447bccf240
|
Merge pull request #16262 from ctrlaltdavid/BUGZ-573
BUGZ-573: Fix loadOtherBase in tablet.gotoWebScreen() not working
|
2019-09-30 09:06:09 -07:00 |
|
Sam Gateau
|
8c9cf7bddd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2019-09-27 19:01:19 -07:00 |
|
David Rowe
|
3d667b4a21
|
Deprecate tablet.gotoWebScreen()'s loadOtherBase parameter
|
2019-09-28 11:30:57 +12:00 |
|
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 |
|
Sam Gateau
|
ecd940e0e6
|
Addressing warnings
|
2019-09-27 14:01:00 -07: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 |
|
Sam Gateau
|
57f8095506
|
Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script
|
2019-09-27 12:00:45 -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 |
|
Sam Gateau
|
25bcc31b72
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-27 09:24:25 -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 |
|
Sam Gateau
|
4d94cbe0d8
|
Pass 3rd of the hope to clean it up...
|
2019-09-27 00:29:10 -07:00 |
|
Sam Gateau
|
24cc302a8b
|
second pass of cleaning on the code to make it ready for merge
|
2019-09-26 16:56:00 -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 |
|
Sam Gateau
|
675dbc3f7f
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-26 12:06:09 -07:00 |
|
Sam Gateau
|
9d999baab2
|
FIrst pass to clean up before pushing a pr:
|
2019-09-26 11:59:01 -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 |
|
Sam Gateau
|
ba11c3e702
|
Merge branch 'master' of github.com:highfidelity/hifi into yellow
|
2019-09-25 17:54:21 -07:00 |
|
Sam Gateau
|
dc40c530a3
|
INstrumenting the code more...
|
2019-09-25 17:53:59 -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 |
|
Sam Gateau
|
3e3c4c2e70
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2019-09-24 18:58:29 -07:00 |
|
Sam Gateau
|
0d9cd69d94
|
SImplifying Page.js, and adding a REsourceInspector
|
2019-09-24 18:10:57 -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 |
|