]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
14 years agoProperly check the weapon we are switching to
Mircea Kitsune [Sat, 22 Jan 2011 17:03:21 +0000 (19:03 +0200)]
Properly check the weapon we are switching to

14 years agoFix seeker cvar
Mircea Kitsune [Sat, 22 Jan 2011 16:52:26 +0000 (18:52 +0200)]
Fix seeker cvar

14 years agoRemove the crosshair ring if the player goes unarmed while previously having held...
Mircea Kitsune [Sat, 22 Jan 2011 16:41:07 +0000 (18:41 +0200)]
Remove the crosshair ring if the player goes unarmed while previously having held a loaded weapon

14 years agoProper weapon ordering
Mircea Kitsune [Sat, 22 Jan 2011 16:33:39 +0000 (18:33 +0200)]
Proper weapon ordering

14 years agoEmpty clip size when selecting a weapon that doesn't support reloading (so the previo...
Mircea Kitsune [Sat, 22 Jan 2011 16:27:57 +0000 (18:27 +0200)]
Empty clip size when selecting a weapon that doesn't support reloading (so the previous weapon's crosshair ring won't display). Weapons without a reload system are the Tuba, Porto, and Hook.

14 years agoRename the Laser cvar, to avoid a functionality conflict
Mircea Kitsune [Sat, 22 Jan 2011 16:15:09 +0000 (18:15 +0200)]
Rename the Laser cvar, to avoid a functionality conflict

14 years agoVery well... add reloading to the Laser too. Uses no ammo of course
Mircea Kitsune [Sat, 22 Jan 2011 16:13:12 +0000 (18:13 +0200)]
Very well... add reloading to the Laser too. Uses no ammo of course

14 years agoLastly, the Hagar and Rocket Launcher
Mircea Kitsune [Sat, 22 Jan 2011 15:42:38 +0000 (17:42 +0200)]
Lastly, the Hagar and Rocket Launcher

14 years agoFix the ammo check for that last change
Mircea Kitsune [Sat, 22 Jan 2011 15:18:04 +0000 (17:18 +0200)]
Fix the ammo check for that last change

