Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 01:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74802 commits 22 branches 28 tags 1.2 GiB
Commit graph

74802 commits

This branch
This branch
All branches
Author SHA1 Message Date
sam gateau
89dfd9aa86 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-12 09:58:28 -08:00
Zach Fox
735be62271
Merge pull request #14562 from zfox23/portalPrototype 
Add a "Portal" mode to the Secondary Camera
 2018-12-12 09:27:55 -08:00
Sam Gateau
34a69889d1 shadows in 2ndary maybe 2018-12-12 09:23:39 -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
Sam Gateau
8599a340ed Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-11 19:02:48 -08:00
Wayne Chen
4b8200d5bb forcing stats to be false until login determined 2018-12-11 17:27:54 -08:00
Zach Fox
dff7804cdc Change username to trashbot 2018-12-11 16:26:49 -08:00
Wayne Chen
b3911e466f feedback changes/don't switch modes on login in-world 2018-12-11 16:04:30 -08:00
Zach Fox
d74f7eb098 Implement MS20187: Add trash can feature to Inventory 2018-12-11 15:44:42 -08:00
Wayne Chen
f63c1b3fc5 dismiss dialog only if login dialog popped up 2018-12-11 15:42:35 -08:00
Zach Fox
d46b8d6471 Fix MS17811: Prevent frozen avatars in certain ignore cases 2018-12-11 14:52:11 -08:00
David Kelly
b2645bc23b Return more connections in pal 2018-12-11 14:47:18 -08:00
Shannon Romano
95a169b446
Merge pull request #14545 from NissimHadar/20116_nitpick_v1.2 
20116 nitpick v1.2
 2018-12-11 22:41:35 +00: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
sabrina-shanman
9e63caa84a Fix linker error for model-baker on Android/Linux 2018-12-11 12:54:44 -08:00
Jeff Clinton
e88e15fd94
Merge pull request #14560 from zfox23/MS4382_handshakeSparkles 
Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence
 2018-12-11 11:51:54 -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
sabrina-shanman
566d09dc9c Add model preparation step to ModelCache using new library model-baker 2018-12-11 11:15:54 -08:00
sabrina-shanman
25e3d49941 Add VaryingSet1 to Task aliases 2018-12-11 11:15:54 -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
SamGondelman
c7a0d8781f merge with NOverlays2 2018-12-11 10:33:17 -08: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
Brad Hefta-Gaub
43bbba6635
Merge pull request #14554 from sethalves/break-parenting-loops 
fix some parenting loops crashes
 2018-12-11 10:02:17 -08:00
Sam Gateau
d5b127d258 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-10 21:35:41 -08:00
Shannon Romano
bb9a764855
Merge pull request #14517 from luiscuenca/getEntityJointParent 
Add method to check entities joint hierarchy
 2018-12-11 01:06:38 +00:00
sabrina-shanman
79e9bff225 Nest if statement for invalid id checking in hfm::FormatRegistry::getSerializerForMediaType 2018-12-10 16:18:11 -08:00
sabrina-shanman
31d1512701 Simplify url empty check in GeometryReader::run 2018-12-10 16:12:23 -08:00
sam gateau
9ffe38f40c Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-10 15:13:58 -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
37aec8926a Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2 2018-12-10 14:32:42 -08:00
Zach Fox
3b9777d5d5 Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence 2018-12-10 14:08:38 -08:00
NissimHadar
4cb1f521d3 Merge branch '20116_nitpick_v1.2' of github.com:NissimHadar/hifi into 20116_nitpick_v1.2 2018-12-10 13:26:40 -08:00
Brad Davis
5cc00be801 Switch to shell script for docker encapsulation, forward env variables 2018-12-10 13:17:06 -08:00
SamGondelman
5eccaad135 remove new API 2018-12-10 13:05:39 -08:00
Zach Fox
ab6aeae91a Fix MS20161: Fix INVENTORY notification dot state 2018-12-10 13:01:28 -08:00
NissimHadar
6e35867123 Updated message box. 2018-12-10 13:00:38 -08:00
Jeff Clinton
1aa93c1d86
Merge pull request #14557 from zfox23/MS20215_soldOutFix 
Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page
 2018-12-10 12:32:41 -08:00
Wayne Chen
e53e8435eb more fixing of logging in 2018-12-10 11:51:34 -08:00
Brad Davis
39cff4f554 Update build notes 2018-12-10 11:33:42 -08:00
Brad Davis
8504619067 Dockerized build, updated build script, ndk18 2018-12-10 11:33:41 -08:00
Brad Davis
79d89d823e Fixes for building with Android NDK 18 2018-12-10 11:32:14 -08:00
Brad Davis
ef8b605e69 Add gradle wrapper to remove dependency on installed gradle 2018-12-10 11:32:14 -08:00
Wayne Chen
2a37ed21b2 more centering 2018-12-10 11:16:31 -08:00
Zach Fox
ed99da2165 Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page 2018-12-10 11:15:27 -08:00
Wayne Chen
5c354c4bc7 centering logged in text 2018-12-10 11:13:55 -08:00