Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-09 10:32:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76200 commits 25 branches 0 tags 1.1 GiB
Commit graph

76200 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
8eca2a2c9d Fix jenkins build failure 2019-02-19 13:09:18 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
Brad Davis
44851bbf68 Quest frame player cleanup 2019-02-19 12:37:17 -08:00
Brad Davis
0ddb4ecd7c Allow per-machine customization of which android projects are loaded 2019-02-19 12:10:26 -08:00
John Conklin II
051ab61b66
Merge pull request #14951 from SamGondelman/ssao 
Case 20993: Fix AO
 2019-02-19 11:19:03 -08:00
John Conklin II
d7a5c0bb4f
Merge pull request #14947 from SamGondelman/overlayClick 
Case 21291, Case 21292, Case 21293: Working on overlay bugs
 2019-02-19 11:01:19 -08:00
John Conklin II
1348baecc7
Merge pull request #14935 from SamGondelman/matEntity 
Case 20920: Move Material Entity logic to render thread
 2019-02-19 10:59:51 -08:00
John Conklin II
0f8c36156b
Merge pull request #14952 from SamGondelman/textColor 
Case 21305: Fix text overlay color property
 2019-02-19 10:58:32 -08:00
Howard Stearns
d7d6ff53ca
Merge pull request #14765 from howard-stearns/artist-stocking-inventory 
Case 20657: artist stocking inventory
 2019-02-19 10:46:01 -08:00
Bradley Austin Davis
b1a120cdfa
Merge pull request #14954 from amerhifi/feature/quest 
Feature/quest
 2019-02-19 09:44:39 -08:00
Sam Gateau
b46c79b113
Merge pull request #14942 from SamGondelman/hashLock 
Case 21277: Fix avatar deadlock
 2019-02-19 09:12:02 -08:00
amer cerkic
ae796c2484 rerouted the intent back to interfaceActivity since its back and registered in manifest 2019-02-19 07:42:35 -08:00
amer cerkic
9a0078a216 fixing compile errors. 2019-02-19 07:32:05 -08:00
SamGondelman
927e824610 fix missing color for text overlays 2019-02-18 16:14:07 -08:00
SamGondelman
27f05db825 fix ao 2019-02-18 01:12:00 -08:00
SamGondelman
1163cbea70 improving web surface interaction and tablet hiding 2019-02-16 22:03:55 -08:00
SamGondelman
85421cd6ee speed up stylus picks 2019-02-16 21:16:46 -08:00
SamGondelman
7677e3bf44 just in case 2019-02-16 20:41:57 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
Sam Gondelman
c8ab7ac37f
fix bad copy 2019-02-16 18:08:05 -08:00
amerhifi
04b5877da9
Merge pull request #10 from highfidelity/feature/quest 
Feature/quest
 2019-02-15 17:29:30 -08:00
SamGondelman
d50904dd4a fix avatar deadlock 2019-02-15 17:08:24 -08:00
SamGondelman
3e3bd2ffd8 fix transform properties not changing 2019-02-15 16:57:29 -08:00
Howard Stearns
e9b323a807 fix HFC symbol location at checkout, and the display of unavailable items 2019-02-15 16:56:31 -08:00
SamGondelman
6bf1545285 fix build error 2019-02-15 16:44:28 -08:00
Brad Davis
bfda7d73c1 Fix frame player 2019-02-15 16:39:36 -08:00
Brad Davis
02a95b599d fix extra shadergen args 2019-02-15 15:57:19 -08:00
John Conklin II
e77cdfc0d2
Merge pull request #14936 from sabrina-shanman/bug_gltf_mat-support 
(case 21231) Fix GLTF materials
 2019-02-15 15:43:31 -08:00
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor 
Case 21012: Avatar Doctor
 2019-02-15 15:43:18 -08:00
Howard Stearns
f16eb1c029 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 15:15:13 -08:00
Thijs Wenker
e900d3784b fixes 2019-02-15 23:58:42 +01:00
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
SamGondelman
3df231f1e0 it's working! 2019-02-15 14:43:22 -08:00
amerhifi
6ea941e4a8
Merge pull request #8 from highfidelity/feature/quest 
Feature/quest
 2019-02-15 14:40:45 -08:00
Brad Davis
00ed86d1cf fixing typo 2019-02-15 14:34:40 -08:00
Brad Davis
f896623404 Fix prebuild crash if can't find git binary (such as when running under Android Studio) 2019-02-15 14:30:54 -08:00
amerhifi
0fa0b07577
Merge pull request #7 from highfidelity/feature/quest 
Feature/quest
 2019-02-15 14:26:44 -08:00
John Conklin II
3969a0433e
Merge pull request #14920 from NissimHadar/21193-updateNitpickReadme 
Case 21193: update nitpick readme
 2019-02-15 14:23:13 -08:00
Brad Davis
51884155ee Support Android app-specific extensions in shaders 2019-02-15 14:16:58 -08:00
John Conklin II
09d8221582
Merge pull request #14834 from gcalero/connection_failure_dialog 
Case 20936: Set message dialog text width so wrap mode takes effect
 2019-02-15 14:16:02 -08:00
Brad Davis
578bc4fc89 Suppress logspam with missing Controller in QML 2019-02-15 14:15:24 -08:00
ingerjm0
c8791841de
Merge pull request #14918 from ctrlaltdavid/M21128 
Case 21128: AccountServices, HifiAbout, and WalletScriptingInterface JSDoc
 2019-02-15 14:15:13 -08:00
John Conklin II
c7a6902e93
Merge pull request #14881 from dback2/avatarExporterTextures 
Case 20613: Avatar Exporter v0.2 - copy external textures
 2019-02-15 14:14:05 -08:00
Brad Davis
5030bbd2cf Update Oculus platform SDK 2019-02-15 14:12:52 -08:00
Brad Davis
78be935e1a Consolidating differences from master 2019-02-15 14:12:37 -08:00
Sam Gateau
70c085dfab
Merge pull request #14928 from jherico/fix/android_release_apk 
Fix android release build APK
 2019-02-15 14:11:51 -08:00
Brad Davis
4409e59682 Add per-android-app preprocessor macros 2019-02-15 14:11:26 -08:00
Roxanne Skelly
a82385200e
Merge pull request #14906 from roxanneskelly/QmlMarketplace 
Qml marketplace - multiple improvements/bugfixes
 2019-02-15 14:04:47 -08:00
Andrew Meadows
7872da6b97
Merge pull request #14915 from samcake/brown 
Case 21190: Introducing msaa to forward renderer
 2019-02-15 13:48:33 -08:00
John Conklin II
b9356e22d8
Merge pull request #14927 from huffman/fix/hide-asset-browser 
Case 16349: Fix asset browser being hidden in incorrect way on server switch
 2019-02-15 13:32:27 -08:00