Commit graph

97 commits

Author SHA1 Message Date
SamGondelman
94de0c12bc working on material baker 2019-03-06 15:34:11 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request 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
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
SamGondelman
0d1e4bed66 merge with master 2019-01-28 18:13:05 -08:00
SamGondelman
5ce8f566cc more overlay wip 2019-01-25 11:10:11 -08:00
SamGondelman
ca8d64bc05 removing overlays wip 2019-01-24 14:59:45 -08:00
SamGondelman
ff3545beab working with texture transform fallthrough 2019-01-07 13:28:00 -08:00
SamGondelman
a9d798070a wip 2019-01-02 18:08:59 -08:00
SamGondelman
9155853889 working on material fallthrough 2018-12-20 16:03:58 -08:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Seth Alves
bbe9b5c26f code review, remove some unneeded automoc includes 2018-09-28 16:04:40 -07:00
SamGondelman
9b75c7e07f trying to separate colors and vectors 2018-09-04 17:20:05 -07:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
SamGondelman
9929529f30 vec3 conversion 2018-07-11 14:18:22 -07:00
David Rowe
a2bb9de441 Graphics API JSDoc stubs 2018-05-12 12:53:43 +12:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
2018-05-03 21:03:14 +12:00
David Rowe
3febdcb141 Miscellaneous JSDoc tidying 2018-05-02 16:15:35 +12:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
SamGondelman
0aacdcd558 docs 2018-03-07 13:34:48 -08:00
SamGondelman
a66125fbb7 scriptablematerial -> scriptablemateriallayer 2018-03-01 16:56:51 -08:00
David Rowe
f9086e31de Deprecate Entities.getMeshes() in favor of using the new Graphics API 2018-03-01 10:08:50 +13:00
SamGondelman
a4b04d9d43 merge 2018-02-27 10:08:30 -08:00
humbletim
d3bae87066 * remove unneeded Q_DECLARE_METATYPEs
* CR feedback
2018-02-26 19:07:55 -05:00
humbletim
767569bc40 * changes per CR feedback
* make MeshPart.topology read-only
* JS Graphics API starter documentation
* remove redundant qscriptvalue sequence registrations
2018-02-26 18:00:22 -05:00
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08:00
humbletim
3dbe5d79bb fix windows punctilious warnings 2018-02-26 06:01:16 -05:00
humbletim
54dc0240b0 remove bufferviewscripting refs; fix compiler warnings 2018-02-26 05:26:35 -05:00
humbletim
f824edd04e * remove Model_temporary_hack
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08:00
humbletim
7c571cd431 cleanup / addition error message detail 2018-02-23 10:31:57 -05:00
humbletim
f8fe06213d CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:11:23 -05:00
humbletim
ebdb5b3c17 CR feedback; remove unrollVertices; update getFace; guard more debug logging 2018-02-23 08:57:48 -05:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
humbletim
0dd3672162 CR feedback / cleanup 2018-02-22 21:20:56 -05:00
humbletim
dd90c8c515 fix ubuntu compile warnings 2018-02-22 10:16:34 -05:00
humbletim
b0f444e179 remove dead code 2018-02-22 08:36:37 -05:00
humbletim
e4a2a589a5 CR fedback and cleanup 2018-02-22 07:56:09 -05:00
humbletim
be8d79f53f CR fedback and cleanup 2018-02-22 05:15:01 -05:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05:00
humbletim
145a0df082 interim checkin 2018-02-15 14:14:07 -05:00
humbletim
a08770c816 cleanup 2018-02-09 02:29:20 -05:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00