]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
14 years agoAnother rename
Mircea Kitsune [Fri, 21 Jan 2011 18:14:45 +0000 (20:14 +0200)]
Another rename

14 years agoRename a stat again
Mircea Kitsune [Fri, 21 Jan 2011 18:05:17 +0000 (20:05 +0200)]
Rename a stat again

14 years agoFix a comment
Mircea Kitsune [Fri, 21 Jan 2011 18:03:24 +0000 (20:03 +0200)]
Fix a comment

14 years agoRename another float
Mircea Kitsune [Fri, 21 Jan 2011 17:56:49 +0000 (19:56 +0200)]
Rename another float

14 years agoBetter naming for the stats
Mircea Kitsune [Fri, 21 Jan 2011 17:55:30 +0000 (19:55 +0200)]
Better naming for the stats

14 years agoMake the crosshair ring properly display ammo based on the clip size of the weapon...
Mircea Kitsune [Fri, 21 Jan 2011 17:51:16 +0000 (19:51 +0200)]
Make the crosshair ring properly display ammo based on the clip size of the weapon we're holding.

14 years agoDon't think this code is any longer necessary. If anything, it would need to be entir...
Mircea Kitsune [Fri, 21 Jan 2011 17:33:13 +0000 (19:33 +0200)]
Don't think this code is any longer necessary. If anything, it would need to be entirely redone. Though I don't think bots will have a problem with reloading, since guns auto-reload once they run out of ammo.

14 years agoRename the sound file, as it no longer belongs to one weapon only. Currently, all...
Mircea Kitsune [Fri, 21 Jan 2011 17:29:34 +0000 (19:29 +0200)]
Rename the sound file, as it no longer belongs to one weapon only. Currently, all weapons will use the same reload sound, but that can easily be changed later.

14 years agoComment that last change
Mircea Kitsune [Fri, 21 Jan 2011 17:25:00 +0000 (19:25 +0200)]
Comment that last change

14 years agoDon't switch to another weapon when reloading, if there's no more ammo but there...
Mircea Kitsune [Fri, 21 Jan 2011 17:21:51 +0000 (19:21 +0200)]
Don't switch to another weapon when reloading, if there's no more ammo but there's still some load inside the gun

14 years agoAdd a check that was still necessary
Mircea Kitsune [Fri, 21 Jan 2011 17:14:19 +0000 (19:14 +0200)]
Add a check that was still necessary

14 years agoProper complaining when there's no ammo to reload
Mircea Kitsune [Fri, 21 Jan 2011 16:45:38 +0000 (18:45 +0200)]
Proper complaining when there's no ammo to reload

14 years agoTidy up code and comments
Mircea Kitsune [Fri, 21 Jan 2011 16:33:11 +0000 (18:33 +0200)]
Tidy up code and comments

14 years agoMake sure we can / need to reload before checking if we have enough ammo to
Mircea Kitsune [Fri, 21 Jan 2011 16:11:19 +0000 (18:11 +0200)]
Make sure we can / need to reload before checking if we have enough ammo to

14 years agoOuch... forgot a fixed cvar
Mircea Kitsune [Fri, 21 Jan 2011 16:09:13 +0000 (18:09 +0200)]
Ouch... forgot a fixed cvar

14 years agoFix the remaining issues. At this point, the reload code is working as indented ...
Mircea Kitsune [Fri, 21 Jan 2011 16:05:35 +0000 (18:05 +0200)]
Fix the remaining issues. At this point, the reload code is working as indented (still far from ready though)

14 years agoFix more issues
Mircea Kitsune [Fri, 21 Jan 2011 15:53:58 +0000 (17:53 +0200)]
Fix more issues

14 years agoProperly do the ammo checks, and tweak the sniper rifle code (still not fixed though)
Mircea Kitsune [Fri, 21 Jan 2011 15:18:29 +0000 (17:18 +0200)]
Properly do the ammo checks, and tweak the sniper rifle code (still not fixed though)

