Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-27 17:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77307 commits 29 branches 28 tags 1.2 GiB
Commit graph

77307 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
b35b7687b7 Ready. 2019-03-12 18:32:17 -07:00
sabrina-shanman
7f77e163ac Restore 'Re-bake originals' checkbox to domain bake window 2019-03-12 18:17:11 -07:00
sabrina-shanman
a93825c2f9 Fix remaining issues with merge 2019-03-12 18:14:18 -07:00
Wayne Chen
6b82b8cd7f fix for steam complete profile bug 2019-03-12 17:55:14 -07:00
NissimHadar
ddd411e113 Removed test code. 2019-03-12 17:46:52 -07:00
Anthony Thibault
fff0d1a80e Rig.cpp: Fix for index out of range assert in debug builds 2019-03-12 17:43:23 -07:00
Shannon Romano
95bdf29f35
Merge pull request #15151 from roxanneskelly/Case20622 
Case 20622 - Qml Marketplace - Fix categories dropdown UI issues
 2019-03-12 17:42:47 -07:00
danteruiz
1e354fb280 fix notications scaling 2019-03-12 17:18:15 -07:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
amantley
7567e0d355 debugging the root of the fbx, it is not 0 in some cases 2019-03-12 15:48:42 -07:00
sabrina-shanman
06d38bf8e7 Fix DomainBaker not outputting URLs relative to the Destination URL Path 2019-03-12 15:36:14 -07:00
sabrina-shanman
f9f55f08db Fix model baking GUI being less lenient with local Windows files 2019-03-12 15:36:14 -07:00
sabrina-shanman
41c0594361 Make output folder cleaner for single model bake when baked model url is given as input 2019-03-12 15:36:13 -07:00
sabrina-shanman
09c30269d4 Add a note about FST support for url userinfo/query/fragment 2019-03-12 15:36:13 -07:00
sabrina-shanman
abbbeb11e1 Comment out baking for collision model, with explanation 2019-03-12 15:36:13 -07:00
sabrina-shanman
b42c6d1352 Fix baked models not mapping to correct textures 2019-03-12 15:36:06 -07:00
sabrina-shanman
5b504c4759 Add encode/decode speed config to BuildDracoMeshTask 2019-03-12 15:36:05 -07:00
sabrina-shanman
efc9f993f5 Add FSTBaker, and make ModelBaker output an FST 
Restore feature to look for baked model file in other oven directory
 2019-03-12 15:34:57 -07:00
Wayne Chen
186588ddc4 set audio client muted when loaded data 2019-03-12 15:27:02 -07:00
NissimHadar
647b508b9d TEST TEST TEST 2019-03-12 14:53:19 -07:00
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -07:00
NissimHadar
643fbfd805 TEST TEST TEST 2019-03-12 14:06:45 -07:00
NissimHadar
625e84aa0d Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-12 13:54:59 -07:00
NissimHadar
858d80073f Change default snapshots folder. 2019-03-12 13:27:36 -07:00
Shannon Romano
88da09c2ab
Merge pull request #15029 from FlameSoulis/fix/Linux-Build-Guide 
Resolve Linux Build Guide's Cmake issue
 2019-03-12 12:29:46 -07:00
Brad Davis
cb311408c6 Remove _compositeFramebuffer from display plugins 2019-03-12 12:20:20 -07:00
Sabrina Shanman
ff67cd652e
Merge pull request #15158 from SamGondelman/unrigged 
Case 7295: Fix rendering of unrigged vertices
 2019-03-12 10:59:29 -07:00
NissimHadar
41662b183b Removed redundant method. 2019-03-12 10:45:04 -07:00
John Conklin II
2cf7462fbc
Merge pull request #15159 from dback2/jointOffset2RenamingFix 
Case 21669: Fix joint renaming with jointRotationOffset2
 2019-03-12 10:32:02 -07:00
NissimHadar
4c7b292e1a Remove unneeded wait. 2019-03-12 10:25:40 -07:00
NissimHadar
df2fd82b61 Merge branch 'master' of github.com:highfidelity/hifi into 21616-addPerTileThreshold 2019-03-11 20:25:32 -07:00
NissimHadar
1fd34eeee8 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-11 20:25:03 -07:00
NissimHadar
1a9f33ef66 Removed test. 2019-03-11 20:24:34 -07:00
NissimHadar
80168058f7 Correct APK installation. 2019-03-11 20:22:07 -07:00
NissimHadar
065897a8f3 TEST!!! 2019-03-11 18:56:23 -07:00
David Back
f0bf87b3c3 fix joint out not being renamed with jointRotationOffset2 2019-03-11 18:53:35 -07:00
Shannon Romano
44fa00606a
Merge pull request #15153 from danteruiz/fix-soft-entity-popping 
Case 21618: menithal's avatar is constantly flashing
 2019-03-11 18:09:44 -07:00
Jason Najera
2423cd8b9e
Merge pull request #15109 from r3tk0n/ptt 
Case 21658: Push-To-Talk
 2019-03-11 17:59:01 -07:00
amantley
7c7e632589 debug statements to find the node parsing error 2019-03-11 17:50:20 -07:00
SamGondelman
2b32b77bed handle case when clusterMatrices.size() == 0 2019-03-11 17:32:40 -07:00
NissimHadar
d4b77d15cc Use correct snapshots folder. 
Fix bug in APK installer.
 2019-03-11 17:11:09 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Wayne Chen
4add8c1777
Merge pull request #15098 from wayne-chen/muteWarningModified 
Case 21564: Warn When Muted
 2019-03-11 16:53:00 -07:00
Wayne Chen
db368338b8
Merge pull request #22 from wayne-chen/pushToTalk 
removing dead code
 2019-03-11 16:44:12 -07:00
Wayne Chen
84b177996b removing dead code 2019-03-11 16:43:26 -07:00
Jason Najera
3c5fd06959
Remove useless comment. 
Comment was not helpful.
 2019-03-11 16:16:58 -07:00
Wayne Chen
97e375e004
Merge pull request #21 from wayne-chen/pushToTalk 
changing mic bar indicator + PTT setting placement
 2019-03-11 16:16:52 -07:00
Wayne Chen
80821e8b7e changing mic bar indicator when muted in PTT 2019-03-11 16:15:47 -07:00
Wayne Chen
ca5ff3381b changing position of the mute warning setting 2019-03-11 16:02:18 -07:00
SamGondelman
b24b7fed3d the root node isn't the first onegit add ../.git add ../. 2019-03-11 15:34:41 -07:00