Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 10:58:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63052 commits 74 branches 59 tags 1.2 GiB
Commit graph

23225 commits

Author SHA1 Message Date
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661 
Laser auto-on with tablet and Web overlays
 2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting 
WL#21654: Make the Asset Browser Sort Case Insensitive
 2018-01-05 13:34:39 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov 
Updating android toolchain for QML
 2018-01-05 13:34:03 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix 
Update model render items on texture load and fix no haze issue
 2018-01-05 12:26:56 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices 2018-01-05 10:54:59 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed 
Delete web3d overlay "resolution" property JSDoc
 2018-01-05 10:38:07 -08:00
Seth Alves
2071d42d25
Merge pull request #12088 from ElderOrb/FB11008 
11008 GoTo app does not focus on address bar when opened
 2018-01-05 10:07:36 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs 
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
 2018-01-05 09:07:54 -08:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering 
Log filtering
 2018-01-05 08:40:41 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix 
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
 2018-01-05 08:15:48 -08:00
David Rowe
d6a0457ee5 Delete web3d overlay "resolution" property JSDoc 2018-01-05 16:48:37 +13:00
Lexx
85b54f82d8
revert sorting change mistake 2018-01-05 01:58:23 +00:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor 
defang accidental disable of MyAvatar's default motor
 2018-01-04 17:44:22 -08:00
SamGondelman
eb0d09360a Merge remote-tracking branch 'upstream/master' into overlayFix 2018-01-04 15:47:20 -08:00
David Back
81f3590954 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-04 13:17:07 -08:00
SamGondelman
6a19b0e0b6 update render items on texture load 2018-01-04 13:10:46 -08:00
RebeccaStankus
9ba324b85f "Clear Filter" button instead of "Show All" 2018-01-04 12:51:11 -08:00
RebeccaStankus
3e8063f80a Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 12:48:09 -08:00
Alexander Ivash
7ab7a46530 11008 GoTo app does not focus on address bar when opened 2018-01-04 23:38:10 +03:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener 
Remove legacy jurisdiction code
 2018-01-04 11:52:38 -08:00
RebeccaStankus
f52a6d8eae Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-04 10:49:32 -08:00
David Rowe
7236ac17e2 Merge branch 'master' into 21661 2018-01-04 15:21:00 +13:00
David Rowe
138092ac37 Remove "Prefer Avatar Finger Over Stylus" setting 2018-01-04 15:12:34 +13:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate 
Tablet home paginate
 2018-01-03 18:12:32 -08:00
Ryan Downe Karpf
5a589350fe
Merge pull request #12077 from ctrlaltdavid/remove-filed 
Remove erroneous "filed" Overlay property
 2018-01-03 18:10:37 -08:00
David Back
6c8987d75f Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices 2018-01-03 14:44:52 -08:00
RebeccaStankus
9471dbeba9 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-03 11:39:38 -08:00
RebeccaStankus
89138c9bd8 More filter choices, search will clear 2018-01-03 11:35:46 -08:00
Zach Fox
6f077f3a92 Fix Security Pic Change dialog after QML security changes 2018-01-03 11:28:39 -08:00
Zach Fox
681b5173cd
Merge pull request #12082 from MiladNazeri/Fix-GitIgnore 
Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created
 2018-01-03 09:34:14 -08:00
RebeccaStankus
9edb85efdc Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-03 09:25:38 -08:00
David Rowe
901af8896f Add "Prefer Stylus Over Laser" setting 2018-01-03 17:54:43 +13:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
milad
63801ce802 add .jsc, remove duplicate qmlc, and remote Utils.jsc 2018-01-02 17:15:23 -08:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
RebeccaStankus
dd48972e44 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-02 14:06:41 -08:00
RebeccaStankus
0b452a23dc forgot to add hifi.entities to filter selections 2018-01-02 14:04:30 -08:00
RebeccaStankus
bf59697aa5 better dropdown 2018-01-02 13:56:49 -08:00
David Rowe
7013f64714 Remove erroneous "filed" Overlay property 2018-01-03 10:37:37 +13:00
RebeccaStankus
d08e97f9cc more filter options 2018-01-02 13:28:39 -08:00
Zach Fox
47a209dc4c Make things slightly better? 2018-01-02 13:11:00 -08:00
RebeccaStankus
fe69498976 initial changes...ready for feedback 2018-01-02 13:04:52 -08:00
vladest
a84e585679 Merge 2018-01-02 21:49:00 +01:00
RebeccaStankus
0117750757 PR for Feedback 2018-01-02 12:28:31 -08:00
Elisa Lupin-Jimenez
a63538c4e9
Merge pull request #12021 from elisa-lj11/poly_api 
Google Poly API
 2018-01-02 10:28:17 -08:00
RebeccaStankus
fe82d33b76 couple small changes 2018-01-01 15:29:49 -08:00
Triplelexx
78a0175413 fix assetbrowser sorting case sensitivity 2017-12-29 23:16:12 +00:00
Atlante45
aec5ab5921 CR 2017-12-29 12:46:52 -08:00
Atlante45
06e2f394f9 Update Octree server stats to handle single server 2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00