Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-25 06:23:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
77686 commits 77 branches 59 tags 1.2 GiB
Commit graph

77686 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
7574912629 fix version not being preserved 
(cherry picked from commit 98a7e4e711)
 2019-04-22 11:36:18 -07:00
John Conklin II
0bf510d953
Merge pull request #15420 from wayne-chen/fixShieldIconBehavior-82 
Case 22289: Fixing Shield Icon Behavior in Desktop Mode
 2019-04-19 15:24:10 -07:00
John Conklin II
e8f4b5a902
Merge pull request #15424 from huffman/fix/domain-baker-not-finishing-82 
Case 22299: Fix domain baker not finishing
 2019-04-19 14:00:41 -07:00
John Conklin II
4d4db257e4
Merge pull request #15382 from Atlante45/fix/asset-server-baking 
Case 22209: Fix asset server auto-baking
 2019-04-19 13:40:59 -07:00
Shannon Romano
57e996c615
Merge pull request #15415 from wayne-chen/fixRelaunchMuteSettings-82 
Case 22263: Persist Mute Settings Between Sessions
 2019-04-19 10:49:01 -07:00
Ryan Huffman
67ea9055e0 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 09:50:07 -07:00
Wayne Chen
474041d5d1
simplify PTT logic 2019-04-18 21:00:15 -07:00
Wayne Chen
389667ae56 adding proper logic for shield icon behavior 2019-04-18 14:54:21 -07:00
Wayne Chen
3bb8da3f29 real fix 2019-04-18 14:47:32 -07:00
John Conklin II
08dfabb53e
Merge pull request #15417 from SamGondelman/transparent 
Case 22276: Fix transparent textures on baked assets (RC82)
 2019-04-18 14:18:19 -07:00
John Conklin II
1d01d0e3f8
Merge pull request #15404 from sabrina-shanman/bug_oven_fst-rebake_RC82 
(case 22163) Fix baked models unable to rebake
 2019-04-18 12:17:22 -07:00
SamGondelman
b89dbf8346 fix transparent textures on baked assets 2019-04-18 11:22:37 -07:00
John Conklin II
ccc6fd1eb0
Merge pull request #15412 from wayne-chen/fixMuteWarningSwitchText-82 
Case 22259: Fix Mute Warning Switch Text
 2019-04-18 10:59:14 -07:00
Wayne Chen
ddb040eaf7 adding settingsLoaded bool check 2019-04-18 10:51:12 -07:00
Wayne Chen
7e445e40f8 change text to display 2019-04-18 08:48:39 -07:00
John Conklin II
d8ba08ec2d
Merge pull request #15403 from SimonWalton-HiFi/avatar-mixer-restart-82 
Avatar-Mixer restart issues (RC82)
 2019-04-17 16:28:31 -07:00
sabrina-shanman
ca15d3d3a8 Fix baked FSTs unable to be rebaked by creating an FST in the original 
output folder
 2019-04-17 15:25:50 -07:00
Simon Walton
c7f270a9ba Combine PR15375 & PR15376 for RC82 branch 2019-04-17 13:47:39 -07:00
Shannon Romano
b5b88bae52
Merge pull request #15399 from sabrina-shanman/hfm_bug_model-materials 
(case 22201) Fix Interface not loading some baked models correctly
 2019-04-17 13:46:45 -07:00
John Conklin II
7e3d58dd77
Merge pull request #15397 from SamGondelman/oven282 
Case 22222: Fix oven crash
 2019-04-17 13:14:59 -07:00
Clement
f371b7b2d9 Fix typo 2019-04-17 12:57:15 -07:00
sabrina-shanman
7f42ecaa74 Fix another Interface issue loading baked models 2019-04-17 12:11:21 -07:00
Clement
03b28b3dfa Add error reporting + Make temp dir erase safer 2019-04-16 19:40:59 -07:00
sabrina-shanman
461c70301a Fix Interface not loading some baked models correctly 2019-04-16 15:48:42 -07:00
SamGondelman
1b1b651b22 fix oven crash 
(cherry picked from commit 2d5cfbf4f5)
 2019-04-16 15:20:11 -07:00
