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

77160 commits

This branch
This branch
All branches
Author SHA1 Message Date
sabrina-shanman
3aaa18f529 Might as well deduplicate indices when loading model for baking 2019-03-13 16:44:50 -07:00
sabrina-shanman
32d5f7135f Give the oven model-baker Baker an appropriate materialMappingBaseURL, but disable ParseMaterialMappingTask for now 2019-03-13 16:44:50 -07:00
Roxanne Skelly
c3ecc29c4b Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-13 16:04:34 -07:00
maspring
5e09103d9f
Merge pull request #15177 from huffman/fix/vsfiles 
Case 21708: Remove .vs folder from version control
 2019-03-13 15:39:25 -07:00
Roxanne Skelly
559351a6eb Case 21701 - Items were showing up in marketplace as "updates" when they 
weren't
 2019-03-13 15:33:46 -07:00
Roxanne Skelly
42bf812019 Case 21704 - marketplace button formatting fixes 2019-03-13 15:03:29 -07:00
David Rowe
74edea8034 Miscellaneous JSDoc fixes 2019-03-14 10:25:31 +13:00
David Rowe
277ef56f49 Fill in JSDoc for new flow functions 2019-03-14 10:24:19 +13:00
Roxanne Skelly
822e5ceb98 Case 21703 - Disable SUBMIT before balance is retrieved 
to prevent sending a send-money request with too large
of a balance
 2019-03-13 13:42:55 -07:00
SamGondelman
300dd39abf fix script engine shutdown 2019-03-13 12:23:31 -07:00
Shannon Romano
28b8f1a62c
Merge pull request #15172 from wayne-chen/fixSteamCompleteProfileBody-master 
Case 21695: Unable to create new profile during steam login
 2019-03-13 10:46:08 -07:00
Roxanne Skelly
2dc38df779 Case 20393 - Display item counts in categories dropdown in Marketplace 2019-03-13 10:17:39 -07:00
Ryan Huffman
d8139af429 Remove .vs folder from version control 2019-03-13 08:51:19 -07:00
Sam Gondelman
f013b9af2b
fix warnings 2019-03-13 00:24:19 -07:00
David Rowe
ea84847950 Update AnimStateDictionary JSDoc per feedback 2019-03-13 16:20:38 +13:00
David Rowe
7445d73857 Merge branch 'master' into M21222 
# Conflicts:
#	libraries/avatars/src/AvatarData.h
 2019-03-13 16:14:14 +13:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
sabrina-shanman
b855b0e2a3 Document available bake types for baker command line 2019-03-12 18:33:41 -07:00
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
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
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
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -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
df2fd82b61 Merge branch 'master' of github.com:highfidelity/hifi into 21616-addPerTileThreshold 2019-03-11 20:25:32 -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
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