Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 03:40:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65695 commits 72 branches 59 tags 1.2 GiB
Commit graph

3263 commits

Author SHA1 Message Date
Zach Fox
cc4726b24b Some bugfixes 2018-03-14 15:47:19 -07:00
Zach Fox
f3efdda6b0 Fix content set filter 2018-03-14 14:34:15 -07:00
Zach Fox
6647475f5c Wrong sign 2018-03-14 11:19:55 -07:00
Zach Fox
74e24ec289 Final touches? 2018-03-14 10:58:18 -07:00
Zach Fox
70b3d0fe5f Merge branch 'filterBar' into commerce_upgrades_1 2018-03-14 09:53:02 -07:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Zach Fox
882e4d6b45 Parse the string that comes from the backend 2018-03-13 15:13:41 -07:00
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
Zach Fox
86115a8578 Merge branch 'master' of github.com:highfidelity/hifi into filterBar 2018-03-13 13:42:13 -07:00
Zach Fox
a949208988 Design tweaks 2018-03-13 13:23:32 -07:00
Zach Fox
5563edd957 Focus fix; Switch to QQC2 2018-03-13 13:11:59 -07:00
Zach Fox
50e709c738 Add updates; drop shadow 2018-03-13 12:13:14 -07:00
Zach Fox
bce7fb1ff1 Improvements 2018-03-12 16:54:10 -07:00
Zach Fox
9c7d857ecb Fix some focus issues 2018-03-12 16:15:50 -07:00
Zach Fox
f1121db4da It's working! 2018-03-12 15:54:11 -07:00
Gabriel Calero
3117ec9015 Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec 2018-03-12 19:44:24 -03:00
Zach Fox
db7eea543e Initial progress 2018-03-12 15:11:09 -07:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android 
Android: Fix corruption on startup
 2018-03-12 15:03:07 -07:00
John Conklin II
7f7d20738a
Merge pull request #12553 from vladest/mac_combobox_misplaced 
Fix CheckBox on Mac
 2018-03-12 14:47:39 -07:00
Gabriel Calero
7778ddfdcb Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec 2018-03-12 18:33:05 -03:00
SamGondelman
9953e7051f Merge remote-tracking branch 'upstream/master' into android 2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
John Conklin II
42a686ad93
Merge pull request #12578 from druiz17/use-correct-audio-api 
use correct scripting api  for audio in Audio.qml
 2018-03-09 13:41:20 -08:00
Dante Ruiz
e21c4988fb stereo checkbox text change 2018-03-09 10:11:25 -08:00
Dante Ruiz
3a39fca268 made requested changes 2018-03-09 10:09:51 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one 
clear wallet when picking a new one
 2018-03-09 10:09:41 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain 
Fix font loading for MacOS via completely different font loading method
 2018-03-09 09:49:56 -08:00
Dante Ruiz
c49d0557fc fixing check box issues 2018-03-09 09:29:37 -08:00
Dante Ruiz
8703e9e002 Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api 2018-03-09 08:42:50 -08:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
howard-stearns
9d805283d1 clear wallet when picking a new one 2018-03-08 14:24:44 -08:00
Zach Fox
086431d0e7 Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain 2018-03-08 13:50:19 -08:00
Dante Ruiz
9f246ea314 Merge branch 'master' of github.com:highfidelity/hifi into use-correct-audio-api 2018-03-08 13:04:02 -08:00
Zach Fox
4df58f1e67 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Zach Fox
a479439b23
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions 
Show Connection instructions in Send Money when 0 connections
 2018-03-08 11:20:23 -08:00
Zach Fox
d0cc64f63d Fix font loading for MacOS via different font loading method 2018-03-08 11:19:49 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
Zach Fox
a0eb7e0712 Don't default unknown Marketplace item types to 'Entity' 2018-03-07 15:01:12 -08:00
Zach Fox
d71fc22ed8 Support argument to available_updates endpoint 2018-03-07 14:06:29 -08:00
Zach Fox
eded8586a5 Use correct backend terminology 2018-03-07 13:40:55 -08:00
Zach Fox
0285bf9379 purposeful incorrect indentation to prevent insane diff 2018-03-07 13:27:40 -08:00
Zach Fox
a2eb13b70b Prevent logspam 2018-03-07 13:23:13 -08:00
Gabriel Calero
109fa1d832 Add the url of each qml as on-screen debug info 2018-03-07 17:18:37 -03:00
Zach Fox
08b2be85d2 Don't pass isUpdating around 2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
Zach Fox
91e0af9b46 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-07 10:16:10 -08:00
Zach Fox
b764a4d404 Filter out invalid purchases 2018-03-07 09:22:57 -08:00