Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 09:49:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74441 commits 76 branches 59 tags 1.2 GiB
Commit graph

74441 commits

This branch
This branch
All branches
Author SHA1 Message Date
sam gateau
94ae345daf Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-13 08:45:29 -08:00
Sam Gateau
7f193d0e7c WEll it sn not going to be that simple.... 2018-12-13 00:32:59 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
sam gateau
27da9b4542 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-12 12:13:07 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Clément Brisset
a9057e09e0
Merge pull request #14566 from zfox23/MS17811_ignoreFreeze 
Fix MS17811: Prevent frozen avatars in certain ignore cases
 2018-12-12 10:37:03 -08:00
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
Sam Gateau
8599a340ed Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-11 19:02:48 -08:00
Zach Fox
d46b8d6471 Fix MS17811: Prevent frozen avatars in certain ignore cases 2018-12-11 14:52:11 -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
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
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
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
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
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
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
Zach Fox
ed99da2165 Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page 2018-12-10 11:15:27 -08:00
sabrina-shanman
b960b66542 Fix mac warning for std::move on temporary object 2018-12-10 11:10:29 -08:00
Jeff Clinton
fbb0a6d37a
Merge pull request #14541 from dback2/unityAvatarExporter 
Unity Avatar Exporter
 2018-12-10 11:02:35 -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
Howard Stearns
42799817a1
Merge pull request #14552 from SimonWalton-HiFi/agent-large-avatar-packets 
Pass on dropFaceTracking flag in ScriptableAvatar::toByteArrayStateful()
 2018-12-10 10:37:15 -08:00
sabrina-shanman
8792824960 Remove FormatSerializerRegister as it is unused 2018-12-10 09:58:59 -08:00
Sam Gateau
f7bf51d62c
Merge pull request #13966 from elmanytas/run_interface_ubuntu_18.04 
Added steps to run interface in Ubuntu 18.04 .
 2018-12-10 09:50:43 -08:00
sam gateau
4ab003091a Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-10 08:30:53 -08:00
NissimHadar
d09ca34cfd Merge branch 'master' of github.com:highfidelity/hifi into 20116_nitpick_v1.2 2018-12-09 23:58:09 -08:00
Sam Gateau
b09d0b10e9 cleaning light clusters 2018-12-09 22:54:49 -08:00