Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 02:30:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74592 commits 25 branches 0 tags 1.1 GiB
Commit graph

27850 commits

Author SHA1 Message Date
Wayne Chen
b4e2b74f3d adding text wrapping/fixing keep me logged in setting 2018-12-12 15:27:42 -08:00
Wayne Chen
941050d42c fixing tablet apps/referenceerror 2018-12-12 12:43:01 -08:00
Wayne Chen
941df8bc35 attempting fix on losing logged in setting 2018-12-12 10:08:50 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Wayne Chen
dbebf1a67f having stats mirror master 2018-12-11 19:29:17 -08:00
Wayne Chen
4b8200d5bb forcing stats to be false until login determined 2018-12-11 17:27:54 -08:00
Wayne Chen
b3911e466f feedback changes/don't switch modes on login in-world 2018-12-11 16:04:30 -08:00
Wayne Chen
f63c1b3fc5 dismiss dialog only if login dialog popped up 2018-12-11 15:42:35 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings 
Adding menu settings to disable teleporting
 2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot 
Fix MS20161: Fix INVENTORY notification dot state
 2018-12-11 13:03:26 -08:00
Sam Gateau
556a3ad00c
Merge pull request #14561 from SamGondelman/androidCrash 
Case 20250: Disable splash screen on android
 2018-12-11 11:21:08 -08:00
Sam Gateau
c401f3c8bd
Merge pull request #14521 from jherico/feature/build/gradle-wrapper 
20197: Containerized Android builds
 2018-12-11 11:16:00 -08:00
Dante Ruiz
deaf3e8e44 adding option to disable teleportring 2018-12-11 11:06:13 -08:00
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype 
(case 20037) Add robust MIME type detection for loading models in ModelCache
 2018-12-11 18:41:55 +00:00
Zach Fox
75ba1cb3c7 I forgot to clear dot immediately 2018-12-11 10:30:12 -08:00
SamGondelman
17dcd8b87a disable splash screen on android 2018-12-11 10:13:19 -08:00
Jeff Clinton
b6a87f2251
Merge pull request #14555 from vladest/linux_build_fix 
Added missed header
 2018-12-10 15:06:08 -08:00
Wayne Chen
e53e8435eb more fixing of logging in 2018-12-10 11:51:34 -08:00
Brad Davis
8504619067 Dockerized build, updated build script, ndk18 2018-12-10 11:33:41 -08:00
Wayne Chen
2a37ed21b2 more centering 2018-12-10 11:16:31 -08:00
Wayne Chen
5c354c4bc7 centering logged in text 2018-12-10 11:13:55 -08:00
Wayne Chen
c80f7c5a29 fixing typos 2018-12-10 10:55:02 -08:00
Wayne Chen
f11c60d9ff Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-10 10:52:14 -08:00
Jeff Clinton
40f50eccb1
Merge pull request #14550 from zfox23/MS20208_assetsToInventory 
Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY'
 2018-12-10 10:49:06 -08:00
Wayne Chen
3c4382773a fixing code for max height/width 2018-12-09 07:56:09 -08:00
Wayne Chen
7ab1d649f1 fixing limit for overlay too far/close 2018-12-09 07:49:48 -08:00
vladest
ead49e5f03 Added missed header 2018-12-08 16:49:34 +01:00
Wayne Chen
a787b39cae Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 17:39:51 -08:00
Wayne Chen
9fd1b7fb2d cancel pitch and check if overlay too far/close 2018-12-07 17:25:55 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash 
Case 19740: Improve startup times by pre-compiling shaders with splash screen
 2018-12-07 16:10:52 -08:00
Wayne Chen
23d3b96446 add spinner/design updates/fix steam link 2018-12-07 15:17:33 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking 
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
 2018-12-07 12:09:44 -08:00
sabrina-shanman
7cbe3776f5 Simplify serializer registration process 2018-12-07 12:05:27 -08:00
Zach Fox
4cc5fc755f Fix MS20208: Change an instance of 'ASSETS' to 'INVENTORY' 2018-12-07 11:42:03 -08:00
Wayne Chen
a2572d5710 fix switch display mode crash/keyboard spawn problem 2018-12-07 11:17:06 -08:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
SamGondelman
92117d602c remove cruft 2018-12-07 09:23:03 -08:00
Wayne Chen
2f4805dc04 adding focus disable signal to fix focus 2018-12-06 16:38:10 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1 
Pay-Out API Frontend, Part One
 2018-12-06 15:25:54 -08:00
Wayne Chen
1a86b8d172 50% opacity/bold shortcut text 2018-12-06 14:58:39 -08:00
Wayne Chen
1ddba8e787 KB following updated login screen/keep login screen active 2018-12-06 14:58:06 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Wayne Chen
4f0e23ed69 changing link steam flow/height of error message 2018-12-06 11:26:33 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
 2018-12-06 11:18:39 -08:00
Zach Fox
a2af50a9d0 Show pre-auth'd transactions in Recent Activity before redemption 2018-12-06 11:07:26 -08:00
Wayne Chen
9f894ae977 fixing case with KB pw prop./bolding error msg 2018-12-06 10:52:10 -08:00
Wayne Chen
30f1016f1c Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-06 09:55:00 -08:00
Jeff Clinton
b9156d68e5
Merge pull request #14508 from amantley/restingHandsBug 
removed the code that turns off inactive hands in MyAvatar.cpp
 2018-12-06 09:42:34 -08:00
Jeff Clinton
e8c1c4a27b
Merge pull request #14536 from danteruiz/fix-audio-switching 
Respect changed audio settings when switch displays (Master)
 2018-12-06 09:13:47 -08:00
Wayne Chen
89a216a5ec Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-06 09:05:07 -08:00