14 years agoAll weapons must be loaded the first time you get them
Mircea Kitsune [Fri, 21 Jan 2011 14:52:43 +0000 (16:52 +0200)]
All weapons must be loaded the first time you get them

14 years agoCheck the weapon load, not player ammo
Mircea Kitsune [Fri, 21 Jan 2011 14:45:13 +0000 (16:45 +0200)]
Check the weapon load, not player ammo

14 years agoProperly check the amount of ammo we'd be using too
Mircea Kitsune [Fri, 21 Jan 2011 14:39:16 +0000 (16:39 +0200)]
Properly check the amount of ammo we'd be using too

14 years agoAllow using weapons when the player has no more ammo of that type, but the weapon...
Mircea Kitsune [Fri, 21 Jan 2011 14:38:10 +0000 (16:38 +0200)]
Allow using weapons when the player has no more ammo of that type, but the weapon itself is still loaded

14 years agoProperly check the necessary amount of ammo for reloading
Mircea Kitsune [Fri, 21 Jan 2011 14:20:14 +0000 (16:20 +0200)]
Properly check the necessary amount of ammo for reloading

14 years agoProper cvars and remove old cvars
Mircea Kitsune [Fri, 21 Jan 2011 02:46:22 +0000 (04:46 +0200)]
Proper cvars and remove old cvars

14 years agoFix weapons with reloading disabled
Mircea Kitsune [Fri, 21 Jan 2011 02:39:49 +0000 (04:39 +0200)]
Fix weapons with reloading disabled

14 years agoProperly consider ammo we still had in the weapon before reloading
Mircea Kitsune [Fri, 21 Jan 2011 02:30:24 +0000 (04:30 +0200)]
Properly consider ammo we still had in the weapon before reloading

14 years agoFix forced reload
Mircea Kitsune [Fri, 21 Jan 2011 02:23:07 +0000 (04:23 +0200)]
Fix forced reload

14 years agoRename something back
Mircea Kitsune [Fri, 21 Jan 2011 02:19:23 +0000 (04:19 +0200)]
Rename something back

14 years agoOnly use wish_reload where we have to
Mircea Kitsune [Fri, 21 Jan 2011 02:18:49 +0000 (04:18 +0200)]
Only use wish_reload where we have to

14 years agoCorrect code for crosshair ring. Still need to rename some stuff though
Mircea Kitsune [Fri, 21 Jan 2011 02:12:58 +0000 (04:12 +0200)]
Correct code for crosshair ring. Still need to rename some stuff though

14 years agoOops... sniper uses nails
Mircea Kitsune [Fri, 21 Jan 2011 02:11:03 +0000 (04:11 +0200)]
Oops... sniper uses nails

14 years agoUpdate the sniper as well
Mircea Kitsune [Fri, 21 Jan 2011 02:08:50 +0000 (04:08 +0200)]
Update the sniper as well

14 years agoSmall forgotten fix
Mircea Kitsune [Fri, 21 Jan 2011 02:05:29 +0000 (04:05 +0200)]
Small forgotten fix

14 years agoPart 2 of per-weapon load persistence. Much closer to what it should be like
Mircea Kitsune [Fri, 21 Jan 2011 02:03:50 +0000 (04:03 +0200)]
Part 2 of per-weapon load persistence. Much closer to what it should be like

14 years agoPer weapon load, part 1. Still buggy and not functioning properly
Mircea Kitsune [Fri, 21 Jan 2011 01:19:49 +0000 (03:19 +0200)]
Per weapon load, part 1. Still buggy and not functioning properly

14 years ago*Temporary* change so we can see the ammo circle with all weapons
Mircea Kitsune [Fri, 21 Jan 2011 00:18:44 +0000 (02:18 +0200)]
*Temporary* change so we can see the ammo circle with all weapons

14 years agoProper names
Mircea Kitsune [Fri, 21 Jan 2011 00:16:12 +0000 (02:16 +0200)]
Proper names

14 years agoImprove functionality
Mircea Kitsune [Fri, 21 Jan 2011 00:08:29 +0000 (02:08 +0200)]
Improve functionality

