]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
14 years agofclose only after a successful fopen and print an error message if fopen failed
terencehill [Sun, 24 Oct 2010 16:49:10 +0000 (18:49 +0200)]
fclose only after a successful fopen and print an error message if fopen failed

14 years agoHUD_Write* macros to make the HUD exporter code easier to read and edit
terencehill [Sun, 24 Oct 2010 16:41:56 +0000 (18:41 +0200)]
HUD_Write* macros to make the HUD exporter code easier to read and edit

14 years agoFix a typo
terencehill [Sun, 24 Oct 2010 16:15:01 +0000 (18:15 +0200)]
Fix a typo

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

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

14 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

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

14 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'

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

14 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'

14 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)

14 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'

14 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'

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

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

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

14 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

14 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

14 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)

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

14 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

14 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'

14 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'

14 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

14 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'

14 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/

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

14 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

14 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

14 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

14 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'

14 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

14 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

14 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

14 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)

14 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

14 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

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

14 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

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

14 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

14 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

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

14 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)

14 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'

14 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'

14 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'

14 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'

14 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 http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

14 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"

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

14 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...

14 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

14 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

14 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)

14 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.

14 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%

14 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'

14 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

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

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

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

14 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

14 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

14 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'

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

14 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

14 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

14 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

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

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

14 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

14 years agog_pickup_<ammotype>_weapon: the amount of that ammo type you get for picking up a...
Rudolf Polzer [Sun, 17 Oct 2010 14:29:39 +0000 (16:29 +0200)]
g_pickup_<ammotype>_weapon: the amount of that ammo type you get for picking up a WEAPON

14 years agoFix MLRS and Hellion (animations and logic)
Jakob MG [Sun, 17 Oct 2010 10:02:36 +0000 (12:02 +0200)]
Fix MLRS and Hellion (animations and logic)

14 years agotrigger_impulse: update csqc projectiles
Rudolf Polzer [Sat, 16 Oct 2010 20:03:01 +0000 (22:03 +0200)]
trigger_impulse: update csqc projectiles

14 years agoMerge remote branch 'origin/tzork/turrets'
Rudolf Polzer [Sat, 16 Oct 2010 19:36:52 +0000 (21:36 +0200)]
Merge remote branch 'origin/tzork/turrets'

14 years agoMajor: turret.ticrate was NOT beeing correctly set, resulting in thinks EVERY FRAME...
Jakob MG [Sat, 16 Oct 2010 18:05:47 +0000 (20:05 +0200)]
Major: turret.ticrate was NOT beeing correctly set, resulting in thinks EVERY FRAME insted of the intended 10 FPS. Fixing this also means the thinks are now acctualy spread across frames. Should be a major speedup.
Minor: Cleanups and comments, adjusted configs.

