Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
77021 commits 29 branches 0 tags 1.1 GiB
Commit graph

77021 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Walton
da6ca38282 Revert to using avatar's _globalPosition for zone membership 
According to Tony this should be the hip position, i.e.
a joint pos in T-pose, not neccesarily OK root. Also
SpatiallyNestable::WorldPos may depend on parent entity
and so not known by mixer.
 2019-03-26 10:48:59 -07:00
Simon Walton
c4fd58eb3e Merge remote-tracking branch 'origin/avatar-hero-zone-improvements' into avatar-hero-zone-improvements 2019-03-25 15:43:06 -07:00
Simon Walton
46f897b693 Better estimate of avatar centre for zone membership 2019-03-25 15:42:30 -07:00
Simon Walton
8872e9e4e7
Remove unused debugging variable 2019-03-23 20:05:26 -09:00
Simon Walton
d7a1ecdbb3 Expose hero-status to scripts 2019-03-22 17:19:39 -07:00
Simon Walton
137c25f907 Use a 1 m offset for position test; call-out nonavatars in stats web page 2019-03-22 15:40:13 -07:00
Simon Walton
a1660dad95 Follow dynamic updates to hero zones; make reserved fraction a domain setting 2019-03-22 12:30:49 -07:00
Shannon Romano
4ac25121e0
Merge pull request #15190 from roxanneskelly/Case20393 
Case20393 - Add item counts to interface categories
 2019-03-19 17:53:30 -07:00
Shannon Romano
e847c35b28
Merge pull request #15223 from roxanneskelly/Case21807 
Case 21807 - updatable items not showing up as updatable after clicking 'show updates' button. (master)
 2019-03-19 17:19:22 -07:00
Howard Stearns
44f897fbd2
Merge pull request #15216 from howard-stearns/allow-base-url-to-be-specified-in-fst 
allow baseURL to be specified in fst
 2019-03-19 13:56:27 -07:00
Roxanne Skelly
94739aa7c7 Case 21769 - updatable items not showing up as updatable 
after clicking 'show updates' button.
 2019-03-19 13:44:16 -07:00
Sam Gateau
d88bee89e4
Merge pull request #15176 from sabrina-shanman/hfm_oven_wip 
(case 21205) Incorporate HFM in Oven + Add FST baking/output + More Oven Improvements
 2019-03-19 13:03:49 -07:00
Howard Stearns
61fb65b5a4 don't set _url, so that cache_clearing works 2019-03-19 12:41:58 -07:00
Roxanne Skelly
80a1eaa3fd
Merge pull request #15215 from roxanneskelly/Case21790 
Stand-alone Tagging: tagged places not coming first in GOTO list
 2019-03-19 11:25:43 -07:00
howard-stearns
0e4d3b2aeb allow baseURL to be specified in fst 2019-03-18 17:40:54 -07:00
Roxanne Skelly
b6e583087e Stand-alone Tagging: tagged places not coming first in GOTO list 2019-03-18 17:40:01 -07:00
sabrina-shanman
fa6a94f16a Fix not mapping identical URLs in DomainBaker 2019-03-18 17:21:05 -07:00
sabrina-shanman
b0b4307f27 Fix unsupported model types preventing DomainBaker from finishing 2019-03-18 17:02:49 -07:00
sabrina-shanman
e6487332e8 Attempt to fix linker error with Android and draco in BuildDracoMeshTask.cpp 2019-03-18 17:02:44 -07:00
sabrina-shanman
e4cafced2a Re-name GRAP_KEY to GRAB_KEY in DomainBaker.cpp 2019-03-18 16:49:09 -07:00
sabrina-shanman
64fbf51ac2 Warn if baked mesh is empty for OBJBaker 2019-03-18 16:49:09 -07:00
sabrina-shanman
266f3a8ad8 Warn if handleFinishedTextureBaker doesn't recognize the sender 2019-03-18 16:49:09 -07:00
sabrina-shanman
cf40ed953b Do not create temporary directory in ModelBaker and copy model directly to the original output folder 2019-03-18 16:49:09 -07:00
sabrina-shanman
c29b3a8c35 Bypass signals in JSBaker/MaterialBaker when resource is already loaded 2019-03-18 16:49:09 -07:00
sabrina-shanman
bc3b35aad3 Do not consolidate source images by file for now, since they may have the same filename but different paths 2019-03-18 16:49:00 -07:00
sabrina-shanman
0990b56952 Better avoid overwriting textures in ModelBaker::compressTexture 2019-03-18 16:48:47 -07:00
Shannon Romano
840f3a3a2e
Merge pull request #15187 from SamGondelman/wearables 
Case 21721: Fix wearable duplication on domain switch
 2019-03-15 17:40:23 -07:00
