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

77819 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
15e4df2b61 Fix domain baker not finishing (threading, material key) 
This addresses 2 cases where the domain baker would not finish

1. For material baking, we were storing a value in
_entitiesNeedingRewrite with a different key than what
we use when we later remove it from _entitiesNeedingRewrite

2. The domain baker runs on a worker thread. When starting a
baker for an item in the domain, we do an invokeMethod,
which will happen synchronously if the baker ends up on the
same thread as the thread that the domain baker is on.
This can cause issues if the baker finishes immediately.
The case I saw was a local model url that immediately failed,
and finished before return from the invokeMethod in the domain baker .
 2019-04-19 15:32:51 -07:00
Shannon Romano
71ca653498
Merge pull request #15360 from thoys/feat/create/editMultipleProperties 
Case 21228: [Create App] allow editing properties of multiple entities simultaneously
 2019-04-19 13:32:59 -07:00
Shannon Romano
c09e0eca1d
Merge pull request #15416 from SamGondelman/transparent83 
Case 22283: Fix transparent textures on baked assets
 2019-04-19 12:35:20 -07:00
Sam Gondelman
38ca699ff5
Merge pull request #15406 from sabrina-shanman/bug_oven_fst-rebake 
(case 22271) (RC83) Fix baked models unable to rebake
 2019-04-19 10:44:54 -07:00
Shannon Romano
4962bc8c10
Merge pull request #15395 from SamGondelman/oven 
Case 22213: Fix materialJSON paths in domain baker
 2019-04-19 10:39:42 -07:00
Shannon Romano
828677cd10
Merge pull request #15335 from NissimHadar/22067-updateNitpickToUseNewHifiURLs 
Case 22067: Added 'metaverse' to dev-build URL - v3.2.1
 2019-04-19 09:23:49 -07:00
Shannon Romano
d5ab49c64c
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master 
(case 22216) Fix Interface not loading some baked models correctly
 2019-04-19 08:53:40 -07:00
NissimHadar
69433b1f8a
Merge pull request #15339 from NissimHadar/22076-changeTimeStampURLToEnvironmentVariable 
Case 22076: Use optional environment variable for timestamp server URL
 2019-04-19 07:39:04 -07:00
Sam Gondelman
fe3e66b74d
Merge pull request #15418 from SamGondelman/warnings 
Case 22287: Fix warnings
 2019-04-18 20:26:33 -07:00
Sam Gondelman
4f9911a655
Merge pull request #15356 from NissimHadar/22096-addVHACDUtilToInstaller 
Case 22096: Added vhacd-util and Oven to all installers.
 2019-04-18 20:25:02 -07:00
Sam Gondelman
2604afa454
Merge pull request #15396 from SamGondelman/oven2 
Case 22244: Fix oven crash (RC83)
 2019-04-18 20:22:36 -07:00
SamGondelman
7fa81ffef3 fix warnings 2019-04-18 12:48:46 -07:00
SamGondelman
27f1255899 fix transparent textures on baked assets 
(cherry picked from commit b89dbf8346)
 2019-04-18 11:23:45 -07:00
Thijs Wenker
386d392144 The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = > 2019-04-18 19:05:40 +02:00
Shannon Romano
6c15719618
Merge pull request #15310 from danteruiz/fix-keyboard-scaling 
Case 21513: Keyboad doesn't scale to avatar after reloading content
 2019-04-17 16:59:42 -07:00
sabrina-shanman
d80b40e5a5 Fix baked FSTs unable to be rebaked by creating an FST in the original 
output folder
 2019-04-17 16:37:01 -07:00
Shannon Romano
bbab0b59b7
Merge pull request #15332 from raveenajain/gltf_brainstem_fix 
Case 22060 fix model
 2019-04-17 16:29:25 -07:00
Thijs Wenker
dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2019-04-18 00:21:11 +02:00
sabrina-shanman
693cdabc2c Small style fix for materialID bounds check in FBXSerializer_Mesh.cpp 2019-04-17 13:26:19 -07:00
sabrina-shanman
53f74abd49 Fix another Interface issue loading baked models 2019-04-17 13:24:04 -07:00
sabrina-shanman
343b853b59 Fix Interface not loading some baked models correctly 2019-04-17 13:24:04 -07:00
sabrina-shanman
b711ee8b8a Fix MaterialBaker not including names in baked multi-materials 2019-04-17 13:24:04 -07:00
raveenajain
2fab5a0945 parents, skeleton, break fix 2019-04-17 21:14:44 +01:00
Shannon Romano
da314694b4
Merge pull request #15271 from amantley/overrideHandAnimsSquashed 
Allow Hand Animations to be Overridden
 2019-04-17 11:53:41 -07:00
