Merge remote branch 'refs/remotes/origin/fruitiex/newpanelhud_stable'

diff --git a/physicsNoQWBunny_easy.cfg b/physicsNoQWBunny_easy.cfg
new file mode 100644 (file)
index 0000000..ff8cd3b
--- /dev/null
+++ b/physicsNoQWBunny_easy.cfg
@@ -0,0 +1,31 @@
+// 2.0-2.4.2 physics minus QW-bunnyhopping-bug, faster onground accel, CPMA air control
+sv_gravity 800
+sv_maxspeed 400
+sv_maxairspeed 400
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 7
+edgefriction 1
+sv_stepheight 34
+sv_jumpvelocity 300
+sv_wateraccelerate -1
+sv_waterfriction -1
+sv_airaccel_sideways_friction -0.35
+sv_airaccel_qw -0.9475
+sv_airstopaccelerate 0
+sv_airstrafeaccelerate 0
+sv_maxairstrafespeed 0
+sv_airstrafeaccel_qw 0
+sv_aircontrol 125
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+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_jumpspeedcap_max ""
+sv_jumpspeedcap_max_disable_on_ramps 1

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 2fe7d512089e9e655b9d5a51491d03bb5ff53a73..494a80b369ec7954cde34aa8e2b82521cfc0acd3 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -111,6 +111,7 @@ void CopyBody(float keepvelocity)
        self.enemy = oldself;
        self.lip = oldself.lip;
        self.colormap = oldself.colormap;
+       self.glowmod = oldself.glowmod;
        self.iscreature = oldself.iscreature;
        self.angles = oldself.angles;
        self.avelocity = oldself.avelocity;

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index cdf28d72977e9a59810075d176a78b7154e6938b..8b03b399e5f142f0e05db85e4a62bce1e3cedefc 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -1,205 +1,133 @@
-(THIS FILE IS A HUGE TODO)
-(YES, REALLY, NOTHING HERE IS TRUE)
-(PLEASE FIX THIS FILE)
+**Core Team
 
+divVerent
+-z-
+merlijn
+morphed
+mand1nga
+tZork
 
-**Team Leaders:
 
+**Coordinators
 
+*Art
+Diabolik a.k.a Dib
 
-**Project maintainers:
-
-Kristian "morfar" Johansson
-
-Maik "SavageX" Merten
+*2D Art / Web
+-z- (web / game)
+FruitieX (game / web)
 
+*3D Art
+morphed
 
-**Development Team:
+*Level Design
+FruitieX
 
-Rudolf "div0" Polzer
-*Programmer
+*Music / Sound FX
+mand1nga
+merlijn
 
-Andreas "Black" Kirsch
-*Programmer
-
-Paul "Strahlemann" Evers
-*Level Designer
+*Engine Code Additions & QA
+divVerent
 
-Peter "Morphed" Pielak
-*Artist
+*Game Code
+divVerent
+FruitieX
+tZork
 
-Samual Lenks
-*Programmer
+*Marketing / PR
+-z-
+mand1nga
 
-Rasmus "FruitieX" Eskola
-*Artist and Programmer
+*Legal
+divVerent
+merlijn
 
-Saulo "mand1nga" Gil
-*Programmer
+**Game Engine
+DarkPlaces
+by Forest "LordHavoc" Hale
 
+**Active Contributors
+Maik "SavageX" Merten
+MrBougo
+Kristian "morfar" Johansson
 Stephan "esteel" Stahl
-*Programmer
-
-Jakob "tZork" Markstrom Grohn
-*Programmer and Artist
-
-Tyler "-z-" Mulligan
-*Web Developer and Interaction Designer
-
 Wolfgang "Blub\0" Bumiller
