From: Rudolf Polzer Date: Tue, 30 Nov 2010 15:07:31 +0000 (+0100) Subject: Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway' X-Git-Tag: xonotic-v0.1.0preview~86^2~2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a60cee16752e5abd387f6b7cd7d826b4f0321d05;hp=ba7dda5ed9ea7578a88978db7c9f4294be2bf612 Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway' --- diff --git a/models/ctf/banner_blue.tga b/models/ctf/banner_blue.tga new file mode 100644 index 0000000000..8b9558975f Binary files /dev/null and b/models/ctf/banner_blue.tga differ diff --git a/models/ctf/banner_blue_gloss.tga b/models/ctf/banner_blue_gloss.tga new file mode 100644 index 0000000000..77168a8a88 Binary files /dev/null and b/models/ctf/banner_blue_gloss.tga differ diff --git a/models/ctf/banner_red.tga b/models/ctf/banner_red.tga new file mode 100644 index 0000000000..a64aa36ce2 Binary files /dev/null and b/models/ctf/banner_red.tga differ diff --git a/models/ctf/banner_red_gloss.tga b/models/ctf/banner_red_gloss.tga new file mode 100644 index 0000000000..77168a8a88 Binary files /dev/null and b/models/ctf/banner_red_gloss.tga differ diff --git a/models/ctf/flag_blue.tga b/models/ctf/flag_blue.tga new file mode 100644 index 0000000000..63feddd4ee Binary files /dev/null and b/models/ctf/flag_blue.tga differ diff --git a/models/ctf/flag_blue_gloss.tga b/models/ctf/flag_blue_gloss.tga new file mode 100644 index 0000000000..3e92985b84 Binary files /dev/null and b/models/ctf/flag_blue_gloss.tga differ diff --git a/models/ctf/flag_blue_glow.tga b/models/ctf/flag_blue_glow.tga new file mode 100644 index 0000000000..8605da1596 Binary files /dev/null and b/models/ctf/flag_blue_glow.tga differ diff --git a/models/ctf/flag_blue_norm.tga b/models/ctf/flag_blue_norm.tga new file mode 100644 index 0000000000..07d5e17aae Binary files /dev/null and b/models/ctf/flag_blue_norm.tga differ diff --git a/models/ctf/flag_red.tga b/models/ctf/flag_red.tga new file mode 100644 index 0000000000..63feddd4ee Binary files /dev/null and b/models/ctf/flag_red.tga differ diff --git a/models/ctf/flag_red_gloss.tga b/models/ctf/flag_red_gloss.tga new file mode 100644 index 0000000000..3e92985b84 Binary files /dev/null and b/models/ctf/flag_red_gloss.tga differ diff --git a/models/ctf/flag_red_glow.tga b/models/ctf/flag_red_glow.tga new file mode 100644 index 0000000000..dfe90a42d8 Binary files /dev/null and b/models/ctf/flag_red_glow.tga differ diff --git a/models/ctf/flag_red_norm.tga b/models/ctf/flag_red_norm.tga new file mode 100644 index 0000000000..07d5e17aae Binary files /dev/null and b/models/ctf/flag_red_norm.tga differ diff --git a/models/ctf/flags.md3 b/models/ctf/flags.md3 index 5d91c7ad65..86d232c6c4 100644 Binary files a/models/ctf/flags.md3 and b/models/ctf/flags.md3 differ diff --git a/models/ctf/flags.md3.framegroups b/models/ctf/flags.md3.framegroups new file mode 100644 index 0000000000..05a49915f1 --- /dev/null +++ b/models/ctf/flags.md3.framegroups @@ -0,0 +1 @@ +0 50 5 1 \ No newline at end of file diff --git a/models/ctf/flags.md3_0.skin b/models/ctf/flags.md3_0.skin index 05a4fe72fc..489df22f41 100644 --- a/models/ctf/flags.md3_0.skin +++ b/models/ctf/flags.md3_0.skin @@ -1,3 +1,3 @@ -flag,flags/flag_red -flag_cloth,flags/flag_red_cloth -flag_laser,flags/flag_red_laser +mesh,models/ctf/flag_red.tga +mesh2,models/ctf/banner_red.tga +mesh3,models/ctf/glow_red.tga \ No newline at end of file diff --git a/models/ctf/flags.md3_1.skin b/models/ctf/flags.md3_1.skin index 02f217f36a..47c5aeb71f 100644 --- a/models/ctf/flags.md3_1.skin +++ b/models/ctf/flags.md3_1.skin @@ -1,3 +1,3 @@ -flag,flags/flag_blue -flag_cloth,flags/flag_blue_cloth -flag_laser,flags/flag_blue_laser +mesh,models/ctf/flag_blue.tga +mesh2,models/ctf/banner_blue.tga +mesh3,models/ctf/glow_blue.tga \ No newline at end of file diff --git a/models/ctf/glow_blue.tga b/models/ctf/glow_blue.tga new file mode 100644 index 0000000000..6968dc28a3 Binary files /dev/null and b/models/ctf/glow_blue.tga differ diff --git a/models/ctf/glow_blue_glow.tga b/models/ctf/glow_blue_glow.tga new file mode 100644 index 0000000000..6968dc28a3 Binary files /dev/null and b/models/ctf/glow_blue_glow.tga differ diff --git a/models/ctf/glow_red.tga b/models/ctf/glow_red.tga new file mode 100644 index 0000000000..9702b0b1ce Binary files /dev/null and b/models/ctf/glow_red.tga differ diff --git a/models/ctf/glow_red_glow.tga b/models/ctf/glow_red_glow.tga new file mode 100644 index 0000000000..9702b0b1ce Binary files /dev/null and b/models/ctf/glow_red_glow.tga differ diff --git a/models/elaser.mdl b/models/elaser.mdl index 02fd59d3a7..ce62d46b5d 100644 Binary files a/models/elaser.mdl and b/models/elaser.mdl differ diff --git a/models/hlac_bullet.md3 b/models/hlac_bullet.md3 index 8ae609a06b..a1be45958e 100644 Binary files a/models/hlac_bullet.md3 and b/models/hlac_bullet.md3 differ diff --git a/models/laser.mdl b/models/laser.mdl index c3a5d99e06..8809d16455 100644 Binary files a/models/laser.mdl and b/models/laser.mdl differ diff --git a/models/plasmatrail.mdl b/models/plasmatrail.mdl index 59dcdb9cdc..5669bc4cc5 100644 Binary files a/models/plasmatrail.mdl and b/models/plasmatrail.mdl differ diff --git a/models/weapons/g_minelayer.md3 b/models/weapons/g_minelayer.md3 index 5fce1ef258..60caa4125a 100644 Binary files a/models/weapons/g_minelayer.md3 and b/models/weapons/g_minelayer.md3 differ diff --git a/models/weapons/v_minelayer.md3 b/models/weapons/v_minelayer.md3 index 4c7d4498f6..648b0f1a74 100644 Binary files a/models/weapons/v_minelayer.md3 and b/models/weapons/v_minelayer.md3 differ diff --git a/physicsLeeStricklin-ModdedFruit.cfg b/physicsLeeStricklin-ModdedFruit.cfg index 18973158eb..805df99b88 100644 --- a/physicsLeeStricklin-ModdedFruit.cfg +++ b/physicsLeeStricklin-ModdedFruit.cfg @@ -1,10 +1,10 @@ // "NoQWBunny" physics based on XPM sv_gravity 800 -sv_maxspeed 360 +sv_maxspeed 424 sv_maxairspeed 400 sv_stopspeed 100 -sv_accelerate 15 +sv_accelerate 13 sv_airaccelerate 2 sv_friction 8 edgefriction 1 @@ -18,23 +18,23 @@ sv_stepheight 26 sv_jumpvelocity 260 sv_wateraccelerate -1 sv_waterfriction -1 -sv_airaccel_sideways_friction 0 +sv_airaccel_sideways_friction 0 // breaks strafing? sv_airaccel_qw -0.8 -sv_airstopaccelerate 3 +sv_airstopaccelerate -0.95 sv_airstrafeaccelerate 24 sv_maxairstrafespeed 100 -sv_airstrafeaccel_qw -0.95 +sv_airstrafeaccel_qw -0.97 sv_aircontrol 125 sv_aircontrol_penalty 150 -sv_aircontrol_power 2 +sv_aircontrol_power 2.5 sv_airspeedlimit_nonqw 800 sv_warsowbunny_turnaccel 0 sv_warsowbunny_accel 0.1593 sv_warsowbunny_topspeed 925 sv_warsowbunny_backtosideratio 0.8 sv_friction_on_land 0 -sv_doublejump 0 -sv_jumpspeedcap_min "" +sv_doublejump 0 // TINY (1.35x normal) doublejumps only, can be disabled if wanted... +sv_jumpspeedcap_min 0 // need predicting? (it should already be in CSQC prediction code) sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 diff --git a/scripts/ctf.shader b/scripts/ctf.shader new file mode 100644 index 0000000000..2eceff38dd --- /dev/null +++ b/scripts/ctf.shader @@ -0,0 +1,18 @@ +models/ctf/glow_red +{ + { + map models/ctf/glow_red.tga + tcMod scale 0.03 0.03 + tcMod scroll 0.1 -0.04 + tcMod rotate 0.1 + } +} +models/ctf/glow_blue +{ + { + map models/ctf/glow_blue.tga + tcMod scale 0.03 0.03 + tcMod scroll 0.1 -0.04 + tcMod rotate 0.1 + } +} \ No newline at end of file diff --git a/scripts/projectiles.shader b/scripts/projectiles.shader new file mode 100644 index 0000000000..28b1e94920 --- /dev/null +++ b/scripts/projectiles.shader @@ -0,0 +1,90 @@ +crylink_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/crylink_projectile_core.tga + blendfunc add + rgbGen lightingDiffuse + } +} +crylink_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/crylink_projectile_long.tga + blendfunc add + rgbGen lightingDiffuse + } +} +hlac_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/hlac_projectile_core.tga + blendfunc add + rgbGen lightingDiffuse + } +} +hlac_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/hlac_projectile_long.tga + blendfunc add + rgbGen lightingDiffuse + } +} +electro_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/electro_projectile_core.tga + blendfunc add + tcmod page 4 1 0.1 + rgbGen lightingDiffuse + } +} +electro_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/electro_projectile_long.tga + blendfunc add + tcmod page 4 1 0.1 + rgbGen lightingDiffuse + } +} +laser_projectile_core +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite + { + map textures/projectiles/laser_projectile_core.tga + blendfunc add + rgbGen lightingDiffuse + } +} +laser_projectile_long +{ + surfaceparm nonsolid + surfaceparm nolightmap + deformVertexes autosprite2 + { + map textures/projectiles/laser_projectile_long.tga + blendfunc add + rgbGen lightingDiffuse + } +} \ No newline at end of file diff --git a/scripts/weapons.shader b/scripts/weapons.shader index 2ed0c9ad66..c093eb3334 100644 --- a/scripts/weapons.shader +++ b/scripts/weapons.shader @@ -102,3 +102,11 @@ seeker rgbgen lightingDiffuse } } +minelayer +{ + dpreflectcube cubemaps/default/sky + { + map textures/minelayer.tga + rgbgen lightingDiffuse + } +} diff --git a/textures/flags/flag_blue.tga b/textures/flags/flag_blue.tga deleted file mode 100644 index e84fca549d..0000000000 Binary files a/textures/flags/flag_blue.tga and /dev/null differ diff --git a/textures/flags/flag_blue_cloth.tga b/textures/flags/flag_blue_cloth.tga deleted file mode 100644 index a8ea97f5ff..0000000000 Binary files a/textures/flags/flag_blue_cloth.tga and /dev/null differ diff --git a/textures/flags/flag_blue_gloss.tga b/textures/flags/flag_blue_gloss.tga deleted file mode 100644 index 77176c068c..0000000000 Binary files a/textures/flags/flag_blue_gloss.tga and /dev/null differ diff --git a/textures/flags/flag_blue_glow.tga b/textures/flags/flag_blue_glow.tga deleted file mode 100644 index 88d58c0daf..0000000000 Binary files a/textures/flags/flag_blue_glow.tga and /dev/null differ diff --git a/textures/flags/flag_blue_laser.tga b/textures/flags/flag_blue_laser.tga deleted file mode 100644 index 6901f4f35a..0000000000 Binary files a/textures/flags/flag_blue_laser.tga and /dev/null differ diff --git a/textures/flags/flag_blue_norm.tga b/textures/flags/flag_blue_norm.tga deleted file mode 100644 index fc260222e1..0000000000 Binary files a/textures/flags/flag_blue_norm.tga and /dev/null differ diff --git a/textures/flags/flag_red.tga b/textures/flags/flag_red.tga deleted file mode 100644 index d659d8c9e9..0000000000 Binary files a/textures/flags/flag_red.tga and /dev/null differ diff --git a/textures/flags/flag_red_cloth.tga b/textures/flags/flag_red_cloth.tga deleted file mode 100644 index ae451c97b3..0000000000 Binary files a/textures/flags/flag_red_cloth.tga and /dev/null differ diff --git a/textures/flags/flag_red_gloss.tga b/textures/flags/flag_red_gloss.tga deleted file mode 100644 index a499830ce7..0000000000 Binary files a/textures/flags/flag_red_gloss.tga and /dev/null differ diff --git a/textures/flags/flag_red_glow.tga b/textures/flags/flag_red_glow.tga deleted file mode 100644 index deae22e2f1..0000000000 Binary files a/textures/flags/flag_red_glow.tga and /dev/null differ diff --git a/textures/flags/flag_red_laser.tga b/textures/flags/flag_red_laser.tga deleted file mode 100644 index f4d4de5580..0000000000 Binary files a/textures/flags/flag_red_laser.tga and /dev/null differ diff --git a/textures/flags/flag_red_norm.tga b/textures/flags/flag_red_norm.tga deleted file mode 100644 index 97480bb649..0000000000 Binary files a/textures/flags/flag_red_norm.tga and /dev/null differ diff --git a/textures/minelayer.tga b/textures/minelayer.tga new file mode 100644 index 0000000000..e0fa48c143 Binary files /dev/null and b/textures/minelayer.tga differ diff --git a/textures/minelayer_gloss.tga b/textures/minelayer_gloss.tga new file mode 100644 index 0000000000..2ca8b9a457 Binary files /dev/null and b/textures/minelayer_gloss.tga differ diff --git a/textures/minelayer_glow.tga b/textures/minelayer_glow.tga new file mode 100644 index 0000000000..163735f7fa Binary files /dev/null and b/textures/minelayer_glow.tga differ diff --git a/textures/projectiles/crylink_projectile_core.tga b/textures/projectiles/crylink_projectile_core.tga new file mode 100644 index 0000000000..a9f686b435 Binary files /dev/null and b/textures/projectiles/crylink_projectile_core.tga differ diff --git a/textures/projectiles/crylink_projectile_core_glow.tga b/textures/projectiles/crylink_projectile_core_glow.tga new file mode 100644 index 0000000000..b53993b2cd Binary files /dev/null and b/textures/projectiles/crylink_projectile_core_glow.tga differ diff --git a/textures/projectiles/crylink_projectile_long.tga b/textures/projectiles/crylink_projectile_long.tga new file mode 100644 index 0000000000..6f78dd03b8 Binary files /dev/null and b/textures/projectiles/crylink_projectile_long.tga differ diff --git a/textures/projectiles/crylink_projectile_long_glow.tga b/textures/projectiles/crylink_projectile_long_glow.tga new file mode 100644 index 0000000000..6f78dd03b8 Binary files /dev/null and b/textures/projectiles/crylink_projectile_long_glow.tga differ diff --git a/textures/projectiles/electro_projectile_core.tga b/textures/projectiles/electro_projectile_core.tga new file mode 100644 index 0000000000..b9a19304b0 Binary files /dev/null and b/textures/projectiles/electro_projectile_core.tga differ diff --git a/textures/projectiles/electro_projectile_core_glow.tga b/textures/projectiles/electro_projectile_core_glow.tga new file mode 100644 index 0000000000..b9a19304b0 Binary files /dev/null and b/textures/projectiles/electro_projectile_core_glow.tga differ diff --git a/textures/projectiles/electro_projectile_long.tga b/textures/projectiles/electro_projectile_long.tga new file mode 100644 index 0000000000..4672763148 Binary files /dev/null and b/textures/projectiles/electro_projectile_long.tga differ diff --git a/textures/projectiles/electro_projectile_long_glow.tga b/textures/projectiles/electro_projectile_long_glow.tga new file mode 100644 index 0000000000..4672763148 Binary files /dev/null and b/textures/projectiles/electro_projectile_long_glow.tga differ diff --git a/textures/projectiles/hlac_projectile_core.tga b/textures/projectiles/hlac_projectile_core.tga new file mode 100644 index 0000000000..f5a49e1b0b Binary files /dev/null and b/textures/projectiles/hlac_projectile_core.tga differ diff --git a/textures/projectiles/hlac_projectile_core_glow.tga b/textures/projectiles/hlac_projectile_core_glow.tga new file mode 100644 index 0000000000..f5a49e1b0b Binary files /dev/null and b/textures/projectiles/hlac_projectile_core_glow.tga differ diff --git a/textures/projectiles/hlac_projectile_long.tga b/textures/projectiles/hlac_projectile_long.tga new file mode 100644 index 0000000000..a7e68da2dc Binary files /dev/null and b/textures/projectiles/hlac_projectile_long.tga differ diff --git a/textures/projectiles/hlac_projectile_long_glow.tga b/textures/projectiles/hlac_projectile_long_glow.tga new file mode 100644 index 0000000000..a7e68da2dc Binary files /dev/null and b/textures/projectiles/hlac_projectile_long_glow.tga differ diff --git a/textures/projectiles/laser_projectile_core.tga b/textures/projectiles/laser_projectile_core.tga new file mode 100644 index 0000000000..1fdec98be6 Binary files /dev/null and b/textures/projectiles/laser_projectile_core.tga differ diff --git a/textures/projectiles/laser_projectile_core_glow.tga b/textures/projectiles/laser_projectile_core_glow.tga new file mode 100644 index 0000000000..1fdec98be6 Binary files /dev/null and b/textures/projectiles/laser_projectile_core_glow.tga differ diff --git a/textures/projectiles/laser_projectile_long.tga b/textures/projectiles/laser_projectile_long.tga new file mode 100644 index 0000000000..361342df9c Binary files /dev/null and b/textures/projectiles/laser_projectile_long.tga differ diff --git a/textures/projectiles/laser_projectile_long_glow.tga b/textures/projectiles/laser_projectile_long_glow.tga new file mode 100644 index 0000000000..361342df9c Binary files /dev/null and b/textures/projectiles/laser_projectile_long_glow.tga differ