14 years agoAnd now properly check for menu_enabled to instantly hide the HUD cursor ONLY in...
terencehill [Fri, 15 Oct 2010 22:42:48 +0000 (00:42 +0200)]
And now properly check for menu_enabled to instantly hide the HUD cursor ONLY in the case hud_fade_alpha cannot work (the second check simply avoids to draw the cursor if it's already faded out). This way my rude fix is complementary to the elegant FruitieX's one ;P

14 years agoIf the entire HUD is transparent, just do NOT draw it.
terencehill [Fri, 15 Oct 2010 22:34:56 +0000 (00:34 +0200)]
If the entire HUD is transparent, just do NOT draw it.
This improves the fps when displaying the scoreboard for example.

14 years agoLet's use menu_enabled 2 when showing a specific panel dialog so that disable_alpha_c...
terencehill [Fri, 15 Oct 2010 22:05:53 +0000 (00:05 +0200)]
Let's use menu_enabled 2 when showing a specific panel dialog so that disable_alpha_check can be removed because is redundant and the code is a bit easier to understand.

14 years agoGet the dock color only if the dock is active
terencehill [Fri, 15 Oct 2010 20:01:11 +0000 (22:01 +0200)]
Get the dock color only if the dock is active

14 years agoAdd a comment to explain why my fix of the replicating cursor is still valid
terencehill [Fri, 15 Oct 2010 19:54:25 +0000 (21:54 +0200)]
Add a comment to explain why my fix of the replicating cursor is still valid

14 years agofix autogeneration of mapinfo with cdtrack
Rudolf Polzer [Fri, 15 Oct 2010 17:10:13 +0000 (19:10 +0200)]
fix autogeneration of mapinfo with cdtrack

14 years agofix handling of angles of the rocket projectile
Rudolf Polzer [Fri, 15 Oct 2010 16:56:42 +0000 (18:56 +0200)]
fix handling of angles of the rocket projectile

14 years agospeed up more csqc ent drawing
Rudolf Polzer [Fri, 15 Oct 2010 16:43:20 +0000 (18:43 +0200)]
speed up more csqc ent drawing

14 years agodraw projectiles using drawmask (faster)
Rudolf Polzer [Fri, 15 Oct 2010 16:39:57 +0000 (18:39 +0200)]
draw projectiles using drawmask (faster)

14 years agoremove an unused function
Rudolf Polzer [Fri, 15 Oct 2010 16:05:51 +0000 (18:05 +0200)]
remove an unused function

14 years agofix the filtering out .dat
Rudolf Polzer [Fri, 15 Oct 2010 14:36:01 +0000 (16:36 +0200)]
fix the filtering out .dat

14 years agoproper detection of changed source files in the QC makefile
Rudolf Polzer [Fri, 15 Oct 2010 14:33:59 +0000 (16:33 +0200)]
proper detection of changed source files in the QC makefile

14 years agoMerge remote branch 'origin/master' into divVerent/crypto2
Rudolf Polzer [Fri, 15 Oct 2010 13:16:19 +0000 (15:16 +0200)]
Merge remote branch 'origin/master' into divVerent/crypto2

14 years agoMerge branch 'master' into terencehill/newpanelhud
terencehill [Thu, 14 Oct 2010 22:40:40 +0000 (00:40 +0200)]
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
defaultXonotic.cfg

14 years agoFix wrong image name...
terencehill [Thu, 14 Oct 2010 22:15:49 +0000 (00:15 +0200)]
Fix wrong image name...

14 years agocheaper clientmodel draw code
Rudolf Polzer [Thu, 14 Oct 2010 11:22:21 +0000 (13:22 +0200)]
cheaper clientmodel draw code

14 years agomore typos
Rudolf Polzer [Thu, 14 Oct 2010 11:11:10 +0000 (13:11 +0200)]
more typos

14 years agofix typo
Rudolf Polzer [Thu, 14 Oct 2010 11:08:16 +0000 (13:08 +0200)]
fix typo

14 years agoLOD support for misc_clientmodel (untested)
Rudolf Polzer [Thu, 14 Oct 2010 11:06:47 +0000 (13:06 +0200)]
LOD support for misc_clientmodel (untested)

14 years agoless blur please, so characters no longer overlap
Rudolf Polzer [Thu, 14 Oct 2010 09:10:57 +0000 (11:10 +0200)]
less blur please, so characters no longer overlap

14 years agoMerge branch 'master' into fruitiex/fruitbalance
FruitieX [Wed, 13 Oct 2010 19:35:32 +0000 (22:35 +0300)]
Merge branch 'master' into fruitiex/fruitbalance

14 years agoI have no idea why, but this fixes the mine layer.
FruitieX [Wed, 13 Oct 2010 18:07:25 +0000 (21:07 +0300)]
I have no idea why, but this fixes the mine layer.

14 years agoMerge remote branch 'origin/fruitiex/loadblackbg'
Rudolf Polzer [Wed, 13 Oct 2010 16:49:17 +0000 (18:49 +0200)]
Merge remote branch 'origin/fruitiex/loadblackbg'