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

30490 commits

Author SHA1 Message Date
sam gateau
4ab003091a Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-10 08:30:53 -08:00
Sam Gateau
b09d0b10e9 cleaning light clusters 2018-12-09 22:54:49 -08:00
Brad Hefta-Gaub
a005f9e9ab
Merge pull request #14546 from danteruiz/fix-reload-scripts 
fix realod all scripts functionality broken by PR14478
 2018-12-09 17:30:36 -08:00
Brad Hefta-Gaub
0425ae1231
Merge pull request #14239 from ElderOrb/FB19219 
FB19219 - Make avatarapp to handle wearables update via drag&drop
 2018-12-09 17:20:13 -08:00
Sam Gateau
653370e284 Assemble lighting stage works 2018-12-09 11:39:35 -08:00
Sam Gateau
79cad36c58 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-08 19:14:21 -08:00
Jamil Akram
4e7a777fda
Merge pull request #14486 from amantley/jointNameMapping 
FST File Joint Name Mapping From FBX Joint Names to Hifi Skeleton Joint Names
 2018-12-07 17:07:37 -08:00
sam gateau
28d36c81e0 there and back , trying to converge with the new Assemble Lighting Stage task 2018-12-07 16:24:51 -08:00
John Conklin II
69876bdec2
Merge pull request #14548 from SamGondelman/mirrorFix 
Case 19473 (#2): Fix Mirror tonemapping
 2018-12-07 16:11:59 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash 
Case 19740: Improve startup times by pre-compiling shaders with splash screen
 2018-12-07 16:10:52 -08:00
Jeff Clinton
998ec20854
Merge pull request #14539 from Atlante45/fix/script-loading 
Fix ESS scripts getting stuck on load
 2018-12-07 12:07:44 -08:00
Stephen Birarda
e3e400c86f
Merge pull request #14549 from birarda/bug/no-initial-send 
fix for initial send of non-instanced trait
 2018-12-07 12:02:08 -08:00
Brad Hefta-Gaub
9428f1de33
Merge pull request #14529 from SimonWalton-HiFi/avatar-mixer-downloads-fst 
Don't fetch avatars' .fst files from within the AvatarData class
 2018-12-07 12:01:58 -08:00
Dante Ruiz
177a94b9a9 fix realod all scripts functionality 2018-12-07 11:48:03 -08:00
birarda
51fd742722 fix for initial send of non-instanced trait 2018-12-07 11:17:44 -08:00
SamGondelman
8431b3b0c1 correct order of mixes 2018-12-07 10:39:10 -08:00
Alexander Ivash
600d09e533 relax 'isWearable()' condition to match latest changes in 'master' 2018-12-07 11:23:17 +03:00
Alexander Ivash
72a91668a5 FB19219 Make avatarapp to handle wearables update via drag&drop 2018-12-07 11:23:17 +03:00
Sam Gateau
50fcd7f40a trying... 2018-12-06 22:45:44 -08:00
amantley
f8ae0227c3 added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp 2018-12-06 20:16:03 -08:00
Sam Gateau
b24a2d33bf Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-06 19:51:05 -08:00
Sam Gateau
4fff4acde2 Merge branch 'punk' of github.com:samcake/hifi into punk 2018-12-06 19:50:46 -08:00
Stephen Birarda
fb3cdabd87
Merge pull request #14527 from birarda/bug/entity-traits-handler-deadlock 
fix for deadlock between setAvatarEntityData and sendChangedTraitsToMixer
 2018-12-06 17:28:45 -08:00
sam gateau
e941833676 gathering the lighting stage jobs in their own task away from the renderer specificities 2018-12-06 17:27:13 -08:00
amantley
ca0133a2a6 put the lean joint back in 2018-12-06 16:24:06 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400 
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
 2018-12-06 11:18:39 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals 
Case 19798: 3D projected Material Entities and materialRepeat option
 2018-12-06 11:13:46 -08:00
Simon Walton
e03104cad5 Merge remote-tracking branch 'upstream/master' into avatar-mixer-downloads-fst 
Remove the code that was fixed in the conflicting PR - it's
now fixed in the new location.
 2018-12-05 17:58:38 -08:00
sam gateau
a267c3115a drafting more factorisation of render tasks 2018-12-05 17:47:33 -08:00
Adam Smith
653974ca30
Merge pull request #14293 from SamGondelman/branching 
Case 19473: Reduce branching in our shaders
 2018-12-05 16:42:42 -08:00
Clement
7723261cb9 Remove deferred script loading logic 2018-12-05 14:08:30 -08:00
SamGondelman
287878ff98 merge with master 2018-12-05 10:35:08 -08:00
Antonina Savinova
2dcfea5f7c
Merge pull request #14487 from SimonWalton-HiFi/avatar-mixer-memory-leak 
Fix minor avatar-mixer memory leaks
 2018-12-05 10:29:29 -08:00
Sam Gateau
a295c6ffc8 scripts\developer\utilities\lib\jet\qml\TaskListView.qml 2018-12-04 22:41:36 -08:00
amantley
edab74caa4 mapped the model joint names to hifi compliant joint names in FBX serializer 2018-12-04 16:20:46 -08:00
Brad Hefta-Gaub
77e1c98264
Merge pull request #14528 from sethalves/fix-delete-home 
work around menu-item name hash collision for Home
 2018-12-04 15:04:25 -08:00
Adam Smith
763e6d1a95
Merge pull request #14444 from SamGondelman/actionData 
Case 19861: Fix: Shouldn't be able to write actionData from script
 2018-12-04 11:25:00 -08:00
Adam Smith
864e9ca8ae
Merge pull request #14443 from SamGondelman/hud 
Case 19660: Fix HUD crash
 2018-12-04 11:10:43 -08:00
sam gateau
8efdec1e51 merging with master 2018-12-04 11:03:46 -08:00
Simon Walton
f3236e0843 Remove FST joint members from AvatarData 2018-12-04 10:45:32 -08:00
Sam Gateau
d2ff4d4674 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-12-03 20:52:43 -08:00
Simon Walton
eb097af796 Remove all .fst downloads from AvatarData and its derived classes 2018-12-03 17:42:39 -08:00
Seth Alves
541d0ab4d6 work around menu-item name hash collision for Home 2018-12-03 17:33:04 -08:00
sam gateau
0343983f31 Applying changes done in deferred to forward 2018-12-03 16:58:54 -08:00
Simon Walton
9315c546d3 Initial version - move updateJoints() to derived class 2018-12-03 16:26:47 -08:00
birarda
c959dd7024 release avatar entity and traits locks sooner to avoid deadlock 2018-12-03 14:57:38 -08:00
amantley
f7fcf503c2 removed joint lean from fbxSerializer. it was unused 2018-12-03 14:50:57 -08:00
Clément Brisset
56ac34f9d1
Merge pull request #14506 from Atlante45/fix/misc-agent 
Fix various AC bugs
 2018-12-03 14:18:12 -08:00
Clément Brisset
62f21822ce
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash 
Fix Agent crash on shutdown
 2018-12-03 14:17:35 -08:00