Clement
ea8bc72bbf Fix Asset Server reporting bad status for textures 2019-04-15 19:08:44 -07:00
Shannon Romano
d1d441e8d2
Merge pull request #15390 from sabrina-shanman/hfm_disable-embedded-materials 
Disable baking of embedded material textures in material entities
 2019-04-15 14:53:16 -07:00
sabrina-shanman
0940931068 Disable baking of embedded material textures in material entities 2019-04-15 10:42:57 -07:00
John Conklin II
a6d35da562
Merge pull request #15380 from dback2/materialTargetRC82Fix2 
Case 22092: Fix material targets when re-opening properties to same entity (RC82)
 2019-04-15 10:04:25 -07:00
sabrina-shanman
0a62bf3e48 Fix MaterialBaker not including names in baked multi-materials 2019-04-15 09:49:45 -07:00
John Conklin II
5c5dc424a4
Merge pull request #15387 from danteruiz/fix-bubble-82 
Case 22157: Shield/bubble animation and sound plays when other users are ignored by PAL or their own shields
 2019-04-15 09:09:42 -07:00
Atlante45
c5b7bdc802 Fix unix warning 2019-04-12 17:51:03 -07:00
danteruiz
8e3b76d2e3 fixing bubble 2019-04-12 17:15:40 -07:00
sabrina-shanman
d19b1c18a0 Fix MaterialBaker not including names in baked multi-materials 2019-04-12 15:50:54 -07:00
Atlante45
794cedaa60 Patch interface redirect code 2019-04-12 15:49:34 -07:00
unknown
67f35e7074 fix material targets when re-opening properties to same entity 2019-04-12 14:47:48 -07:00
SamGondelman
77d8a36914 attempt to handle atp redirects from .fbx to .baked.fst 2019-04-12 13:50:23 -07:00
John Conklin II
c07cce7d63
Merge pull request #15372 from sabrina-shanman/hfm_crash_textures_RC82 
(case 22170) Fix TextureBaker failures and heap corruption in MaterialBaker (RC82)
 2019-04-12 12:53:06 -07:00
Clement
dc41fea46e Update Asset Server redirect and baking conditions 2019-04-12 11:31:13 -07:00
Clement
e912500cc2 Fix oven integration in the asset server 2019-04-12 11:31:13 -07:00
Shannon Romano
a368658da2
Merge pull request #15351 from dback2/materialTargetRC82Fix 
Case 22092: Fix avatar/shape material targets, refresh material target when parent changes (RC82)
 2019-04-11 17:51:19 -07:00
Shannon Romano
b196c9e037
Merge pull request #15370 from huffman/fix/edit-out-of-range-82 
Case 22139: Fix lack of ranges on numerical types in Create
 2019-04-11 17:27:25 -07:00
Ryan Huffman
4954d64c9e Fix lack of ranges on numerical types in Create 2019-04-11 14:26:39 -07:00
sabrina-shanman
6ea92a4698 Fix TextureBaker failures and heap corruption in MaterialBaker 2019-04-11 13:50:36 -07:00
unknown
f94c78e15d fix avatar/shape material targets, refresh material target when parent changes 2019-04-11 12:05:28 -07:00
John Conklin II
1b0ab19e07
Merge pull request #15366 from dback2/editContinualTranslateRC82 
Case 20896: Fix continual edit handle translation when moving (RC82)
 2019-04-11 10:37:59 -07:00
unknown
2d2fd0d2a4 only call onMove on lastMouseEvent change 2019-04-10 09:46:55 -07:00
Shannon Romano
a583f28bd9
Merge pull request #15349 from SamGondelman/jsbaker82 
Case 22095: Disable JSBaker for now (RC82)
 2019-04-10 09:31:35 -07:00
Shannon Romano
17e3226462
Merge pull request #15359 from SamGondelman/hashtag82 
Case 22107: Use # instead of ? for material URL name selection (82)
 2019-04-09 16:42:46 -07:00
SamGondelman
8a460276e5 use # instead of ? for material URL name selection 
(cherry picked from commit a50cca006e)
 2019-04-09 09:33:44 -07:00