xonotic/xonotic-data.pk3dir.git
10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/ca_nodmg_after_round'
Rudolf Polzer [Sun, 24 Oct 2010 12:14:49 +0000 (14:14 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/ca_nodmg_after_round'

10 years agoremove the old muzzleflash field that is no longer in use
Rudolf Polzer [Sat, 23 Oct 2010 19:32:12 +0000 (21:32 +0200)]
remove the old muzzleflash field that is no longer in use

10 years agoFix uzi flash entity leakage
Jakob MG [Sat, 23 Oct 2010 19:30:24 +0000 (21:30 +0200)]
Fix uzi flash entity leakage

10 years agomove the redalive/bluealive checks further up to avoid a return if block
FruitieX [Sat, 23 Oct 2010 18:35:19 +0000 (21:35 +0300)]
move the redalive/bluealive checks further up to avoid a return if block

10 years agoomg. this is probably the ugliest hack i've ever written. YUCK YUCK! BUT IT WORKS! D:
FruitieX [Sat, 23 Oct 2010 18:27:21 +0000 (21:27 +0300)]
omg. this is probably the ugliest hack i've ever written. YUCK YUCK! BUT IT WORKS! D:

10 years agooops forgot the hud icons
FruitieX [Sat, 23 Oct 2010 18:16:02 +0000 (21:16 +0300)]
oops forgot the hud icons

10 years agorifle: more accuracy
Rudolf Polzer [Sat, 23 Oct 2010 17:57:37 +0000 (19:57 +0200)]
rifle: more accuracy

10 years agofixes
FruitieX [Sat, 23 Oct 2010 17:27:33 +0000 (20:27 +0300)]
fixes

10 years agoactually add the new crosshair ring image
Rudolf Polzer [Sat, 23 Oct 2010 17:09:05 +0000 (19:09 +0200)]
actually add the new crosshair ring image

10 years agoremove muzzleflash when player leaves
Rudolf Polzer [Sat, 23 Oct 2010 17:08:56 +0000 (19:08 +0200)]
remove muzzleflash when player leaves

10 years agoless obtrusive ring display
Rudolf Polzer [Sat, 23 Oct 2010 17:06:40 +0000 (19:06 +0200)]
less obtrusive ring display

10 years agoCA modicon panel
FruitieX [Sat, 23 Oct 2010 16:53:59 +0000 (19:53 +0300)]
CA modicon panel

10 years agouse the right spawnflag
Rudolf Polzer [Sat, 23 Oct 2010 16:40:56 +0000 (18:40 +0200)]
use the right spawnflag

10 years agotrigger_hurt, misc_laser: support "team" like trigger_push
Rudolf Polzer [Sat, 23 Oct 2010 16:36:46 +0000 (18:36 +0200)]
trigger_hurt, misc_laser: support "team" like trigger_push

10 years agoremove some of this tied stuff... it won't make any difference anyway (score is set...
FruitieX [Sat, 23 Oct 2010 15:55:21 +0000 (18:55 +0300)]
remove some of this tied stuff... it won't make any difference anyway (score is set immediately as enemy dies, win sound is played etc. What would you do if the round then after that got tied?)

10 years agoadd a time limit of 3 minutes to a CA round, show instant feedback when the opposing...
FruitieX [Sat, 23 Oct 2010 15:43:14 +0000 (18:43 +0300)]
add a time limit of 3 minutes to a CA round, show instant feedback when the opposing team was eliminated, allow a bigger time frame for two remaining players to kill each other and ending the match in a draw

10 years agoset allowed_to_spawn = TRUE as early as we can, this way bots already connected after...
FruitieX [Sat, 23 Oct 2010 15:11:10 +0000 (18:11 +0300)]
set allowed_to_spawn = TRUE as early as we can, this way bots already connected after mapchange seem to actually spawn

10 years agostore the champion name in a global string so that we can reset the champion entity...
FruitieX [Sat, 23 Oct 2010 15:00:31 +0000 (18:00 +0300)]
store the champion name in a global string so that we can reset the champion entity already at round countdown

10 years agofix a bug where a player for some reason couldn't spawn
FruitieX [Sat, 23 Oct 2010 14:50:49 +0000 (17:50 +0300)]
fix a bug where a player for some reason couldn't spawn

10 years agomake that * 0.01 score actually
FruitieX [Sat, 23 Oct 2010 14:42:20 +0000 (17:42 +0300)]
make that * 0.01 score actually

10 years agofix champion check
FruitieX [Sat, 23 Oct 2010 14:42:02 +0000 (17:42 +0300)]
fix champion check

10 years agono ready restart counter in ca, fix bot behaviour when warmup is enabled in ca, new...
FruitieX [Sat, 23 Oct 2010 14:24:30 +0000 (17:24 +0300)]
no ready restart counter in ca, fix bot behaviour when warmup is enabled in ca, new scoring system for ca (round win = 1 point for team, 10 damage dealt = 1 point for a player)

10 years agono damage after the round has ended in CA or arena
FruitieX [Sat, 23 Oct 2010 13:34:46 +0000 (16:34 +0300)]
no damage after the round has ended in CA or arena

10 years agoalso show rocket flying mutator as enabled if the rocket detonate delay is 0 currentl...
Rudolf Polzer [Sat, 23 Oct 2010 08:47:04 +0000 (10:47 +0200)]
also show rocket flying mutator as enabled if the rocket detonate delay is 0 currently and not 0 by default

10 years agofix warning
Rudolf Polzer [Sat, 23 Oct 2010 07:54:58 +0000 (09:54 +0200)]
fix warning

10 years agoadd Rocket Flying to menu
Rudolf Polzer [Sat, 23 Oct 2010 07:54:17 +0000 (09:54 +0200)]
add Rocket Flying to menu

10 years agoadd the "rocket flying" mutator, cvar g_rocket_flying
Rudolf Polzer [Sat, 23 Oct 2010 07:47:57 +0000 (09:47 +0200)]
add the "rocket flying" mutator, cvar g_rocket_flying

10 years agomutator system: add an EditProjectile hook
Rudolf Polzer [Sat, 23 Oct 2010 07:43:43 +0000 (09:43 +0200)]
mutator system: add an EditProjectile hook

10 years agoalso hide net_address and friends from cvar_changes
Rudolf Polzer [Sat, 23 Oct 2010 07:08:39 +0000 (09:08 +0200)]
also hide net_address and friends from cvar_changes

10 years agomerge some nice settings from my server
Rudolf Polzer [Sat, 23 Oct 2010 07:08:00 +0000 (09:08 +0200)]
merge some nice settings from my server

10 years agodefault vote majority factor to only 2/3, not "2/3 plus one". Let's see if that reall...
Rudolf Polzer [Sat, 23 Oct 2010 07:03:58 +0000 (09:03 +0200)]
default vote majority factor to only 2/3, not "2/3 plus one". Let's see if that really causes abuse.

10 years agomore font stuff
Rudolf Polzer [Fri, 22 Oct 2010 21:57:07 +0000 (23:57 +0200)]
more font stuff

10 years agofix cvar_changes
Rudolf Polzer [Fri, 22 Oct 2010 21:53:53 +0000 (23:53 +0200)]
fix cvar_changes

10 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Fri, 22 Oct 2010 21:04:48 +0000 (23:04 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

Conflicts:
balanceXonotic.cfg

10 years agoMOAR CELLS
Rudolf Polzer [Fri, 22 Oct 2010 21:04:10 +0000 (23:04 +0200)]
MOAR CELLS

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Fri, 22 Oct 2010 20:58:49 +0000 (22:58 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

10 years agog_pickup_cells_weapon 25
FruitieX [Fri, 22 Oct 2010 20:49:02 +0000 (23:49 +0300)]
g_pickup_cells_weapon 25

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
Rudolf Polzer [Fri, 22 Oct 2010 20:42:02 +0000 (22:42 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'

10 years agogive the nex a minimum damage of 40 (instead of 0), nerf secondary charge rate to...
FruitieX [Fri, 22 Oct 2010 20:38:38 +0000 (23:38 +0300)]
give the nex a minimum damage of 40 (instead of 0), nerf secondary charge rate to compensate (ammo usage halved too, though)

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/domfix'
Rudolf Polzer [Fri, 22 Oct 2010 15:46:45 +0000 (17:46 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/domfix'

10 years agoMerge remote branch 'origin/fruitiex/kay_crosshairs'
Rudolf Polzer [Fri, 22 Oct 2010 15:40:19 +0000 (17:40 +0200)]
Merge remote branch 'origin/fruitiex/kay_crosshairs'

10 years agonew crosshair images by kayPK
FruitieX [Fri, 22 Oct 2010 15:14:38 +0000 (18:14 +0300)]
new crosshair images by kayPK

10 years agoremove an unused var
Rudolf Polzer [Fri, 22 Oct 2010 14:08:57 +0000 (16:08 +0200)]
remove an unused var

10 years agoadd a // defaults: marker too
Rudolf Polzer [Fri, 22 Oct 2010 13:57:25 +0000 (15:57 +0200)]
add a // defaults: marker too

10 years agoadd a dummy skill value for cts
Rudolf Polzer [Fri, 22 Oct 2010 13:53:09 +0000 (15:53 +0200)]
add a dummy skill value for cts

10 years agoalso still add the leadlimit to the defalt comment
Rudolf Polzer [Fri, 22 Oct 2010 13:49:39 +0000 (15:49 +0200)]
also still add the leadlimit to the defalt comment

10 years agomapinfo: recode of game type specification, new keyword "gametype" replaces old ...
Rudolf Polzer [Fri, 22 Oct 2010 13:46:06 +0000 (15:46 +0200)]
mapinfo: recode of game type specification, new keyword "gametype" replaces old "type" (old maps stay supported)

10 years agoadd _reflect maps too
FruitieX [Fri, 22 Oct 2010 12:12:35 +0000 (15:12 +0300)]
add _reflect maps too

10 years agofinally fix the darn dom points, also remove nexuiz logo
FruitieX [Fri, 22 Oct 2010 12:06:36 +0000 (15:06 +0300)]
finally fix the darn dom points, also remove nexuiz logo

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/domtextures'
Rudolf Polzer [Fri, 22 Oct 2010 07:10:48 +0000 (09:10 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/domtextures'

10 years agoMerge remote branch 'refs/remotes/origin/ThePWTULN/campaigntimer'
Rudolf Polzer [Fri, 22 Oct 2010 07:02:59 +0000 (09:02 +0200)]
Merge remote branch 'refs/remotes/origin/ThePWTULN/campaigntimer'

10 years agoadd capture point textures from nexcompat
FruitieX [Thu, 21 Oct 2010 20:37:10 +0000 (23:37 +0300)]
add capture point textures from nexcompat

10 years agoMerge remote branch 'origin/fruitiex/newpanelhud'
Rudolf Polzer [Thu, 21 Oct 2010 20:08:18 +0000 (22:08 +0200)]
Merge remote branch 'origin/fruitiex/newpanelhud'

10 years agos/hud_border_thickness/autocvar_scoreboard_border_thickness/
FruitieX [Thu, 21 Oct 2010 19:21:39 +0000 (22:21 +0300)]
s/hud_border_thickness/autocvar_scoreboard_border_thickness/

10 years agoincrease the scale a bit
FruitieX [Thu, 21 Oct 2010 19:10:25 +0000 (22:10 +0300)]
increase the scale a bit

10 years agostrzone a tempstring before storing in a global! create a new cvar for scaling up...
FruitieX [Thu, 21 Oct 2010 19:07:02 +0000 (22:07 +0300)]
strzone a tempstring before storing in a global! create a new cvar for scaling up/down the scoreboard background

10 years agoadd a "* hud_fade_alpha" into showspeed and showacceleration so they fade out nicely...
FruitieX [Thu, 21 Oct 2010 18:45:11 +0000 (21:45 +0300)]
add a "* hud_fade_alpha" into showspeed and showacceleration so they fade out nicely when opening the scoreboard/menu

10 years agoMerge branch 'master' into terencehill/newpanelhud
FruitieX [Thu, 21 Oct 2010 18:40:17 +0000 (21:40 +0300)]
Merge branch 'master' into terencehill/newpanelhud

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/racepanelfix'
Rudolf Polzer [Thu, 21 Oct 2010 18:26:45 +0000 (20:26 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/racepanelfix'

10 years agomake the race modicon panel a little more awesome
FruitieX [Thu, 21 Oct 2010 18:10:50 +0000 (21:10 +0300)]
make the race modicon panel a little more awesome

10 years agonew .gitattributes file, no visible change
Rudolf Polzer [Thu, 21 Oct 2010 16:06:28 +0000 (18:06 +0200)]
new .gitattributes file, no visible change

10 years agolet it pierce even less solid, actually
Rudolf Polzer [Wed, 20 Oct 2010 15:55:22 +0000 (17:55 +0200)]
let it pierce even less solid, actually

10 years agoreduce rifle secondary speed (as secondary is weaker and should pierce less solid)
Rudolf Polzer [Wed, 20 Oct 2010 15:54:46 +0000 (17:54 +0200)]
reduce rifle secondary speed (as secondary is weaker and should pierce less solid)

10 years agouse equalizing for rendering fullbright players
Rudolf Polzer [Wed, 20 Oct 2010 15:30:16 +0000 (17:30 +0200)]
use equalizing for rendering fullbright players

10 years agofire burner: abort searching for owner after 16 steps
Rudolf Polzer [Tue, 19 Oct 2010 19:46:46 +0000 (21:46 +0200)]
fire burner: abort searching for owner after 16 steps

10 years agofix funny warpzone-rocketlauncher bug
Rudolf Polzer [Tue, 19 Oct 2010 19:37:40 +0000 (21:37 +0200)]
fix funny warpzone-rocketlauncher bug

10 years agofix rocket no longer being remote detonatable after passing through warpzone
Rudolf Polzer [Tue, 19 Oct 2010 19:15:32 +0000 (21:15 +0200)]
fix rocket no longer being remote detonatable after passing through warpzone

10 years agosupport bgmscript with target_music
Rudolf Polzer [Tue, 19 Oct 2010 15:48:07 +0000 (17:48 +0200)]
support bgmscript with target_music

10 years agoAssault in Campaign: only run the first round
Rudolf Polzer [Tue, 19 Oct 2010 15:42:44 +0000 (17:42 +0200)]
Assault in Campaign: only run the first round

10 years agonex beam: when low charge, display a weaker beam
Rudolf Polzer [Tue, 19 Oct 2010 13:35:29 +0000 (15:35 +0200)]
nex beam: when low charge, display a weaker beam

10 years agofix warnings
Rudolf Polzer [Tue, 19 Oct 2010 13:09:15 +0000 (15:09 +0200)]
fix warnings

10 years agonex charge: properly support g_use_ammunition; don't bite off more than you can chew...
Rudolf Polzer [Tue, 19 Oct 2010 12:51:48 +0000 (14:51 +0200)]
nex charge: properly support g_use_ammunition; don't bite off more than you can chew (stop charging from cells if you drop below the cells for a single shot)

10 years agoMerge remote branch 'refs/remotes/origin/tzork/turrets'
Rudolf Polzer [Tue, 19 Oct 2010 05:47:27 +0000 (07:47 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/turrets'

10 years agoMerge remote branch 'refs/remotes/origin/mirceakitsune/falling_improvments'
Rudolf Polzer [Tue, 19 Oct 2010 05:44:40 +0000 (07:44 +0200)]
Merge remote branch 'refs/remotes/origin/mirceakitsune/falling_improvments'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/silencedriflesec'
Rudolf Polzer [Tue, 19 Oct 2010 05:44:14 +0000 (07:44 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/silencedriflesec'

10 years agoMerge remote branch 'refs/remotes/origin/fruitiex/outofammosound'
Rudolf Polzer [Tue, 19 Oct 2010 05:42:06 +0000 (07:42 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/outofammosound'

10 years agoMerge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 19 Oct 2010 05:37:39 +0000 (07:37 +0200)]
Merge branch 'master' of de.git.xonotic.org/xonotic/xonotic-data.pk3dir

10 years agomisc_laser: allow turning off the dlight by setting "modelscale" "-1"
Rudolf Polzer [Tue, 19 Oct 2010 05:37:20 +0000 (07:37 +0200)]
misc_laser: allow turning off the dlight by setting "modelscale" "-1"

10 years agoa simpler strength sound limiter
Rudolf Polzer [Tue, 19 Oct 2010 05:34:34 +0000 (07:34 +0200)]
a simpler strength sound limiter

10 years agoattempt at making the tracer stay longer, please check if correct...
FruitieX [Tue, 19 Oct 2010 00:04:46 +0000 (03:04 +0300)]
attempt at making the tracer stay longer, please check if correct...

10 years agodryfire.wav sound when out of ammo
FruitieX [Mon, 18 Oct 2010 23:46:20 +0000 (02:46 +0300)]
dryfire.wav sound when out of ammo

10 years agosilenced rifle sound from Tenshihan's GPL soundpack
FruitieX [Mon, 18 Oct 2010 23:18:19 +0000 (02:18 +0300)]
silenced rifle sound from Tenshihan's GPL soundpack

10 years agoprevent insane strength sound spam on weapons that fire at each frame (tuba, electro...
FruitieX [Mon, 18 Oct 2010 21:39:32 +0000 (00:39 +0300)]
prevent insane strength sound spam on weapons that fire at each frame (tuba, electro, gauntlet laser if someone still uses that), and weapons that apparently fire multiple times per frame?! (hlac secondary)

10 years agodon't consume cells if charge is 100% and secondary is held down, nerf velocity charg...
FruitieX [Mon, 18 Oct 2010 21:17:57 +0000 (00:17 +0300)]
don't consume cells if charge is 100% and secondary is held down, nerf velocity charge slightly, increase the base charge rate, increase secondary charge rate slightly. This way it hopefully requires a bit more effort to get up to 120 damage.

10 years agoonly add a "base charge" up to 50%
FruitieX [Mon, 18 Oct 2010 21:10:39 +0000 (00:10 +0300)]
only add a "base charge" up to 50%

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Mon, 18 Oct 2010 17:20:37 +0000 (19:20 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

10 years agonerf grenadelauncher to dmg 50/70 from 60/80
FruitieX [Mon, 18 Oct 2010 17:18:02 +0000 (20:18 +0300)]
nerf grenadelauncher to dmg 50/70 from 60/80

10 years agoadd completion for playermodel command
Rudolf Polzer [Mon, 18 Oct 2010 16:11:22 +0000 (18:11 +0200)]
add completion for playermodel command

10 years agoalso support JPEG waypointsprites
Rudolf Polzer [Mon, 18 Oct 2010 12:13:31 +0000 (14:13 +0200)]
also support JPEG waypointsprites

10 years agofix direction of infinite lasers
Rudolf Polzer [Mon, 18 Oct 2010 07:38:06 +0000 (09:38 +0200)]
fix direction of infinite lasers

10 years agostart out with 0.25 charge
FruitieX [Sun, 17 Oct 2010 23:14:07 +0000 (02:14 +0300)]
start out with 0.25 charge

10 years agonerf the nex charging rate a bit, but decrease the amount of charge depleted at shot
FruitieX [Sun, 17 Oct 2010 23:02:10 +0000 (02:02 +0300)]
nerf the nex charging rate a bit, but decrease the amount of charge depleted at shot

10 years agoMerge remote branch 'origin/fruitiex/fruitbalance'
Rudolf Polzer [Sun, 17 Oct 2010 20:21:45 +0000 (22:21 +0200)]
Merge remote branch 'origin/fruitiex/fruitbalance'

10 years agoreset nex_charge at spawn
FruitieX [Sun, 17 Oct 2010 20:05:48 +0000 (23:05 +0300)]
reset nex_charge at spawn

10 years agodon't send the effect number for infinite non-collisiontesting lasers
Rudolf Polzer [Sun, 17 Oct 2010 20:02:53 +0000 (22:02 +0200)]
don't send the effect number for infinite non-collisiontesting lasers

10 years agoCharge the nex in a little different way, by always charging at a set rate. If the...
FruitieX [Sun, 17 Oct 2010 19:59:53 +0000 (22:59 +0300)]
Charge the nex in a little different way, by always charging at a set rate. If the player goes faster, this rate gets faster, and can be increased further with the secondary just as before

10 years agomisc_laser: add a spawn flag to disable collision testing of the laser (laser then...
Rudolf Polzer [Sun, 17 Oct 2010 19:59:02 +0000 (21:59 +0200)]
misc_laser: add a spawn flag to disable collision testing of the laser (laser then passes through stuff and is not blocked), should speed up rendering

10 years agoadded terencehill to credits
Rudolf Polzer [Sun, 17 Oct 2010 16:56:24 +0000 (18:56 +0200)]
added terencehill to credits

10 years agofix typo
Rudolf Polzer [Sun, 17 Oct 2010 14:34:10 +0000 (16:34 +0200)]
fix typo

10 years agobalance tuning: give only about half the pickup ammo for picking up a weapon
Rudolf Polzer [Sun, 17 Oct 2010 14:31:04 +0000 (16:31 +0200)]
balance tuning: give only about half the pickup ammo for picking up a weapon