Merge remote branch 'origin/master' into diabolik/afterslime

[xonotic/xonotic-maps.pk3dir.git] / scripts / shaderlist.txt

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 0498d03d9d95672193ae58cb2a7800fd31a566bb..c05cf399aa2d43e455b2be2871660e9cf9bfe366 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,5 +1,6 @@
 common
 decals
 common
 decals

+effects_beam

 effects_forcefield
 effects_healpod
 effects_item
 effects_forcefield
 effects_healpod
 effects_item


@@ -13,18 +14,27 @@ facility114x
 liquids_lava
 liquids_slime
 liquids_water
 liquids_lava
 liquids_slime
 liquids_water

+logos

 map_afterslime
 map_glowplant
 map_afterslime
 map_glowplant

+map_leave_em_behind
+map_newtonian-nightmare

 map_red-planet
 map_space-elevator
 map_red-planet
 map_space-elevator

-map_techassault

 map_stormkeep
 map_stormkeep

+map_techassault
+map_xoylent

 model_bigfan01
 model_bigfan01

+model_crate02

 model_desertfactory
 model_desertfactory

+model_teleporters

 model_tree
 model_tree

+model_walker-static

 model_xonotic_jumppad01
 model_xonotic_jumppad01

+model_xoylent

 narmorx
 proceduralx
 narmorx
 proceduralx

+screens

 skies_calm_sea
 skies_distant_sunset
 skies_exosystem2
 skies_calm_sea
 skies_distant_sunset
 skies_exosystem2