Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 10:58:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76097 commits 74 branches 59 tags 1.2 GiB
Commit graph

4196 commits

Author SHA1 Message Date
Brad Davis
a5f84ab51a Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 11:37:13 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
Anthony Thibault
39b4eaac34 Revert "AnimPose operator* optimizations" 
This reverts commit 569bef50fd.
 2019-02-14 16:13:00 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
Brad Davis
db121957d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-12 15:00:03 -08:00
SamGondelman
fdbcf4b2ea cleanup and expose mapped materials to getScriptableModel 2019-02-12 12:03:35 -08:00
SamGondelman
f75a3e1a72 it's working! 2019-02-12 11:41:47 -08:00
Brad Davis
a6f23f48d6 Merge branch 'feature/quest_custom_plugins' into feature/quest 2019-02-12 09:53:12 -08:00
SamGondelman
61346437da working on material mapping 2019-02-12 09:22:31 -08:00
Sam Gateau
9ad783135c Bringing back brownBis to just msaa support 2019-02-11 19:42:05 -08:00
Sam Gateau
8a4f7fe2b6 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-11 18:57:33 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
SamGondelman
4f03157f39 working on fst material mapping 2019-02-11 10:20:55 -08:00
Sabrina Shanman
baf72eaae0
Merge pull request #14802 from sabrina-shanman/hfm_prep_joints 
Case 20887: Move FST joint property handling to the model preparation step
 2019-02-08 15:02:23 -08:00
John Conklin II
851b968501
Merge pull request #14737 from SamGondelman/zone 
Case 19291: Fix zone bugs
 2019-02-08 14:07:26 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
SamGondelman
3addcb630c Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping 2019-02-07 11:45:59 -08:00
Sam Gateau
35491bf5b0 Multisampling works in 4.1 2019-02-06 00:05:17 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
Anthony Thibault
569bef50fd AnimPose operator* optimizations 2019-02-05 14:48:05 -08:00
Sam Gateau
4089f8c5b0 Adding Color filter to the tone mapper 2019-02-04 23:45:35 -08:00
Sam Gateau
d0a044120a Adding the sub samples control 2019-02-03 21:31:19 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
Sam Gateau
84db9f4729 testing the water... 2019-01-31 16:18:47 -08:00
Brad Davis
10a7403d44 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-01-30 10:19:46 -08:00
Sam Gateau
b47ecc9890 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-01-30 09:17:02 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors 
Case 20888: Fix color space
 2019-01-30 09:09:07 -08:00
SamGondelman
56096708d3 one more try 2019-01-29 15:26:49 -08:00
SamGondelman
e41f5617e9 fix color space 2019-01-29 14:52:57 -08:00
Brad Davis
0d34030135 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-01-29 14:13:11 -08:00
SamGondelman
5be6a31b6c possible fix for transparency 2019-01-29 12:20:46 -08:00
sabrina-shanman
203e8e2455 Realize joint properties isFree and freeLineage are unused, so tear them out 2019-01-29 11:55:35 -08:00
Sam Gateau
3ab66fde5e Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-01-28 19:22:33 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12 
Case 20722: Ring Gizmo Entities to replace Circle Overlays
 2019-01-28 18:09:23 -08:00
Sam Gateau
e39a6b5a7d Merging with master 2019-01-28 17:58:17 -08:00
Brad Davis
f1d3fc36e5 Cleaning up pre-master merge 2019-01-28 15:52:36 -08:00
Brad Davis
b1e4e17f47 Santa Cruz 2019-01-28 15:52:36 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization 
case 20883: GPU frame serialization and related tools
 2019-01-28 15:47:55 -08:00
SamGondelman
13cb70a6a5 Merge remote-tracking branch 'upstream/master' into NOverlays12 2019-01-28 11:37:15 -08:00
Sam Gateau
a747bf4cbd Exploring removing the COmpositing buffer in the display plugin, using srgb for swapchain and debuging from there 2019-01-27 23:48:55 -08:00
Sam Gateau
a2bd802707 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-01-26 12:15:53 -08:00
SamGondelman
becc9f4f8d DELETE IT ALL 2019-01-25 16:06:59 -08:00
Jeff Clinton
d92d256cfc
Merge pull request #14656 from SamGondelman/matFallthrough 
Case 20241: Material entity fallthrough
 2019-01-25 14:01:27 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
Adam Smith
dadd49f535
Merge pull request #14667 from SamGondelman/NOverlays9 
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
 2019-01-24 14:36:27 -08:00