Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 23:28:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52376 commits 25 branches 0 tags 1.1 GiB
Commit graph

52376 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
1a375432e0 Only grab primary clicks 2017-03-13 18:06:32 -08:00
Atlante45
34889d38c9 Override all roles instead of just fly 2017-03-13 18:06:32 -08:00
David Rowe
2e96b8a59b Merge branch 'tablet-ui' into 21197 2017-03-14 14:47:22 +13:00
Seth Alves
1eedce9825 unmangle merge 2017-03-13 18:18:26 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
David Rowe
7504c124e4 Make attachment model browser dialog modal 2017-03-14 13:34:06 +13:00
David Rowe
01c313ad60 Fix QML errors 2017-03-14 13:33:20 +13:00
humbletim
db73c80ba1 remove unused meta property adapter 2017-03-13 19:16:00 -04:00
Anthony J. Thibault
6747f553bf Add DebugDraw to .eslintrc config file 
(cherry picked from commit c7cd0fdc38)
 2017-03-13 15:23:22 -07:00
Anthony J. Thibault
d38b994f4c Fix for potential crash due to DebugDraw data race. 
(cherry picked from commit 1b8a624edb)
 2017-03-13 15:23:16 -07:00
Anthony J. Thibault
efc7fbacb1 Bug fix for potential crash when getting DebugDraw::instance 
(cherry picked from commit b0ad9a8110)
 2017-03-13 15:23:10 -07:00
Atlante45
0b237fa644 Revert "Revert "don't blend animations for otherAvatars"" 
This reverts commit 8bf9b70915.
 2017-03-13 15:17:35 -07:00
Atlante45
203325fd2a Revert "Revert "expand avatar update time budget"" 
This reverts commit 9a9f07df71.
 2017-03-13 14:38:09 -07:00
Atlante45
031d144c04 Revert "Revert "minor cleanup"" 
This reverts commit 188287e345.
 2017-03-13 14:38:08 -07:00
Atlante45
71eb24386b Revert "Revert "remove unnecessary context brackets"" 
This reverts commit a68674adcc.
 2017-03-13 14:38:06 -07:00
Atlante45
4637fcefe9 Revert "Revert "remove unused variable"" 
This reverts commit 50288bd4ba.
 2017-03-13 14:38:04 -07:00
Atlante45
1bba59a459 Revert "Revert "avoid unnecessary copy of priority_queue"" 
This reverts commit 97c376a09c.
 2017-03-13 14:38:02 -07:00
Anthony J. Thibault
40b7e34c0b Fix for visible empty toolbar when switching from desktop to HMD mode. 2017-03-13 14:23:13 -07:00
humbletim
075574b428 log cleanup per CR; add more specific hints (instead of relying on __FUNCTION__) 2017-03-13 16:33:42 -04:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209 
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-14 08:50:01 +13:00
ZappoMan
956fdd0933 CR feedback 2017-03-13 12:06:38 -07:00
ZappoMan
099ee1db7f CR feedback 2017-03-13 12:05:42 -07:00
ZappoMan
f5e434bc40 Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate 2017-03-13 11:59:38 -07:00
ZappoMan
3e020ede78 CR feedback 2017-03-13 11:58:43 -07:00
Vladyslav Stelmakhovskyi
9e9c64021c Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-13 19:54:40 +01:00
Andrew Meadows
546f32431d Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate 
Various noise gate, scope, and audio stats improvements
 2017-03-13 11:52:16 -07:00
Vladyslav Stelmakhovskyi
48db6201e5 Basic statistics showed. TODO: servers statistics, coloring, wrapping 2017-03-13 19:48:50 +01:00
ZappoMan
81d01da21d Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate 2017-03-13 10:55:09 -07:00
Andrew Meadows
6e7f4b0418 Merge pull request #9829 from ZappoMan/addDoubleClick 
Add double click message support to entities and overlays
 2017-03-13 10:44:54 -07:00
Atlante45
b67b17d3c0 Fix JS exception messages formatting 2017-03-13 09:11:20 -08:00
Seth Alves
4f71a5b234 Merge pull request #9864 from vladest/tablet-ui-lod-settings 
Add LOD settings to Tablet UI
 2017-03-13 08:59:40 -08:00
Seth Alves
ffd4d1488c Merge pull request #9866 from vladest/tablet-ui-lodtools 
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
 2017-03-13 08:59:06 -08:00
Seth Alves
524e4bdfbc Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race 
Tablet ui fix edit props race
 2017-03-13 08:56:56 -08:00
Seth Alves
75493230b2 Merge pull request #9869 from sethalves/tablet-ui 
Tablet ui
 2017-03-13 08:47:14 -08:00
Seth Alves
7e7bbe8785 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-13 09:43:17 -07:00
Vladyslav Stelmakhovskyi
49055cfa5c Some statistics showed 2017-03-13 16:31:29 +01:00
Seth Alves
b3003acb97 Merge pull request #9856 from druiz17/tablet-imporove-dialogs 
Bring of menu window if tablet is closed on desktop
 2017-03-12 12:20:29 -08:00
David Rowe
05e4c2a1bb MyAvatar is available in tablet now 2017-03-12 09:59:52 +13:00
Brad Hefta-Gaub
a38965d628 add more audio stats 2017-03-11 09:50:30 -08:00
Vladyslav Stelmakhovskyi
81bc56f124 Fixed slider groove size calculation. Added LOD Tools to Tablet UI 2017-03-11 14:44:33 +01:00
Vladyslav Stelmakhovskyi
d70943dd6c Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences 2017-03-11 12:23:31 +01:00
Vladyslav Stelmakhovskyi
9f7c5a1603 Add LOD settings to Tablet UI 2017-03-11 11:54:44 +01:00
David Rowe
0fc45799ed Remove redundant keyboard handling code 2017-03-11 17:04:55 +13:00
David Rowe
6a8d0b1064 Refactor some tablet dialog headers 2017-03-11 16:55:22 +13:00
David Rowe
74839b24a3 Merge branch 'tablet-ui' into 21209 2017-03-11 15:56:38 +13:00
David Rowe
327e3c9973 Don't expand height of higlighted row 2017-03-11 15:46:43 +13:00
David Rowe
0a2976deab Add tablet keyboard 2017-03-11 15:43:33 +13:00
Brad Hefta-Gaub
6ce50269ac add audio mixer in/out stats to the client stats 2017-03-10 18:42:18 -08:00
David Rowe
ffbb04d3bc Tablet and desktop versions of attachment model browser dialog 2017-03-11 15:38:21 +13:00
Brad Hefta-Gaub
aa65f03509 fix mac warning and remove accidentally added whitespace 2017-03-10 18:14:00 -08:00