Sam Gondelman
e7f2df4fac
Merge pull request #15197 from SamGondelman/onion 
Case 21746: Fix color grading/lighting of renderLayer front entities
 2019-03-15 17:17:09 -07:00
sabrina-shanman
b6c44ea443 Remove unused variables when iterating through mesh nodes in FBXBaker 2019-03-15 15:56:36 -07:00
sabrina-shanman
53429f459e Remove some redundancy involving model texture URL resolution 2019-03-15 15:32:39 -07:00
sabrina-shanman
60ed9e12a4 Attempt to fix build errors 2019-03-15 15:17:33 -07:00
SamGondelman
79dda7a6c7 build errors 2019-03-15 14:29:50 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
SamGondelman
8748a7561b fix lighting/color grading for everything 2019-03-15 12:48:32 -07:00
sabrina-shanman
041db33578 Attempt to fix build warnings 2019-03-15 10:20:58 -07:00
sabrina-shanman
c54b23f647 Make material baking output unique textures per usage like model baking does 2019-03-14 17:09:26 -07:00
sabrina-shanman
c8209aa976 Do not have multiple copies of the original texture file in the baked output 2019-03-14 17:09:25 -07:00
sabrina-shanman
20d0ca0073 Fix baked material JSONS using wrong texture paths 2019-03-14 17:09:21 -07:00
Shannon Romano
98eec6b74d
Merge pull request #15185 from thoys/fix/create/stopReselectionWhenFocussed 
Case 21653: Fix User is not able to update input fields and scroll past selected object in Create Tools [master]
 2019-03-14 16:14:32 -07:00
Anthony Thibault
a8b38e6fbe
Merge pull request #15192 from amantley/bugHandNoHipAnim 
Fixed Memory Corruption in AnimClip.cpp
 2019-03-14 15:28:19 -07:00
SamGondelman
c985fc735d clean up avatar rendering and ring gizmo normals 2019-03-14 14:43:43 -07:00
amantley
bc696d6db6 fixed memory leak caused by bone length scale computation 2019-03-14 13:49:13 -07:00
sabrina-shanman
3016860bab Fix QFile::open complaining the device was already open in 
TextureBaker::processTexture
 2019-03-14 13:31:29 -07:00
Roxanne Skelly
f971d17acc Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393 2019-03-14 12:36:42 -07:00
Roxanne Skelly
4470cf9ae5 Marketplace category dropdown UI tweaks 2019-03-14 12:35:54 -07:00
sabrina-shanman
5e430c98c5 Attempt to fix build warnings 2019-03-14 09:56:25 -07:00
Thijs Wenker
aeb56ff22a EntityList -> re-focus the rename field rather then re-selecting the text fully 
EntityProperties -> ignore selection updates when nothing is changed and window is focused
 2019-03-14 01:26:06 +01:00
sabrina-shanman
5b75eb34e8 Fix ModelBaker not properly checking if texture file name exists 2019-03-13 17:26:02 -07:00
sabrina-shanman
27c7bf5c92 Remove duplicate FBX debug dump 2019-03-13 17:02:55 -07:00
Shannon Romano
58146063db
Merge pull request #15179 from roxanneskelly/Case21703 
Case 21703, Case 21704, Case 21701 - random marketplace UI fixes
 2019-03-13 16:45:46 -07:00