Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74681 commits 71 branches 56 tags 1.2 GiB
Commit graph

74681 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Wayne Chen
9e4c93c95d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 09:18:21 -08:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -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
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts 
fix realod all scripts functionality broken by PR14478
 2018-12-09 17:30:36 -08:00
Brad Hefta-Gaub
26ccfb2533
Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning 
Mini tablet tuning
 2018-12-09 17:23:59 -08:00
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345 
Make create apps not grab tablet if editing an entity with hand
 2018-12-09 17:21:10 -08:00
Brad Hefta-Gaub
0425ae1231
Merge pull request #14239 from ElderOrb/FB19219 
FB19219 - Make avatarapp to handle wearables update via drag&drop
 2018-12-09 17:20:13 -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
Seth Alves
c1e2653526 check for and break parenting loops in hasAncestorOfType, findAncestorOfType, isParentPathComplete 2018-12-08 07:42:03 -08: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
Jamil Akram
4e7a777fda
Merge pull request #14486 from amantley/jointNameMapping 
FST File Joint Name Mapping From FBX Joint Names to Hifi Skeleton Joint Names
 2018-12-07 17:07:37 -08:00
sabrina-shanman
031085b384 Remove now unused HFMSimpleFormat 2018-12-07 16:17:33 -08:00
John Conklin II
69876bdec2
Merge pull request #14548 from SamGondelman/mirrorFix 
Case 19473 (#2): Fix Mirror tonemapping
 2018-12-07 16:11:59 -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
Clément Brisset
3386e5042f
Merge pull request #14450 from birarda/bug/case-insensitive-paths 
match domain paths match case-insensitively
 2018-12-07 13:59:49 -08:00
John Conklin II
2d52fffa4b
Merge pull request #14460 from huffman/fix/lifetime-slider-alt 
Change lifetime back to a regular input field
 2018-12-07 13:43:08 -08:00
Ryan Huffman
a42a771df5
Merge pull request #14540 from huffman/feat/hide-certified-urls 
Add hiding of certified properties in Create
 2018-12-07 13:42:23 -08:00
sabrina-shanman
f2e69aec5e Fix mac warning for OBJSerializer::getFactory not marked with override 2018-12-07 13:41:33 -08:00
Ryan Huffman
6eb0029b9a
Merge pull request #14480 from thoys/fix/create/missingStartMiddleFinishTooltips 
MS20000: [CreateApp/Tooltips] Add missing start/middle/finish tooltips
 2018-12-07 12:10:54 -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