Shannon Romano
5d1c1010c5
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error 
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
 2019-04-17 11:43:12 -07:00
Anthony Thibault
b4a993bec6
Merge pull request #15033 from hyperlogic/feature/coding-standard 
Added coding standard file to repo
 2019-04-17 11:06:07 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
amantley
035c8a687d fixed merge conflict 2019-04-17 10:16:39 -07:00
raveenajain
104ed758b9 re-order nodes, cluster update 2019-04-17 17:52:48 +01:00
Shannon Romano
f2069a2cd7
Merge pull request #15344 from amantley/bugTwoBoneOverFlow 
Fixed out of range error in AnimTwoBoneIK
 2019-04-17 09:51:09 -07:00
David Back
d1f451ddcc
Merge pull request #15354 from dback2/undoEditOrderFix 
Case 20960: Fix Create's undo edit order
 2019-04-17 09:28:56 -07:00
unknown
2839879657 Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix 2019-04-16 15:26:47 -07:00
Shannon Romano
ec22f7847e
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster 
Case 22130: PR 15366 changes from v82 to Master
 2019-04-16 15:17:08 -07:00
SamGondelman
2d5cfbf4f5 fix oven crash 2019-04-16 15:16:26 -07:00
Shannon Romano
50f39e88d6
Merge pull request #15365 from hyperlogic/bug-fix/better-camera-in-head-check 
Better head vs camera checks for avatar head cauterization
 2019-04-16 15:07:46 -07:00
Shannon Romano
517710bcb8
Merge pull request #15388 from r3tk0n/running-fix 
Case 22192: Adjust run speed constants.
 2019-04-16 14:51:23 -07:00
amantley
ba9b539bd2 removed hand fbx files that will be used in the future for default hand overrides 2019-04-16 14:12:32 -07:00
Shannon Romano
adbcbe6585
Merge pull request #15381 from dback2/materialTargetMasterFollowup2 
Case 22195: PR 15380 changes from v82 to Master
 2019-04-16 11:48:07 -07:00
Shannon Romano
7de56092f8
Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks 
Clear delayed Node-adds upon restart
 2019-04-16 11:27:15 -07:00
Shannon Romano
4b91363226
Merge pull request #15375 from SimonWalton-HiFi/pingpunch-lower-rate 
Increase ping interval for unconnected Nodes
 2019-04-16 11:22:30 -07:00
SamGondelman
23918258d9 fix materialJSON paths in domain baker 2019-04-16 10:30:09 -07:00
r3tk0n
d0abb86366 Reversed costants because no sleep. >_< 2019-04-15 17:26:22 -07:00
Sam Gateau
db9df76337
Merge pull request #15391 from sabrina-shanman/hfm_disable-embedded-materials_master 
(master) Disable baking of embedded material textures in material entities
 2019-04-15 15:51:41 -07:00
Shannon Romano
3500a1b19e
Merge pull request #15386 from danteruiz/fix-bubble 
Case 22203: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields of RC83
 2019-04-15 15:15:53 -07:00
Shannon Romano
4d255fce93
Merge pull request #15373 from sabrina-shanman/hfm_crash_textures 
(case 21906) Fix TextureBaker failures and heap corruption in MaterialBaker
 2019-04-15 15:12:39 -07:00
sabrina-shanman
8f87afd7db Disable baking of embedded material textures in material entities 2019-04-15 15:00:14 -07:00
Shannon Romano
d00ba2a9f1
Merge pull request #15384 from roxanneskelly/Case21707 
Case21707 - Wallet doesn't work if user has unicode characters in windows username
 2019-04-15 14:48:30 -07:00
raveenajain
f458427067 Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_brainstem_fix 2019-04-15 12:59:43 -07:00
Roxanne Skelly
3949ca2638 Remove logging and bump build. 2019-04-15 12:35:36 -07:00
raveenajain
3c84a46cba update how nodes are initially parsed 2019-04-15 20:27:54 +01:00