]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
FruitieX [Fri, 29 Oct 2010 10:50:18 +0000 (13:50 +0300)]
dropshadow with small radius on new crosshairs, plus replace some of the ugliest remaining ones from nexuiz
Rudolf Polzer [Thu, 28 Oct 2010 13:12:39 +0000 (15:12 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Thu, 28 Oct 2010 13:09:30 +0000 (15:09 +0200)]
new balance config balanceTest.cfg which tries to take the best ideas from both big balance configs
Rudolf Polzer [Wed, 27 Oct 2010 19:33:18 +0000 (21:33 +0200)]
remove a failed attempt
Rudolf Polzer [Wed, 27 Oct 2010 19:21:24 +0000 (21:21 +0200)]
fix more warnings
Rudolf Polzer [Wed, 27 Oct 2010 19:17:25 +0000 (21:17 +0200)]
more warning fixes
Rudolf Polzer [Wed, 27 Oct 2010 19:11:17 +0000 (21:11 +0200)]
remove some more unref stuff
Rudolf Polzer [Wed, 27 Oct 2010 19:10:51 +0000 (21:10 +0200)]
remove some unref stuff
Rudolf Polzer [Wed, 27 Oct 2010 19:03:55 +0000 (21:03 +0200)]
sane up include order
Rudolf Polzer [Wed, 27 Oct 2010 16:39:02 +0000 (18:39 +0200)]
change visible name to Sniper Rifle
Rudolf Polzer [Wed, 27 Oct 2010 16:34:10 +0000 (18:34 +0200)]
multiple fixes for the weapon priority management
Rudolf Polzer [Wed, 27 Oct 2010 15:40:36 +0000 (17:40 +0200)]
experimental change: sort impulse weapon order by weapon priority too
Rudolf Polzer [Wed, 27 Oct 2010 13:50:41 +0000 (15:50 +0200)]
we can get rid of the "hanging ;" warning by calling an empty macro ENDS_WITH_CURLY_BRACE at the end of the causing macro. So let's do that instead of totally disabling the warning
Rudolf Polzer [Wed, 27 Oct 2010 13:27:36 +0000 (15:27 +0200)]
fix all remaining warnings
Rudolf Polzer [Wed, 27 Oct 2010 13:22:31 +0000 (15:22 +0200)]
get rid of a LOT of warnings
Rudolf Polzer [Wed, 27 Oct 2010 13:18:23 +0000 (15:18 +0200)]
some warning fixes
Rudolf Polzer [Wed, 27 Oct 2010 12:36:42 +0000 (14:36 +0200)]
w_all: add a nice comment
Rudolf Polzer [Wed, 27 Oct 2010 09:28:12 +0000 (11:28 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
Rudolf Polzer [Wed, 27 Oct 2010 09:27:38 +0000 (11:27 +0200)]
when loading the DB, and it's a dump, also parse the first line (so even if it's missing due to a filter op, the DB still loads)
Rudolf Polzer [Tue, 26 Oct 2010 18:58:26 +0000 (20:58 +0200)]
sv_db_saveasdump and cl_db_saveasdump cvars
Rudolf Polzer [Tue, 26 Oct 2010 18:37:07 +0000 (20:37 +0200)]
disable -Werror for now
Rudolf Polzer [Tue, 26 Oct 2010 18:36:43 +0000 (20:36 +0200)]
fix some warnings in HUD code
Rudolf Polzer [Tue, 26 Oct 2010 18:31:22 +0000 (20:31 +0200)]
be more strict with warnings (csqc now no longer compiles)
Rudolf Polzer [Tue, 26 Oct 2010 18:29:14 +0000 (20:29 +0200)]
get rid of a warning
Rudolf Polzer [Tue, 26 Oct 2010 18:11:38 +0000 (20:11 +0200)]
hide one warning
Rudolf Polzer [Tue, 26 Oct 2010 17:23:49 +0000 (19:23 +0200)]
fix particlefont.tga not getting closed
Rudolf Polzer [Sun, 24 Oct 2010 15:57:30 +0000 (17:57 +0200)]
remove the traceline at the end of CSQC_UpdateView as the engine cleans up these globals now;
split up PolyDrawModel function in CSQC (unused)
Rudolf Polzer [Sun, 24 Oct 2010 12:14:49 +0000 (14:14 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/ca_nodmg_after_round'
Rudolf Polzer [Sat, 23 Oct 2010 19:32:12 +0000 (21:32 +0200)]
remove the old muzzleflash field that is no longer in use
Jakob MG [Sat, 23 Oct 2010 19:30:24 +0000 (21:30 +0200)]
Fix uzi flash entity leakage
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
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:
FruitieX [Sat, 23 Oct 2010 18:16:02 +0000 (21:16 +0300)]
oops forgot the hud icons
Rudolf Polzer [Sat, 23 Oct 2010 17:57:37 +0000 (19:57 +0200)]
rifle: more accuracy
FruitieX [Sat, 23 Oct 2010 17:27:33 +0000 (20:27 +0300)]
fixes
Rudolf Polzer [Sat, 23 Oct 2010 17:09:05 +0000 (19:09 +0200)]
actually add the new crosshair ring image
Rudolf Polzer [Sat, 23 Oct 2010 17:08:56 +0000 (19:08 +0200)]
remove muzzleflash when player leaves
Rudolf Polzer [Sat, 23 Oct 2010 17:06:40 +0000 (19:06 +0200)]
less obtrusive ring display
FruitieX [Sat, 23 Oct 2010 16:53:59 +0000 (19:53 +0300)]
CA modicon panel
Rudolf Polzer [Sat, 23 Oct 2010 16:40:56 +0000 (18:40 +0200)]
use the right spawnflag
Rudolf Polzer [Sat, 23 Oct 2010 16:36:46 +0000 (18:36 +0200)]
trigger_hurt, misc_laser: support "team" like trigger_push
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?)
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
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
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
FruitieX [Sat, 23 Oct 2010 14:50:49 +0000 (17:50 +0300)]
fix a bug where a player for some reason couldn't spawn
FruitieX [Sat, 23 Oct 2010 14:42:20 +0000 (17:42 +0300)]
make that * 0.01 score actually
FruitieX [Sat, 23 Oct 2010 14:42:02 +0000 (17:42 +0300)]
fix champion check
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)
FruitieX [Sat, 23 Oct 2010 13:34:46 +0000 (16:34 +0300)]
no damage after the round has ended in CA or arena
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
Rudolf Polzer [Sat, 23 Oct 2010 07:54:58 +0000 (09:54 +0200)]
fix warning
Rudolf Polzer [Sat, 23 Oct 2010 07:54:17 +0000 (09:54 +0200)]
add Rocket Flying to menu
Rudolf Polzer [Sat, 23 Oct 2010 07:47:57 +0000 (09:47 +0200)]
add the "rocket flying" mutator, cvar g_rocket_flying
Rudolf Polzer [Sat, 23 Oct 2010 07:43:43 +0000 (09:43 +0200)]
mutator system: add an EditProjectile hook
Rudolf Polzer [Sat, 23 Oct 2010 07:08:39 +0000 (09:08 +0200)]
also hide net_address and friends from cvar_changes
Rudolf Polzer [Sat, 23 Oct 2010 07:08:00 +0000 (09:08 +0200)]
merge some nice settings from my server
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.
Rudolf Polzer [Fri, 22 Oct 2010 21:57:07 +0000 (23:57 +0200)]
more font stuff
Rudolf Polzer [Fri, 22 Oct 2010 21:53:53 +0000 (23:53 +0200)]
fix cvar_changes
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
Rudolf Polzer [Fri, 22 Oct 2010 21:04:10 +0000 (23:04 +0200)]
MOAR CELLS
Rudolf Polzer [Fri, 22 Oct 2010 20:58:49 +0000 (22:58 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
FruitieX [Fri, 22 Oct 2010 20:49:02 +0000 (23:49 +0300)]
g_pickup_cells_weapon 25
Rudolf Polzer [Fri, 22 Oct 2010 20:42:02 +0000 (22:42 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
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)
Rudolf Polzer [Fri, 22 Oct 2010 15:46:45 +0000 (17:46 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/domfix'
Rudolf Polzer [Fri, 22 Oct 2010 15:40:19 +0000 (17:40 +0200)]
Merge remote branch 'origin/fruitiex/kay_crosshairs'
FruitieX [Fri, 22 Oct 2010 15:14:38 +0000 (18:14 +0300)]
new crosshair images by kayPK
Rudolf Polzer [Fri, 22 Oct 2010 14:08:57 +0000 (16:08 +0200)]
remove an unused var
Rudolf Polzer [Fri, 22 Oct 2010 13:57:25 +0000 (15:57 +0200)]
add a // defaults: marker too
Rudolf Polzer [Fri, 22 Oct 2010 13:53:09 +0000 (15:53 +0200)]
add a dummy skill value for cts
Rudolf Polzer [Fri, 22 Oct 2010 13:49:39 +0000 (15:49 +0200)]
also still add the leadlimit to the defalt comment
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)
FruitieX [Fri, 22 Oct 2010 12:12:35 +0000 (15:12 +0300)]
add _reflect maps too
FruitieX [Fri, 22 Oct 2010 12:06:36 +0000 (15:06 +0300)]
finally fix the darn dom points, also remove nexuiz logo
Rudolf Polzer [Fri, 22 Oct 2010 07:10:48 +0000 (09:10 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/domtextures'
Rudolf Polzer [Fri, 22 Oct 2010 07:02:59 +0000 (09:02 +0200)]
Merge remote branch 'refs/remotes/origin/ThePWTULN/campaigntimer'
FruitieX [Thu, 21 Oct 2010 20:37:10 +0000 (23:37 +0300)]
add capture point textures from nexcompat
Rudolf Polzer [Thu, 21 Oct 2010 20:08:18 +0000 (22:08 +0200)]
Merge remote branch 'origin/fruitiex/newpanelhud'
FruitieX [Thu, 21 Oct 2010 19:21:39 +0000 (22:21 +0300)]
s/hud_border_thickness/autocvar_scoreboard_border_thickness/
FruitieX [Thu, 21 Oct 2010 19:10:25 +0000 (22:10 +0300)]
increase the scale a bit
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
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
FruitieX [Thu, 21 Oct 2010 18:40:17 +0000 (21:40 +0300)]
Merge branch 'master' into terencehill/newpanelhud
Rudolf Polzer [Thu, 21 Oct 2010 18:26:45 +0000 (20:26 +0200)]
Merge remote branch 'refs/remotes/origin/fruitiex/racepanelfix'
FruitieX [Thu, 21 Oct 2010 18:10:50 +0000 (21:10 +0300)]
make the race modicon panel a little more awesome
Rudolf Polzer [Thu, 21 Oct 2010 16:06:28 +0000 (18:06 +0200)]
new .gitattributes file, no visible change
Rudolf Polzer [Wed, 20 Oct 2010 15:55:22 +0000 (17:55 +0200)]
let it pierce even less solid, actually
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)
Rudolf Polzer [Wed, 20 Oct 2010 15:30:16 +0000 (17:30 +0200)]
use equalizing for rendering fullbright players
Rudolf Polzer [Tue, 19 Oct 2010 19:46:46 +0000 (21:46 +0200)]
fire burner: abort searching for owner after 16 steps
Rudolf Polzer [Tue, 19 Oct 2010 19:37:40 +0000 (21:37 +0200)]
fix funny warpzone-rocketlauncher bug
Rudolf Polzer [Tue, 19 Oct 2010 19:15:32 +0000 (21:15 +0200)]
fix rocket no longer being remote detonatable after passing through warpzone
Rudolf Polzer [Tue, 19 Oct 2010 15:48:07 +0000 (17:48 +0200)]
support bgmscript with target_music
Rudolf Polzer [Tue, 19 Oct 2010 15:42:44 +0000 (17:42 +0200)]
Assault in Campaign: only run the first round
Rudolf Polzer [Tue, 19 Oct 2010 13:35:29 +0000 (15:35 +0200)]
nex beam: when low charge, display a weaker beam
Rudolf Polzer [Tue, 19 Oct 2010 13:09:15 +0000 (15:09 +0200)]
fix warnings
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)
Rudolf Polzer [Tue, 19 Oct 2010 05:47:27 +0000 (07:47 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/turrets'