Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-16 17:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 25 branches 0 tags 1.1 GiB
Commit graph

70 commits

Author SHA1 Message Date
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
David Rowe
a2bb9de441 Graphics API JSDoc stubs 2018-05-12 12:53:43 +12:00
Olivier Prat
ff88911f93 Protected procedural skyboxes from NaNs and negative values returned by procedural shader 2018-05-11 12:26:03 +02:00
SamGondelman
c2004debd5 test using highp floats everywhere for android 2018-05-07 11:41:19 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq 
Fix AMD shader compilation
 2018-04-23 10:17:35 -07:00
SamGondelman
901301485b reorganizing shader defines to fix compilation errors 2018-04-17 15:11:56 -07:00
Olivier Prat
f9cc4994df Merge branch 'master' of http://github.com/highfidelity/hifi into haze 2018-04-16 14:00:33 +02:00
Olivier Prat
6a089be973 Enabled haze to be vertically inverted (ceiling lower than base) 2018-04-16 12:15:08 +02:00
John Conklin II
3d90f93cf1
Merge pull request #12812 from SamGondelman/compression 
Support ETC2/EAC compressed textures
 2018-04-12 16:04:08 -07:00
SamGondelman
44ea5a2e84 add etc2/eac support 2018-04-05 18:59:22 -07:00
Brad Davis
ae8df7e24e Merge remote-tracking branch 'origin/gl_common' into HEAD 2018-03-21 12:35:17 -07:00
Seth Alves
2fd6bc4130 rename Mesh api getPos3 to getPos, deprecate but still support getPos3 2018-03-14 10:24:44 -07:00
Brad Davis
9056ee0f14 Merge branch 'gl_common' into bindless 2018-03-12 11:27:30 -07:00
Brad Davis
09996e0b65 Bindless texture work cleanup 2018-03-08 16:01:18 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
Brad Davis
d858d34523 Update material binding 2018-03-07 17:27:47 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
SamGondelman
a66125fbb7 scriptablematerial -> scriptablemateriallayer 2018-03-01 16:56:51 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
SamGondelman
a4b04d9d43 merge 2018-02-27 10:08:30 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08: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
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08: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
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08: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
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
humbletim
dd90c8c515 fix ubuntu compile warnings 2018-02-22 10:16:34 -05:00
humbletim
e4a2a589a5 CR fedback and cleanup 2018-02-22 07:56:09 -05:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
Gabriel Calero
72e02d6207 Restore default precision qualifier (needed for pixel) 2018-02-16 09:14:20 -08:00
Gabriel Calero
3effb6097b Add precision qualifier in fragment shaders for struct fields 2018-02-16 09:14:14 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Nissim Hadar
7e99570824 Fixed Ubuntu warnings. 2018-02-15 07:54:55 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
Nissim Hadar
34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
 2018-02-12 17:50:39 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00