14 years agoActually, create an optional ammo usage cvar for the minstanex laser (so it can take...
Mircea Kitsune [Sat, 22 Jan 2011 15:14:14 +0000 (17:14 +0200)]
Actually, create an optional ammo usage cvar for the minstanex laser (so it can take cells or weapon load when you use alt fire)

14 years agoSimplify that last code a bit
Mircea Kitsune [Sat, 22 Jan 2011 15:04:32 +0000 (17:04 +0200)]
Simplify that last code a bit

14 years agoAn additional feature for the minstanex, allowing the alt fire (laser) to take weapon...
Mircea Kitsune [Sat, 22 Jan 2011 14:50:47 +0000 (16:50 +0200)]
An additional feature for the minstanex, allowing the alt fire (laser) to take weapon load as well.

14 years agoMinstanex and Nex
Mircea Kitsune [Sat, 22 Jan 2011 14:31:31 +0000 (16:31 +0200)]
Minstanex and Nex

14 years agoSeeker
Mircea Kitsune [Sat, 22 Jan 2011 13:35:35 +0000 (15:35 +0200)]
Seeker

14 years agoFix some code that was defined in the client part of the weapons code by mistake
Mircea Kitsune [Sat, 22 Jan 2011 13:07:19 +0000 (15:07 +0200)]
Fix some code that was defined in the client part of the weapons code by mistake

14 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Sat, 22 Jan 2011 12:32:58 +0000 (14:32 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

14 years agomore rearranging
Rudolf Polzer [Sat, 22 Jan 2011 09:17:19 +0000 (10:17 +0100)]
more rearranging

14 years agoadd r_coronas_occlusionquery to the effects presets
Rudolf Polzer [Sat, 22 Jan 2011 09:12:32 +0000 (10:12 +0100)]
add r_coronas_occlusionquery to the effects presets

14 years agoRussian update
Rudolf Polzer [Sat, 22 Jan 2011 08:59:06 +0000 (09:59 +0100)]
Russian update

14 years agoFix some ammo config issues
Mircea Kitsune [Sat, 22 Jan 2011 02:22:23 +0000 (04:22 +0200)]
Fix some ammo config issues

14 years agoRevert that last change, due to not working properly. It's not an urgent feature...
Mircea Kitsune [Sat, 22 Jan 2011 02:16:33 +0000 (04:16 +0200)]
Revert that last change, due to not working properly. It's not an urgent feature, and could even be unwanted based on preference.

14 years agoReload if we don't have ammo for a certain attack. Prevents situations in which you...
Mircea Kitsune [Sat, 22 Jan 2011 02:03:52 +0000 (04:03 +0200)]
Reload if we don't have ammo for a certain attack. Prevents situations in which you still hold the weapon (if you have ammo for the other firing type), and the firing key you have no ammo for does nothing. We make it reload instead.

14 years agoReloading for fireball
Mircea Kitsune [Sat, 22 Jan 2011 01:47:08 +0000 (03:47 +0200)]
Reloading for fireball

14 years agoLittle comment change
Mircea Kitsune [Sat, 22 Jan 2011 00:37:50 +0000 (02:37 +0200)]
Little comment change

14 years agoOnly switch to another weapon if the current one doesn't have enough ammo loaded...
Mircea Kitsune [Sat, 22 Jan 2011 00:31:09 +0000 (02:31 +0200)]
Only switch to another weapon if the current one doesn't have enough ammo loaded to still *use* it, not if it has no more ammo loaded at all.

14 years agoSome case sensitivity name changes
Mircea Kitsune [Sat, 22 Jan 2011 00:04:33 +0000 (02:04 +0200)]
Some case sensitivity name changes

14 years agoDo the ammo maths at the beginning again, more correct and safe
Mircea Kitsune [Sat, 22 Jan 2011 00:01:28 +0000 (02:01 +0200)]
Do the ammo maths at the beginning again, more correct and safe

14 years agoMove onto to the Crylink and HLAC
Mircea Kitsune [Fri, 21 Jan 2011 23:44:54 +0000 (01:44 +0200)]
Move onto to the Crylink and HLAC

14 years agoFix a forgotten buggy line of code that was causing issues
Mircea Kitsune [Fri, 21 Jan 2011 23:19:55 +0000 (01:19 +0200)]
Fix a forgotten buggy line of code that was causing issues

14 years agoFix issues with electro beam
Mircea Kitsune [Fri, 21 Jan 2011 22:48:56 +0000 (00:48 +0200)]
Fix issues with electro beam

14 years agoRemove forgotten code
Mircea Kitsune [Fri, 21 Jan 2011 22:37:02 +0000 (00:37 +0200)]
Remove forgotten code

14 years agoPort reload code over to the Electro
Mircea Kitsune [Fri, 21 Jan 2011 22:34:28 +0000 (00:34 +0200)]
Port reload code over to the Electro

14 years agoRemove useless returns on attack and attack2. There are several other checks that...
Mircea Kitsune [Fri, 21 Jan 2011 21:40:52 +0000 (23:40 +0200)]
Remove useless returns on attack and attack2. There are several other checks that keep weapons from firing while reloading, so it won't happen.

14 years agoProperly take ammo bounds when checking for forced reload
Mircea Kitsune [Fri, 21 Jan 2011 21:33:10 +0000 (23:33 +0200)]
Properly take ammo bounds when checking for forced reload

14 years agoDo the Grenade Launcher and Mine Layer
Mircea Kitsune [Fri, 21 Jan 2011 21:18:34 +0000 (23:18 +0200)]
Do the Grenade Launcher and Mine Layer

14 years agoUse self.switchweapon instead of self.weapon where needed
Mircea Kitsune [Fri, 21 Jan 2011 20:50:44 +0000 (22:50 +0200)]
Use self.switchweapon instead of self.weapon where needed

14 years agoas the previous change made gibbing easier, make it harder again PROPERLY
Rudolf Polzer [Fri, 21 Jan 2011 19:52:58 +0000 (20:52 +0100)]
as the previous change made gibbing easier, make it harder again PROPERLY

14 years agofix damage handling when gibbing
Rudolf Polzer [Fri, 21 Jan 2011 19:51:20 +0000 (20:51 +0100)]
fix damage handling when gibbing

14 years agoRemove an useless ammo code from the UZI
Mircea Kitsune [Fri, 21 Jan 2011 18:46:55 +0000 (20:46 +0200)]
Remove an useless ammo code from the UZI

14 years agoPort reload code over to the UZI
Mircea Kitsune [Fri, 21 Jan 2011 18:40:30 +0000 (20:40 +0200)]
Port reload code over to the UZI

14 years agolanguage update, again
Rudolf Polzer [Fri, 21 Jan 2011 18:35:48 +0000 (19:35 +0100)]
language update, again

14 years ago"enough ammo" sounds better
Mircea Kitsune [Fri, 21 Jan 2011 18:20:22 +0000 (20:20 +0200)]
"enough ammo" sounds better

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 agosort :P
Rudolf Polzer [Fri, 21 Jan 2011 09:52:56 +0000 (10:52 +0100)]
sort :P

14 years agofix Romanian
Rudolf Polzer [Fri, 21 Jan 2011 09:52:35 +0000 (10:52 +0100)]
fix Romanian

14 years agoMerge remote branch 'origin/mirceakitsune/translation_romanian'
Rudolf Polzer [Fri, 21 Jan 2011 09:51:28 +0000 (10:51 +0100)]
Merge remote branch 'origin/mirceakitsune/translation_romanian'

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... sbbgonyy cynl jr orggre guna lbh
Rudolf Polzer [Thu, 20 Jan 2011 21:00:06 +0000 (22:00 +0100)]
more german... sbbgonyy cynl jr orggre guna lbh

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)