Changeset 12181 for data/data_extern
- Timestamp:
- Dec 11, 2018, 5:22:11 PM (6 years ago)
- Location:
- data/data_extern
- Files:
-
- 46 deleted
- 3 edited
- 17 copied
Legend:
- Unmodified
- Added
- Removed
-
data/data_extern
- Property svn:mergeinfo changed
/data/branches/Shader_HS18 (added) merged: 12078,12083-12085,12088,12091-12092,12096-12097,12115,12117,12120,12122,12140,12143
- Property svn:mergeinfo changed
-
data/data_extern/materials/Flares.material
r11088 r12181 1 material Examples/Flare 2 { 3 technique 4 { 5 pass 6 { 7 lighting off 8 scene_blend add 9 depth_write off 10 11 texture_unit 12 { 13 texture flare.png 14 } 15 } 16 } 17 18 technique 19 { 20 scheme glow 21 pass 22 { 23 lighting off 24 scene_blend add 25 depth_write off 26 27 texture_unit 28 { 29 texture flare.png 30 } 31 } 32 } 33 } 1 34 material Flares/point_lensflare 2 35 { -
data/data_extern/resources.oxr
r8913 r12181 13 13 <ResourceLocation path = "images/textures/stellarobjects"/> 14 14 <ResourceLocation path = "materials" /> 15 <ResourceLocation path = "materials/BumpMapping" /> 15 16 <ResourceLocation path = "models" /> 16 17 <ResourceLocation path = "packs/cubemap.zip" archiveType = "Zip"/> 17 18 <ResourceLocation path = "packs/skybox.zip" archiveType = "Zip"/> 19 18 20 <ResourceLocation path = "programs" /> 21 <ResourceLocation path = "programs/GLSL" /> 22 <ResourceLocation path = "programs/Cg" /> 23 <ResourceLocation path = "programs/GLSL120/BumpMapping" /> 24 <ResourceLocation path = "programs/GLSL120" /> 25 <ResourceLocation path = "programs/GLSL150" /> 26 <ResourceLocation path = "programs/GLSL400" /> 27 19 28 20 29 <ResourceLocation path = "gui/fonts" />
Note: See TracChangeset
for help on using the changeset viewer.