Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 11:25:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63351 commits 29 branches 28 tags 1.2 GiB
Commit graph

63351 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
efa6f1f02f Use "Prefer Stylus Over Laser" setting 2018-01-04 15:00:17 +13:00
Zach Fox
ff4f582c7d Thanks Howard 2018-01-03 17:23:35 -08:00
Gabriel Calero
32494a8e24 Set QMLEngine base path for android 2018-01-03 22:13:31 -03:00
Zach Fox
8d4a6f01cb Fix bugs related to inspecting entities with hand controllers 2018-01-03 16:03: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
Zach Fox
eafb198fd7
Merge pull request #12084 from zfox23/commerce_fixSecurityPicChange 
Fix Security Pic Change dialog after QML security changes
 2018-01-03 13:17:55 -08:00
Gabriel Calero
3d86c24b34 Fix uncompressed textures. Generate CPU mipmaps for android 2018-01-03 16:42:19 -03:00
Gabriel Calero
e418339876 Fix uncompressed textures for android 2018-01-03 16:42:19 -03:00
Cristian Luis Duarte
40a7634a53 Incorporate changes from gpu-gl into gpu-gles (changes in organization and architecture of classes). 2018-01-03 16:42:19 -03:00
Gabriel Calero
597114afea Prepare forward pipeline for android 2018-01-03 16:42:19 -03:00
Cristian Luis Duarte
da28e0a8cb Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup 2018-01-03 16:42:18 -03:00
Gabriel Calero
fc62b2d34a Fix ktx_cache path for android. Load the least js scripts for android 2018-01-03 16:42:18 -03:00
Gabriel Calero
ef8ba1cad0 Include config.h in ResourceImageItem.cpp. Minor fixes 2018-01-03 16:40:14 -03:00
Gabriel Calero
78f2a8c566 Copy scripts from android assets at startup 2018-01-03 16:40:14 -03:00
Gabriel Calero
d31346c047 Use qml engine 2018-01-03 16:40:14 -03:00
RebeccaStankus
9471dbeba9 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering 2018-01-03 11:39:38 -08:00
Gabriel Calero
468fc89c3e Use forward pipeline for android 2018-01-03 16:38:23 -03:00
Gabriel Calero
ad7cb24ea3 Restore interface icon and name for android 2018-01-03 16:36:11 -03:00
Gabriel Calero
dad526d22b Make Fade.slh compatible with Open GLES SL 2018-01-03 16:36:11 -03:00
Gabriel Calero
76b38bebad Make Interface run in Android 2018-01-03 16:36:11 -03: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
samcake
ac0cca5345 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-01-03 11:12:16 -08:00
Sam Gateau
72503ce8ba
Merge pull request #12064 from SamGondelman/overlayFix 
Fix model overlays not disappearing on visibility change
 2018-01-03 11:08:24 -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
Zach Fox
33ae0948bb
Merge pull request #12080 from zfox23/commerce_myPurchasesLink 
Add a link to My Purchases from Wallet Home
 2018-01-02 17:33:02 -08:00
milad
63801ce802 add .jsc, remove duplicate qmlc, and remote Utils.jsc 2018-01-02 17:15:23 -08:00
RebeccaStankus
a8435070f5 Merge branch 'log-filtering' of https://github.com/RebeccaStankus/hifi into log-filtering 2018-01-02 15:33:09 -08:00
RebeccaStankus
cf13b0d249 removed landscaping app 2018-01-02 15:33:04 -08:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
Zach Fox
d0a3c299c9
Merge pull request #12076 from zfox23/commerce_fixMarketplacesInjectForLocal 
Fix marketplacesInject.js for local Metaverse
 2018-01-02 15:03:36 -08:00
RebeccaStankus
5f926d986a
Delete Utils.jsc 2018-01-02 14:48:41 -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
Clément Brisset
d6bc41db60
Merge pull request #12075 from highfidelity/stable 
Stable merge back into master
 2018-01-02 13:24:03 -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
Zach Fox
25e76c668b Fix marketplacesInject.js for local Metaverse 2018-01-02 12:22:40 -08:00
Bruce Brown
dfe31bc791
Add files via upload 2018-01-02 11:52:12 -08:00
Brad Davis
641c4e537a Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-02 11:38:11 -08:00
Brad Davis
829e521320 Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-02 11:37:33 -08:00
Nissim Hadar
f67232e53b Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-02 10:47:26 -08:00