14 years agoMake the reload code use the proper type of ammo
Mircea Kitsune [Thu, 20 Jan 2011 23:43:56 +0000 (01:43 +0200)]
Make the reload code use the proper type of ammo

14 years agoFirst reload functionality for the shotgun (requires the player to have nails until...
Mircea Kitsune [Thu, 20 Jan 2011 22:28:02 +0000 (00:28 +0200)]
First reload functionality for the shotgun (requires the player to have nails until ammo types are set correctly). Obviously this will be cvared off by default for all weapons but the sniper, unless decided otherwise in balance.

14 years agoOh, we don't need a qh file
Mircea Kitsune [Thu, 20 Jan 2011 22:06:54 +0000 (00:06 +0200)]
Oh, we don't need a qh file

14 years agoFirst step in a common reload system for all weapons. Move the campingrifle reload...
Mircea Kitsune [Thu, 20 Jan 2011 21:54:07 +0000 (23:54 +0200)]
First step in a common reload system for all weapons. Move the campingrifle reload code to cl_weaponsystem.qc.

14 years agomore german
Rudolf Polzer [Thu, 20 Jan 2011 20:06:25 +0000 (21:06 +0100)]
more german

14 years agofix some coloring bugs
Rudolf Polzer [Thu, 20 Jan 2011 20:04:53 +0000 (21:04 +0100)]
fix some coloring bugs

14 years agomore german in csprogs
Rudolf Polzer [Thu, 20 Jan 2011 20:00:09 +0000 (21:00 +0100)]
more german in csprogs

14 years agoone more string haha
Rudolf Polzer [Thu, 20 Jan 2011 19:25:14 +0000 (20:25 +0100)]
one more string haha

14 years agoupdate line numbers
Rudolf Polzer [Thu, 20 Jan 2011 19:18:11 +0000 (20:18 +0100)]
update line numbers

14 years agoupdate German csprogs a bit (31.09% now)
Rudolf Polzer [Thu, 20 Jan 2011 19:16:34 +0000 (20:16 +0100)]
update German csprogs a bit (31.09% now)

14 years agodisable the csprogs translation for now
Rudolf Polzer [Thu, 20 Jan 2011 19:02:01 +0000 (20:02 +0100)]
disable the csprogs translation for now

14 years agobeginning of German translation of csprogs
Rudolf Polzer [Thu, 20 Jan 2011 19:01:40 +0000 (20:01 +0100)]
beginning of German translation of csprogs

14 years agofix compile
Rudolf Polzer [Thu, 20 Jan 2011 18:48:16 +0000 (19:48 +0100)]
fix compile

14 years agoadd Dutch to the menu
Rudolf Polzer [Thu, 20 Jan 2011 18:45:13 +0000 (19:45 +0100)]
add Dutch to the menu

14 years agoadd untranslated strings for the weapon names to all translations
Rudolf Polzer [Thu, 20 Jan 2011 18:44:17 +0000 (19:44 +0100)]
add untranslated strings for the weapon names to all translations

14 years agoallow translations of weapon names (NOTE: will only affect CSQC display, so do not...
Rudolf Polzer [Thu, 20 Jan 2011 18:40:19 +0000 (19:40 +0100)]
allow translations of weapon names (NOTE: will only affect CSQC display, so do not translate them yet until this is done entirely)

14 years agopreparation for making weapon names translatable
Rudolf Polzer [Thu, 20 Jan 2011 18:37:31 +0000 (19:37 +0100)]
preparation for making weapon names translatable

14 years agomake score labels translatable
Rudolf Polzer [Thu, 20 Jan 2011 18:36:03 +0000 (19:36 +0100)]
make score labels translatable

14 years agoformatting normalized again
Rudolf Polzer [Thu, 20 Jan 2011 18:24:27 +0000 (19:24 +0100)]
formatting normalized again

14 years agoinitial NL translation by PinkRobot and freefang
Rudolf Polzer [Thu, 20 Jan 2011 18:23:40 +0000 (19:23 +0100)]
initial NL translation by PinkRobot and freefang

14 years agoupdate French credits file
Rudolf Polzer [Thu, 20 Jan 2011 14:02:01 +0000 (15:02 +0100)]
update French credits file

14 years agoupdate credits
Rudolf Polzer [Thu, 20 Jan 2011 14:01:04 +0000 (15:01 +0100)]
update credits

14 years agoupdate russian by nikoli
Rudolf Polzer [Thu, 20 Jan 2011 13:58:33 +0000 (14:58 +0100)]
update russian by nikoli

14 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Thu, 20 Jan 2011 12:56:34 +0000 (13:56 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

14 years agoseeker: force from 250 to 100, apparently got forgotten when changing it from 3 to...
Rudolf Polzer [Thu, 20 Jan 2011 12:55:53 +0000 (13:55 +0100)]
seeker: force from 250 to 100, apparently got forgotten when changing it from 3 to 8 missiles

14 years agofix for menu music playing when restarting the menu
Rudolf Polzer [Wed, 19 Jan 2011 20:29:48 +0000 (21:29 +0100)]
fix for menu music playing when restarting the menu

14 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 19 Jan 2011 16:21:25 +0000 (17:21 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

14 years agomore i18n-marked strings
Rudolf Polzer [Wed, 19 Jan 2011 16:21:15 +0000 (17:21 +0100)]
more i18n-marked strings

14 years agofix a hanging semicolon
Rudolf Polzer [Wed, 19 Jan 2011 11:39:05 +0000 (12:39 +0100)]
fix a hanging semicolon

14 years agomore i18n marking progress in csqc
Rudolf Polzer [Wed, 19 Jan 2011 10:21:05 +0000 (11:21 +0100)]
more i18n marking progress in csqc

14 years agoone more file i18n marked
Rudolf Polzer [Wed, 19 Jan 2011 10:07:37 +0000 (11:07 +0100)]
one more file i18n marked

14 years agomore gettext marks
Rudolf Polzer [Wed, 19 Jan 2011 09:45:54 +0000 (10:45 +0100)]
more gettext marks

14 years agoMerge commit '961fd2402928e52177ae5f9d6bc8a6d097ec918f'
Rudolf Polzer [Wed, 19 Jan 2011 06:43:22 +0000 (07:43 +0100)]
Merge commit '961fd2402928e52177ae5f9d6bc8a6d097ec918f'

14 years agoremove a debug message
Rudolf Polzer [Wed, 19 Jan 2011 06:36:31 +0000 (07:36 +0100)]
remove a debug message

14 years agodo part of the gettext-marking
Rudolf Polzer [Wed, 19 Jan 2011 06:30:23 +0000 (07:30 +0100)]
do part of the gettext-marking

14 years agoOoops, those don't exist anymore.
Samual [Wed, 19 Jan 2011 04:25:19 +0000 (23:25 -0500)]
Ooops, those don't exist anymore.

14 years agoUpdate some cvars and comments
Samual [Wed, 19 Jan 2011 00:56:32 +0000 (19:56 -0500)]
Update some cvars and comments

14 years agoAdd the polyblend changes to a new branch which DOESN'T have the stupid blur changes...
Samual [Wed, 19 Jan 2011 00:48:42 +0000 (19:48 -0500)]
Add the polyblend changes to a new branch which DOESN'T have the stupid blur changes as those should be implemented in the engine. Possibly needs cleaned up some more, but should be mostly okay

14 years agoMerge branch 'samual/water_and_damage_blur' into samual/hud_contents
Samual [Tue, 18 Jan 2011 21:11:58 +0000 (16:11 -0500)]
Merge branch 'samual/water_and_damage_blur' into samual/hud_contents

14 years agofix a typo squishing a text field in Russian
Rudolf Polzer [Tue, 18 Jan 2011 20:42:15 +0000 (21:42 +0100)]
fix a typo squishing a text field in Russian

14 years agomore fancy stuff :P
Rudolf Polzer [Tue, 18 Jan 2011 20:37:26 +0000 (21:37 +0100)]
more fancy stuff :P

14 years agosort the message catalogs
Rudolf Polzer [Tue, 18 Jan 2011 20:36:06 +0000 (21:36 +0100)]
sort the message catalogs

14 years agomore files done
Rudolf Polzer [Tue, 18 Jan 2011 20:34:14 +0000 (21:34 +0100)]
more files done

14 years agomore i18n for CSQC
Rudolf Polzer [Tue, 18 Jan 2011 20:32:57 +0000 (21:32 +0100)]
more i18n for CSQC

14 years agotranslation checker: make it run on CSQC too
Rudolf Polzer [Tue, 18 Jan 2011 20:26:23 +0000 (21:26 +0100)]
translation checker: make it run on CSQC too

14 years agostart of CSQC i18n-izing
Rudolf Polzer [Tue, 18 Jan 2011 20:24:47 +0000 (21:24 +0100)]
start of CSQC i18n-izing

14 years agodon't compile the ctf example
Rudolf Polzer [Tue, 18 Jan 2011 20:11:26 +0000 (21:11 +0100)]
don't compile the ctf example

14 years agomove i18n guide and badwords to ..
Rudolf Polzer [Tue, 18 Jan 2011 20:06:18 +0000 (21:06 +0100)]
move i18n guide and badwords to ..

14 years agoMerge branch 'master' into samual/water_and_damage_blur
Samual [Tue, 18 Jan 2011 19:58:03 +0000 (14:58 -0500)]
Merge branch 'master' into samual/water_and_damage_blur

14 years agoshow engine tooltip strings only in English mode
Rudolf Polzer [Tue, 18 Jan 2011 19:08:26 +0000 (20:08 +0100)]
show engine tooltip strings only in English mode

14 years agofix a typo
Rudolf Polzer [Tue, 18 Jan 2011 18:49:29 +0000 (19:49 +0100)]
fix a typo

14 years agoenforce a margin for button text
Rudolf Polzer [Tue, 18 Jan 2011 18:29:40 +0000 (19:29 +0100)]
enforce a margin for button text

14 years agofix doubleclick on a language in misc
Rudolf Polzer [Tue, 18 Jan 2011 18:27:24 +0000 (19:27 +0100)]
fix doubleclick on a language in misc

14 years agonew version of Russian
Rudolf Polzer [Tue, 18 Jan 2011 17:24:56 +0000 (18:24 +0100)]
new version of Russian

14 years agoupdate translation files for text change (new English source text)
Rudolf Polzer [Tue, 18 Jan 2011 17:06:40 +0000 (18:06 +0100)]
update translation files for text change (new English source text)

14 years agoone line less in the dialog
Rudolf Polzer [Tue, 18 Jan 2011 17:03:52 +0000 (18:03 +0100)]
one line less in the dialog

14 years agofix display of the welcome text
Rudolf Polzer [Tue, 18 Jan 2011 17:03:40 +0000 (18:03 +0100)]
fix display of the welcome text

14 years agoupdate the first-run dialog using a better text
Rudolf Polzer [Tue, 18 Jan 2011 16:49:47 +0000 (17:49 +0100)]
update the first-run dialog using a better text

14 years agofix one missing message
Rudolf Polzer [Tue, 18 Jan 2011 16:43:12 +0000 (17:43 +0100)]
fix one missing message

14 years agoupdate for Russian
Rudolf Polzer [Tue, 18 Jan 2011 16:41:22 +0000 (17:41 +0100)]
update for Russian

14 years agoTHIS is the file to unfuzzy
Rudolf Polzer [Tue, 18 Jan 2011 16:17:20 +0000 (17:17 +0100)]
THIS is the file to unfuzzy

14 years agoRevert "the .pt translations are fine, no fuzzy" as I did this to the wrong file
Rudolf Polzer [Tue, 18 Jan 2011 16:17:02 +0000 (17:17 +0100)]
Revert "the .pt translations are fine, no fuzzy" as I did this to the wrong file

This reverts commit aae15c548c00e96d140117004e56e325d5124b87.