-*Programmer
-
-Merlijn Hofstra
-*Programmer and server admin
-
-
-
-**Past Team Members
-*In alphabetical order
-*(nickname or surname)
-
-Kurt Dereli
-*Artist
-
-Yves "EviLair" Allaire
-*Artist
-
-Fabien "H. Reaper" Tschirhart
-*Level Designer
-
-"Innovati"
-*Artist
-
-KadaverJack
-*Programmer
-
-William Libert
-* Level Designer
-
-MauveBib
-*Bot Programmer
-
-Rick "Rat" Kelley
-*Lead Animator, Skinner
-
-Michael "Tenshihan" Quinn
-*Sound FX and Player-Voices
-
-Gottfried "Toddd" Hofmann
-*Sound FX
-
-Marko "Urre" Permanto
-*Bot Programmer
-
-Dan "Wazat" Hale
-*Programmer
-
-Garth "Zombie" Hendy
-*Level Designer
-
-
-
-**Special Thanks:
-*In alphabetical order
-*(nickname or surname)
-
-Robert "ai" Kuroto
-*Various models
-
-Chris "amethyst7" Matz
-*Level design
-
-blkrbt
-*Music
-
-Gerd "Elysis" Raudenbusch
-*Music
-
-Marius "GreEn`mArine" Shekow
-*Programmer
-
-Forest "LordHavoc" Hale
-*DarkPlaces Engine Programmer
-
-Braden "meoblast001" Walters
-*Music
 
+**Past Contributors
 Alexander "motorsep" Zubov
-*Weapon animation
-
-Eric "Munyul Verminard" Sambach
-*Level design
-
-Severin "sev" Meyer
-*Artist
-
-Simon O'Callaghan
-*egyptsoc texture set
-
-Michael "Tenshihan" Quinn
-*Sound effects
-
 Amos "torus" Dudley
-*Announcer voices
-
-Mattrew "Tronyn" Rye
-*Level design
-
-Henning "Tymo" Janssen
-*Level design
-
-Kevin "Tyrann" Shanahan
-*Level design
-
-William "Willis" Weilep
-*Master server host
-
-
-**Thanks:
-
+Andreas "Black" Kirsch
 Attila "WW3" Houtkooper
 BigMac
+blkrbt
+Braden "meoblast001" Walters
 Brain Younds
+Chris "amethyst7" Matz
 Christian Ice
 Clinton "Kaziganthe" Freeman
 Dan "Digger" Korostelev
+Dan "Wazat" Hale
 Donkey
+dstrek
 Dustin Geeraert
 Edgenetwork
 Edward "Ed" Holness
+Eric "Munyul Verminard" Sambach
+Fabien "H. Reaper" Tschirhart
 FrikaC
+Garth "Zombie" Hendy
+Gerd "Elysis" Raudenbusch
+Gottfried "Toddd" Hofmann
+Henning "Tymo" Janssen
+"Innovati"
 Jitspoe
 Jody Gallagher
 Juergen "LowDragon" Timm
+KadaverJack
+Kevin "Tyrann" Shanahan
+Kurt Dereli
+lcatlnx
 Lee David Ash
 Lee Vermeulen
+leileilol
+Marius "GreEn`mArine" Shekow
+Marko "Urre" Permanto
 Mathieu "Elric" Olivier
+Mattrew "Tronyn" Rye
+MauveBib
 Mephisto
+michaelb
+Michael "Tenshihan" Quinn
 MirceaKitsune
-MrBougo
 Munyul
 Netzwerg
 NoelCower
 Parapraxis
+Paul "Strahlemann" Evers
 Petithomme
 Q1 Retexturing Project
 Qantourisc
+Rick "Rat" Kelley
+Robert "ai" Kuroto
 Ronan
 Sajt
+Samual Lenks
+Severin "sev" Meyer
 Shaggy
 Shank
+Simon O'Callaghan
 SomeGuy
 Spike
 Spirit
 Steve Vermeulen
 Supajoe
 Tei
+terencehill
 Tomaz
 Ulrich Galbraith
 Vortex
+William Libert
+William "Willis" Weilep
+Yves "EviLair" Allaire
 Zenex
-dstrek
-lcatlnx
-leileilol
-michaelb
-terencehill