xonotic/xonotic-data.pk3dir.git
9 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 1 Dec 2010 08:03:27 +0000 (09:03 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agofix a possible bug with player stats when they are NOT enabled
Rudolf Polzer [Wed, 1 Dec 2010 08:02:53 +0000 (09:02 +0100)]
fix a possible bug with player stats when they are NOT enabled

9 years agoMerge remote branch 'origin/fruitiex/arenafix'
Rudolf Polzer [Tue, 30 Nov 2010 20:37:22 +0000 (21:37 +0100)]
Merge remote branch 'origin/fruitiex/arenafix'

9 years agotypo
FruitieX [Tue, 30 Nov 2010 16:38:42 +0000 (18:38 +0200)]
typo

9 years agofreezetag: DEATH_HURTTRIGGER is still supposed to be lethal in any case
FruitieX [Tue, 30 Nov 2010 16:28:14 +0000 (18:28 +0200)]
freezetag: DEATH_HURTTRIGGER is still supposed to be lethal in any case

9 years agodo that in a bit of a cleaner manner (fixes CA which the previous change broke)
FruitieX [Tue, 30 Nov 2010 16:17:48 +0000 (18:17 +0200)]
do that in a bit of a cleaner manner (fixes CA which the previous change broke)

9 years agofix when to allow arena players to move again, also fix round countdown centerprints...
FruitieX [Tue, 30 Nov 2010 16:11:18 +0000 (18:11 +0200)]
fix when to allow arena players to move again, also fix round countdown centerprints so they are printed to every player (ps. all of this arena code is a HUGE MESS and needs fixing, but I don't want to touch it too much before the beta)

9 years agoMerge remote branch 'refs/remotes/origin/fruitiex/balance'
Rudolf Polzer [Tue, 30 Nov 2010 15:19:49 +0000 (16:19 +0100)]
Merge remote branch 'refs/remotes/origin/fruitiex/balance'

9 years agoMerge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
Rudolf Polzer [Tue, 30 Nov 2010 15:07:31 +0000 (16:07 +0100)]
Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway'

9 years agoUse PlayerDamage_Calculate in freezetag code
FruitieX [Tue, 30 Nov 2010 14:55:29 +0000 (16:55 +0200)]
Use PlayerDamage_Calculate in freezetag code

9 years agoMerge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway
FruitieX [Tue, 30 Nov 2010 14:51:41 +0000 (16:51 +0200)]
Merge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway

Conflicts:
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/util.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/server/defs.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc

9 years agoMerge branch 'master' into samual/keepaway
FruitieX [Tue, 30 Nov 2010 14:43:29 +0000 (16:43 +0200)]
Merge branch 'master' into samual/keepaway

9 years agoactually draw the freezetag text too :P
FruitieX [Tue, 30 Nov 2010 14:36:18 +0000 (16:36 +0200)]
actually draw the freezetag text too :P

9 years agomove freezetag specific damage/force code into a PlayerDamage hook, fix the mapinfo...
FruitieX [Tue, 30 Nov 2010 14:33:53 +0000 (16:33 +0200)]
move freezetag specific damage/force code into a PlayerDamage hook, fix the mapinfo display in the menu

9 years agoremove unused flag textures
Rudolf Polzer [Tue, 30 Nov 2010 14:20:42 +0000 (15:20 +0100)]
remove unused flag textures

9 years agomine layer: fix shader path :(
Rudolf Polzer [Tue, 30 Nov 2010 14:17:46 +0000 (15:17 +0100)]
mine layer: fix shader path :(

9 years agoMerge remote branch 'origin/morphed/flag'
Rudolf Polzer [Tue, 30 Nov 2010 14:14:17 +0000 (15:14 +0100)]
Merge remote branch 'origin/morphed/flag'

9 years agoMerge remote branch 'origin/morphed/minelayer'
Rudolf Polzer [Tue, 30 Nov 2010 14:14:02 +0000 (15:14 +0100)]
Merge remote branch 'origin/morphed/minelayer'

9 years agoMerge remote branch 'origin/tzork/projetiles'
Rudolf Polzer [Tue, 30 Nov 2010 14:13:55 +0000 (15:13 +0100)]
Merge remote branch 'origin/tzork/projetiles'

9 years agoMerge remote branch 'origin/master' into fruitiex/gamemode_freezetag
FruitieX [Tue, 30 Nov 2010 13:56:46 +0000 (15:56 +0200)]
Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag

9 years agoadd back the comments
Rudolf Polzer [Tue, 30 Nov 2010 12:23:35 +0000 (13:23 +0100)]
add back the comments

9 years agoactually apply the physics cfg changes
Rudolf Polzer [Tue, 30 Nov 2010 12:21:33 +0000 (13:21 +0100)]
actually apply the physics cfg changes

9 years agoremove // TODO comments, they aren't TODO anymore
FruitieX [Tue, 30 Nov 2010 11:59:35 +0000 (13:59 +0200)]
remove // TODO comments, they aren't TODO anymore

9 years agooops, didn't want to merge this... reverting
Rudolf Polzer [Tue, 30 Nov 2010 11:16:10 +0000 (12:16 +0100)]
oops, didn't want to merge this... reverting

9 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Tue, 30 Nov 2010 11:15:34 +0000 (12:15 +0100)]
Merge remote branch 'origin/fruitiex/balance'

9 years agonew configs by LeeStricklin
Rudolf Polzer [Tue, 30 Nov 2010 11:13:18 +0000 (12:13 +0100)]
new configs by LeeStricklin

9 years agoMerge remote branch 'origin/fruitiex/cuinnton_credits'
Rudolf Polzer [Mon, 29 Nov 2010 21:33:37 +0000 (22:33 +0100)]
Merge remote branch 'origin/fruitiex/cuinnton_credits'

9 years agoMerge remote branch 'origin/fruitiex/panelhud'
Rudolf Polzer [Mon, 29 Nov 2010 21:33:12 +0000 (22:33 +0100)]
Merge remote branch 'origin/fruitiex/panelhud'

9 years agominelayer model with placeholder texture
Morphed [Mon, 29 Nov 2010 20:32:48 +0000 (21:32 +0100)]
minelayer model with placeholder texture

9 years agoshow the dot color correctly in the menu preview as well
FruitieX [Mon, 29 Nov 2010 18:57:22 +0000 (20:57 +0200)]
show the dot color correctly in the menu preview as well

9 years agomake an awesome crosshair default ;)
FruitieX [Mon, 29 Nov 2010 18:51:29 +0000 (20:51 +0200)]
make an awesome crosshair default ;)

9 years agoMerge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud
FruitieX [Mon, 29 Nov 2010 18:46:28 +0000 (20:46 +0200)]
Merge branch 'fruitiex/custom_xhair_dot_color' into fruitiex/panelhud

9 years agoluminos_xhair hud config, plus bunch of code changes to make it possible
FruitieX [Mon, 29 Nov 2010 18:45:37 +0000 (20:45 +0200)]
luminos_xhair hud config, plus bunch of code changes to make it possible

9 years agoallow hiding text in these cases too
FruitieX [Mon, 29 Nov 2010 17:28:49 +0000 (19:28 +0200)]
allow hiding text in these cases too

9 years agofix typo, allow disabling the border code and just drawing the border image by means...
FruitieX [Mon, 29 Nov 2010 17:17:52 +0000 (19:17 +0200)]
fix typo, allow disabling the border code and just drawing the border image by means of simple stretching (by setting the border size negative)

9 years agoallow changing the progressbar per-panel-item
FruitieX [Mon, 29 Nov 2010 16:46:18 +0000 (18:46 +0200)]
allow changing the progressbar per-panel-item

9 years agoinstead of stretching the status bar image, drawsetclip it. Big cleanup in status...
FruitieX [Mon, 29 Nov 2010 16:24:15 +0000 (18:24 +0200)]
instead of stretching the status bar image, drawsetclip it. Big cleanup in status bar related code

9 years agocustom max values for the health/armor status bars
FruitieX [Mon, 29 Nov 2010 10:10:11 +0000 (12:10 +0200)]
custom max values for the health/armor status bars

9 years agoMerge remote branch 'origin/savagex/assault-centerprint'
Rudolf Polzer [Mon, 29 Nov 2010 09:52:33 +0000 (10:52 +0100)]
Merge remote branch 'origin/savagex/assault-centerprint'

9 years agohud_luminos_minimal.cfg
FruitieX [Mon, 29 Nov 2010 09:47:51 +0000 (11:47 +0200)]
hud_luminos_minimal.cfg

9 years agoMerge remote branch 'origin/tzork/moveturrets-fix'
Rudolf Polzer [Mon, 29 Nov 2010 09:38:44 +0000 (10:38 +0100)]
Merge remote branch 'origin/tzork/moveturrets-fix'

9 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

9 years agoLots and lots of updates, mainly involving spectators (waypoints are now not shown...
unknown [Mon, 29 Nov 2010 08:01:35 +0000 (03:01 -0500)]
Lots and lots of updates, mainly involving spectators (waypoints are now not shown to someone who is spectating the ballcarrier), the HUD (fixed an issue where scoreboard would re-play the ball pickup animation), ball size (It was too large and would get stuck in walls) and powerups (especially powerup effects, don't show a waypoint for ballcarrier who has invisibility) --- Still much more to be done, but this is a huge step forward

9 years agoinitial player stats system (reports total "alive time" and kills to a stats server...
Rudolf Polzer [Sun, 28 Nov 2010 17:39:40 +0000 (18:39 +0100)]
initial player stats system (reports total "alive time" and kills to a stats server via HTTP)

9 years agocenterprint self.message for done objectives to keep players informed
Maik Merten [Sun, 28 Nov 2010 14:12:06 +0000 (15:12 +0100)]
centerprint self.message for done objectives to keep players informed

9 years agouse the right update notification again
Rudolf Polzer [Sun, 28 Nov 2010 14:05:29 +0000 (15:05 +0100)]
use the right update notification again

9 years agoMorphed's nice new projecile models.
tzork [Sun, 28 Nov 2010 13:49:03 +0000 (14:49 +0100)]
Morphed's nice new projecile models.

9 years agoadd Cuinnton to the active contributors
FruitieX [Sun, 28 Nov 2010 13:20:27 +0000 (15:20 +0200)]
add Cuinnton to the active contributors

9 years agoFix issue 192
tzork [Sun, 28 Nov 2010 08:24:03 +0000 (09:24 +0100)]
Fix issue 192

9 years agomore speed on the uzi, why does it even have a speed :X, annoying
FruitieX [Sat, 27 Nov 2010 20:08:04 +0000 (22:08 +0200)]
more speed on the uzi, why does it even have a speed :X, annoying

9 years agoallow a custom color on the crosshair dot
FruitieX [Sat, 27 Nov 2010 20:07:35 +0000 (22:07 +0200)]
allow a custom color on the crosshair dot

9 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Sat, 27 Nov 2010 13:16:02 +0000 (08:16 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

9 years agoACTUALLY commit the orbs now that I fixed their origin issue (Also: Commit the fix...
unknown [Sat, 27 Nov 2010 13:09:52 +0000 (08:09 -0500)]
ACTUALLY commit the orbs now that I fixed their origin issue (Also: Commit the fix for the origin issue :P)

9 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Sat, 27 Nov 2010 12:38:57 +0000 (13:38 +0100)]
Merge remote branch 'origin/fruitiex/balance'

9 years agoAdd animations to the HUD (keepaway mod panel)
unknown [Sat, 27 Nov 2010 11:22:56 +0000 (06:22 -0500)]
Add animations to the HUD (keepaway mod panel)

9 years agoNew images for keepaway for send_killnotification and HUD.
unknown [Sat, 27 Nov 2010 08:09:39 +0000 (03:09 -0500)]
New images for keepaway for send_killnotification and HUD.

9 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Sat, 27 Nov 2010 01:36:53 +0000 (20:36 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

9 years agolower the charge rates of the nex just a bit (base charge rate now perfectly matches...
FruitieX [Sat, 27 Nov 2010 00:55:38 +0000 (02:55 +0200)]
lower the charge rates of the nex just a bit (base charge rate now perfectly matches the refire time, base charge + secondary charge + continuous shooting gets you ~75% charge instead of 100%)

9 years agohalve crylink primary spread, you can make it huge anyway by just clicking fast
FruitieX [Sat, 27 Nov 2010 00:45:31 +0000 (02:45 +0200)]
halve crylink primary spread, you can make it huge anyway by just clicking fast

9 years agook not quite that much
FruitieX [Sat, 27 Nov 2010 00:40:19 +0000 (02:40 +0200)]
ok not quite that much

9 years agomuch less damage when in lava, actually have a chance of getting out of there :o
FruitieX [Sat, 27 Nov 2010 00:35:53 +0000 (02:35 +0200)]
much less damage when in lava, actually have a chance of getting out of there :o

9 years agomortar primary radius up a bit, damage up very little too
FruitieX [Sat, 27 Nov 2010 00:27:47 +0000 (02:27 +0200)]
mortar primary radius up a bit, damage up very little too

9 years agotake over health system from tZork's balance (25hp up to 100, 50hp up to 150, rest...
FruitieX [Fri, 26 Nov 2010 23:18:00 +0000 (01:18 +0200)]
take over health system from tZork's balance (25hp up to 100, 50hp up to 150, rest up to 250). Armor little more special: 25a up to 50, 50a up to 50, rest up to 150

9 years agocatch errors
Rudolf Polzer [Fri, 26 Nov 2010 19:49:36 +0000 (20:49 +0100)]
catch errors

9 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 26 Nov 2010 19:35:22 +0000 (20:35 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

9 years agoadd some test code for uri_post
Rudolf Polzer [Fri, 26 Nov 2010 19:35:00 +0000 (20:35 +0100)]
add some test code for uri_post

9 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

9 years agoMerge remote branch 'origin/fruitiex/add_soundchan'
Rudolf Polzer [Fri, 26 Nov 2010 08:56:31 +0000 (09:56 +0100)]
Merge remote branch 'origin/fruitiex/add_soundchan'

9 years agoMerge remote branch 'origin/fruitiex/balance'
Rudolf Polzer [Fri, 26 Nov 2010 08:47:25 +0000 (09:47 +0100)]
Merge remote branch 'origin/fruitiex/balance'

9 years agoMerge remote branch 'origin/fruitiex/noaccuracyspam'
Rudolf Polzer [Fri, 26 Nov 2010 08:44:26 +0000 (09:44 +0100)]
Merge remote branch 'origin/fruitiex/noaccuracyspam'

9 years agoMerge remote branch 'origin/fruitiex/effectinfo_nerf'
Rudolf Polzer [Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)]
Merge remote branch 'origin/fruitiex/effectinfo_nerf'

9 years agolower secondary mortar speed
FruitieX [Thu, 25 Nov 2010 23:29:18 +0000 (01:29 +0200)]
lower secondary mortar speed

9 years agotiny shotgun nerf now
FruitieX [Thu, 25 Nov 2010 22:58:41 +0000 (00:58 +0200)]
tiny shotgun nerf now

9 years agoelectro combo slightly stronger
FruitieX [Thu, 25 Nov 2010 22:52:33 +0000 (00:52 +0200)]
electro combo slightly stronger

9 years agoshotgun primary max dmg from 60 to 80 to balance it out a little more (it's currently...
FruitieX [Thu, 25 Nov 2010 22:46:34 +0000 (00:46 +0200)]
shotgun primary max dmg from 60 to 80 to balance it out a little more (it's currently second last on the damage stats)

9 years agodisable falloff on electro primary
FruitieX [Thu, 25 Nov 2010 22:44:56 +0000 (00:44 +0200)]
disable falloff on electro primary

9 years agoMerge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance
FruitieX [Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)]
Merge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance

9 years agocomment out a debug print
FruitieX [Thu, 25 Nov 2010 15:29:43 +0000 (17:29 +0200)]
comment out a debug print

9 years agonerf shotgun, uzi and hagar impact effects, they were a bit too insane with particle...
FruitieX [Thu, 25 Nov 2010 15:13:56 +0000 (17:13 +0200)]
nerf shotgun, uzi and hagar impact effects, they were a bit too insane with particle quality 1.0 (which is supposed to be the value we tweak these to!)

9 years agoadd an additional arg to the W_SetupShot* functions for adjusting the sound channel...
FruitieX [Thu, 25 Nov 2010 14:46:26 +0000 (16:46 +0200)]
add an additional arg to the W_SetupShot* functions for adjusting the sound channel. Use this on electro secondary and minstanex secondary laser

9 years agoonly centerprint to players :p
FruitieX [Thu, 25 Nov 2010 14:18:01 +0000 (16:18 +0200)]
only centerprint to players :p

9 years agoonly add a new ice block if there isn't an old one, this way other code doesn't worry...
FruitieX [Thu, 25 Nov 2010 14:10:14 +0000 (16:10 +0200)]
only add a new ice block if there isn't an old one, this way other code doesn't worry about this happening

9 years agoremove unused float
FruitieX [Thu, 25 Nov 2010 13:36:45 +0000 (15:36 +0200)]
remove unused float

9 years agomove electro secondary to CHAN_WEAPON2 so it doesn't interrupt the primary's lightnin...
Rudolf Polzer [Thu, 25 Nov 2010 13:22:00 +0000 (14:22 +0100)]
move electro secondary to CHAN_WEAPON2 so it doesn't interrupt the primary's lightning sound

9 years agofix handling of kill triggers in freezetag, also electro needs to check for self...
FruitieX [Thu, 25 Nov 2010 13:19:05 +0000 (15:19 +0200)]
fix handling of kill triggers in freezetag, also electro needs to check for self.owner.freezetag_frozen not self.freezetag_frozen

9 years agofix handling of the revival progress
FruitieX [Thu, 25 Nov 2010 13:05:11 +0000 (15:05 +0200)]
fix handling of the revival progress

9 years agosync dpextensions with darkplaces (uri_post stuff)
Rudolf Polzer [Thu, 25 Nov 2010 12:37:20 +0000 (13:37 +0100)]
sync dpextensions with darkplaces (uri_post stuff)

9 years agosome small freezetag bugfixes
FruitieX [Thu, 25 Nov 2010 12:29:06 +0000 (14:29 +0200)]
some small freezetag bugfixes

9 years agoAdapt keepaway to use Send_KillNotification; code is complete, just needs new images...
unknown [Thu, 25 Nov 2010 11:59:09 +0000 (06:59 -0500)]
Adapt keepaway to use Send_KillNotification; code is complete, just needs new images for it.

9 years agoCode cleanups + keepaway powerups, this one might be questionable and might require...
unknown [Thu, 25 Nov 2010 08:12:45 +0000 (03:12 -0500)]
Code cleanups + keepaway powerups, this one might be questionable and might require some review. Gonna do some testing on my server now to see if it's 100% stable and bug free

9 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Thu, 25 Nov 2010 07:18:22 +0000 (02:18 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

9 years agofix bad side effects of picking up ammo/health
Rudolf Polzer [Thu, 25 Nov 2010 06:19:36 +0000 (07:19 +0100)]
fix bad side effects of picking up ammo/health

9 years agoMerge remote branch 'origin/master' into samual/keepaway
unknown [Thu, 25 Nov 2010 01:39:19 +0000 (20:39 -0500)]
Merge remote branch 'origin/master' into samual/keepaway

9 years agoTEST THIS: Remove the thinkhack from ka_RespawnBall() and just execute the function...
unknown [Thu, 25 Nov 2010 01:34:41 +0000 (20:34 -0500)]
TEST THIS: Remove the thinkhack from ka_RespawnBall() and just execute the function again immediately if spawning failed

9 years agoremove electro beam if you get frozen
FruitieX [Wed, 24 Nov 2010 20:35:45 +0000 (22:35 +0200)]
remove electro beam if you get frozen

9 years agodo announcer messages for bullets only for the rifle
Rudolf Polzer [Wed, 24 Nov 2010 20:15:36 +0000 (21:15 +0100)]
do announcer messages for bullets only for the rifle

9 years agocrylink link maintenance: fix one odd case that may have caused corruption
Rudolf Polzer [Wed, 24 Nov 2010 19:56:58 +0000 (20:56 +0100)]
crylink link maintenance: fix one odd case that may have caused corruption

9 years agoMerge remote branch 'origin/master' into fruitiex/gamemode_freezetag
FruitieX [Wed, 24 Nov 2010 19:44:41 +0000 (21:44 +0200)]
Merge remote branch 'origin/master' into fruitiex/gamemode_freezetag

Conflicts:
defaultXonotic.cfg

9 years agobetter handle >100% accuracy
Rudolf Polzer [Wed, 24 Nov 2010 19:01:30 +0000 (20:01 +0100)]
better handle >100% accuracy

9 years agocrylink: properly calculate maxdmg
Rudolf Polzer [Wed, 24 Nov 2010 18:58:24 +0000 (19:58 +0100)]
crylink: properly calculate maxdmg