Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 14:23:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80901 commits 6 branches 1 tag 1.1 GiB
Commit graph

80901 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -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
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
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
Sam Gateau
2a78fc7b38 Remove the auto refresh list of resource because it takes too much time, instead user has to press refresh button 2019-09-24 14:29:09 -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
Sam Gateau
8aaa5deb11 Clean up the sort and filter system 2019-09-24 12:37:01 -07: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
Sam Gateau
d940e70564 Adding a proper SortFilterModel 2019-09-24 00:31:16 -07:00
David Rowe
f60e863b66 Remove wayward comment 2019-09-24 16:36:11 +12:00
Sam Gateau
69ccc47bda Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-23 18:59:20 -07:00
Sam Gateau
3e17c1007a understanding the delegateModelGroup mechanism... 2019-09-23 18:14:45 -07: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
dooglifeSF
7307bea16f speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle 2019-09-23 16:45:35 -07:00
amerhifi
d5b2b0de89 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-09-23 16:25:02 -07:00
amerhifi
fbc68e7f69 removed clang format issue, removed old attempt at getting defaults to startup correctly 2019-09-23 15:07:04 -07:00