Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-15 07:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
62851 commits 75 branches 59 tags 1.2 GiB
Commit graph

428 commits

Author SHA1 Message Date
Gabriel Calero
76b38bebad Make Interface run in Android 2018-01-03 16:36:11 -03:00
Brad Davis
829e521320 Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-02 11:37:33 -08:00
Brad Davis
9f7b6f543d Merge remote-tracking branch 'upstream/master' into HEAD 2017-12-18 11:17:07 -08:00
Brad Davis
c6bc6f6ef2 Merge remote-tracking branch 'upstream/master' into android_nov 2017-12-16 16:20:16 -08:00
Seth Alves
b1503f7c46
Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock 
Fix getActiveDevice deadlocks on Linux
 2017-12-15 15:41:41 -08:00
luiscuenca
483443d218 No mutex 2017-12-13 17:02:36 -07:00
luiscuenca
e581c66b56 added mutex for audio handler 2017-12-13 16:11:46 -07:00
luiscuenca
e709561a62 Fix getActiveDevice deadlocks on Linux 2017-12-13 12:14:49 -07:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Bradley Austin Davis
9df9cf7a47 Adding more libs, ifdefs for android incompatible code 2017-12-11 13:18:23 -08:00
Zach Fox
2d786451c2 Add comment 2017-12-11 10:50:24 -08:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height 
Momentum aka flickable for WebView
 2017-12-08 10:46:52 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
luiscuenca
fefedc11c8 mac fix 2017-12-01 15:17:23 -07:00
luiscuenca
d271f61987 Proper fix 2017-12-01 14:37:59 -07:00
luiscuenca
83e370d9de add shared pointer 2017-11-30 17:40:49 -07:00
luiscuenca
5d1f2a04c1 restate deleted lines 2017-11-30 16:43:38 -07:00
luiscuenca
98e8361690 Fix and rebuild 2017-11-30 16:07:43 -07:00
luiscuenca
9cd2dc921a back to for loop 2017-11-30 15:31:29 -07:00
luiscuenca
0729579266 fix for loop 2017-11-30 15:21:43 -07:00
luiscuenca
58e829dbda Delete leftover line 2017-11-30 15:11:38 -07:00
luiscuenca
e02e810399 Audio Handler fix 2017-11-30 15:06:02 -07:00
vladest
74c002d1f5 Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events 2017-11-30 12:52:26 +01:00
luiscuenca
b817143e2e Fixes on web and QML audio sync 2017-11-29 18:16:21 -07:00
samcake
84ff40c717 Merging with master 2017-11-21 14:12:47 -08:00
Brad Hefta-Gaub
5914f27027
Merge pull request #11706 from luiscuenca/webAudioDev_fresh 
QML & Web generated audio now follow the client audio device selection
 2017-11-21 11:29:48 -08:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch 
Turn Commerce on by default!
 2017-11-20 16:18:53 -08:00
Dante Ruiz
76935c1457 fixing merge conflict 2017-11-20 09:51:10 -08:00
Dante Ruiz
427f676859 minimize diff 2017-11-17 16:06:34 -08:00
Dante Ruiz
ab9432c1cd load webpage if tablet root is not initialized 2017-11-17 16:02:53 -08:00
Zach Fox
f47f259816 Turn Commerce on by default 2017-11-17 15:12:49 -08:00
SamGondelman
3274c41aeb Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-15 17:45:45 -08:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
SamGondelman
8730a26d20 use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation 2017-11-15 14:12:16 -08:00
Brad Davis
0ad3999741 Fixing misname 2017-11-15 12:24:00 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3 
4684 Add collapse button on the virtual keyboard
 2017-11-14 12:22:42 -08:00
Brad Davis
d71fd151c5 Fixing button model exposure 2017-11-13 16:45:27 -08:00
SamGondelman
60db24f2d3 merge with master 2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
Brad Davis
8f85c7650b Make sure loaded components get the right parent context 2017-11-13 14:16:04 -08:00
SamGondelman
2c0272f304 (mostly?) fix touch events 2017-11-13 12:58:31 -08:00
Brad Davis
5cf9c1bb33 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 10:48:21 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
beholder
5fcde1186a hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard 2017-11-10 21:20:00 +03:00
beholder
db3ed81513 adjust to changed requirements: 
1. The keyboard collapse button is moved to the lower right, replacing the keys there
2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift
3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right
 2017-11-10 21:20:00 +03:00
beholder
a9fe3596cf 4684 Add collapse button on the virtual keyboard 2017-11-10 21:20:00 +03:00
Elisa Lupin-Jimenez
119c662899 fixed null file path in file dialog call 2017-11-09 11:46:19 -08:00