Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 20:59:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77919 commits 76 branches 59 tags 1.2 GiB
Commit graph

77919 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shannon Romano
26e65b7ca6
Merge pull request #15444 from SamGondelman/warning 
Case 22262: Comment out QScript type warning
 2019-04-24 09:22:58 -07:00
Shannon Romano
42fb23ed5d
Merge pull request #15435 from samcake/blackProp 
Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci
 2019-04-24 09:22:11 -07:00
Shannon Romano
6da5608ae4
Merge pull request #15430 from huffman/fix/domain-baker-not-finishing 
Case 22309: Fix domain baker not finishing (merge to master)
 2019-04-24 09:19:25 -07:00
Shannon Romano
0768cd58dc
Merge pull request #15427 from SamGondelman/materialMap 
Case 22079: Bake existing materialMap in FST
 2019-04-24 09:16:12 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
Gayathri
50583d337b
Merge pull request #15441 from dback2/materialTargetBadMerge 
Case 22195: Fix material target parentIDChanged
 2019-04-23 12:24:50 -07:00
Simon Walton
db411cc456
Merge pull request #15431 from SimonWalton-HiFi/readkeys-double-free 
Don't double-free an openssl structure in readKeys()
 2019-04-23 12:06:19 -07:00
Shannon Romano
7a9dd49eed
Merge pull request #15411 from Zvork/shadow 
Case 22117: Shadows Appear Incorrectly Placed Relative to Avatars
 2019-04-23 09:32:53 -07:00
SamGondelman
9deb4e47ad comment out warning 2019-04-23 08:46:54 -07:00
Shannon Romano
5781ed8afb
Merge pull request #15436 from SamGondelman/version 
Case 22288: Fix "Version" not being preserved during baking
 2019-04-22 15:50:38 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -07:00
Olivier Prat
8dabcb76b8 Taking into account comments 2019-04-22 21:30:57 +02:00
SamGondelman
98a7e4e711 fix version not being preserved 2019-04-22 11:34:58 -07:00
Sabrina Shanman
2a7ef5c5bb
Merge pull request #15426 from sabrina-shanman/bug_oven_texture-scale_master 
(case 22282) Fix some baked models not preserving texture scale (master)
 2019-04-22 09:52:36 -07:00
Sam Gateau
97632534e5 REvert unecessary modified files to upstream master, just leaving the true new feature in this branch 2019-04-22 09:14:32 -07:00
Sam Gateau
6539482cc2 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-22 08:46:34 -07:00
Simon Walton
5e251b1033 Don't double-free an openssl struct 2019-04-19 17:03:43 -07:00
Sam Gateau
4875e52eba Merge branch 'blackProp' of github.com:samcake/hifi into blackProp 2019-04-19 16:57:57 -07:00
Sam Gateau
ba02aa7098 making luci2 better 2019-04-19 16:56:55 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread 
(case 22011) Fix model processing occurring on main thread
 2019-04-19 15:40:54 -07:00
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
SamGondelman
080cb36170 bake existing materialMap 2019-04-19 13:01:47 -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
sabrina-shanman
05a2b11c54 Fix mat4FromVariant 2019-04-19 11:29:28 -07:00
sabrina-shanman
74b4b47a2a Save some bandwidth by not including unity texture transforms in material jsons 2019-04-19 11:29:28 -07:00
sabrina-shanman
9cb5ed888a Remove unnecessary hasTexcoordTransform 2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27 Fix baked models not preserving scale in some cases 2019-04-19 11:29:27 -07:00
SamGondelman
b9934bce70 Merge remote-tracking branch 'upstream/master' into materialMap 2019-04-19 11:27:04 -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
sabrina-shanman
7333b02f34 Fix model processing occurring on main thread 2019-04-19 09:48:30 -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
Olivier Prat
7d412f9109 Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias. 2019-04-19 11:03:43 +02:00
Sam Gateau
b16e790109 Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-18 21:13:55 -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
Sam Gateau
af3d981ad1 Bringing the Luci interface into the new Prop framework and moving some tools there too 2019-04-18 17:44:08 -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
Olivier Prat
39d03ce87a Removed magic number 2019-04-18 19:19:38 +02: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
SamGondelman
0d914a695b wip 2019-04-18 09:06:02 -07:00
Olivier Prat
9d0706ec8b Merge branch 'master' of https://github.com/highfidelity/hifi into shadow 2019-04-18 11:06:35 +02:00
Olivier Prat
3cb9c518ea Exposed max shadow distance and a shadow bias scale parameter in graphics::Light 2019-04-18 11:06:12 +02:00
Sam Gateau
3d78592bb8 Adding more style widgets andbringing luci1 into the panels of luci2 2019-04-18 00:19:19 -07:00
Sam Gateau
0359caec8d Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-17 18:22:52 -07:00