]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mircea Kitsune [Sun, 23 Jan 2011 23:51:35 +0000 (01:51 +0200)]
Fix Rocket Launcher and Mine Layer ammo check code
Mircea Kitsune [Sun, 23 Jan 2011 16:01:49 +0000 (18:01 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Sun, 23 Jan 2011 16:00:04 +0000 (18:00 +0200)]
Fix duplicate WR_RESETPLAYER in Sniper code
Mircea Kitsune [Sun, 23 Jan 2011 15:58:08 +0000 (17:58 +0200)]
Move load persistence floats back to their weapon files. That should be the last of the weapon lists, and the reload system should no longer depend on anything weapon-specific outside of the weapon files.
Mircea Kitsune [Sun, 23 Jan 2011 15:46:21 +0000 (17:46 +0200)]
Set weapons to fully loaded on respawn in each weapon file instead of cl_client. One more 'weapon list' down.
Mircea Kitsune [Sun, 23 Jan 2011 15:07:35 +0000 (17:07 +0200)]
remove the wish_reload system again
Mircea Kitsune [Sun, 23 Jan 2011 15:01:18 +0000 (17:01 +0200)]
Properly implement the new check for all weapons (hopefully, only testing can tell)
Mircea Kitsune [Sun, 23 Jan 2011 14:20:20 +0000 (16:20 +0200)]
Melee attack always available for shotgun
Mircea Kitsune [Sun, 23 Jan 2011 14:16:18 +0000 (16:16 +0200)]
Remove the switchable check and do all checks in the WR_CHECKAMMO checks. Only fixed for the shotgun, fixing for the other weapons next
Mircea Kitsune [Sat, 22 Jan 2011 23:53:54 +0000 (01:53 +0200)]
Don't look at WR_SWITCHABLE Where we check ammo for firing. Everything is now as it should be :)
Mircea Kitsune [Sat, 22 Jan 2011 23:36:57 +0000 (01:36 +0200)]
Use only WR_SWITCHABLE to check if we can select our weapon. The ammo checks still stay for other uses
Mircea Kitsune [Sat, 22 Jan 2011 23:07:48 +0000 (01:07 +0200)]
return true in WR_SWITCHABLE for all non-reloadable weapons
Mircea Kitsune [Sat, 22 Jan 2011 23:04:47 +0000 (01:04 +0200)]
Remove the wish_reload system. WR_RELOAD can replace it
Mircea Kitsune [Sat, 22 Jan 2011 22:58:26 +0000 (00:58 +0200)]
Doh, it CAN be done differently than my ugly list. Use WR checks
Mircea Kitsune [Sat, 22 Jan 2011 22:33:15 +0000 (00:33 +0200)]
Fix the weapon load check from last commit. You can no longer switch to a weapon if you have neither enough load in it to use it, nor enough ammo to reload it to an usable point. The weapon list is kinda ugly code-wise, but only way I found so far to do this.
Mircea Kitsune [Sat, 22 Jan 2011 22:07:29 +0000 (00:07 +0200)]
Attempt to setup a better system for detecting if the weapon still has ammo loading in it, and not switching to it if now. So far it's going well, but the only way to do it is having a WEP_* check for each reloadable gun, sadly.
Rudolf Polzer [Sat, 22 Jan 2011 20:02:44 +0000 (21:02 +0100)]
some bugfixes in CSQC hud messages
Rudolf Polzer [Sat, 22 Jan 2011 19:53:54 +0000 (20:53 +0100)]
make weapon death messages translatable
Rudolf Polzer [Sat, 22 Jan 2011 19:49:01 +0000 (20:49 +0100)]
credits fixing, more of it
Rudolf Polzer [Sat, 22 Jan 2011 19:45:33 +0000 (20:45 +0100)]
fix theShadow and sev in the credits
Mircea Kitsune [Sat, 22 Jan 2011 18:27:25 +0000 (20:27 +0200)]
Move weapon load floats in defs.qh, rather than in each weapon file. Necessary to properly access them from the server code in some cases
Mircea Kitsune [Sat, 22 Jan 2011 17:51:28 +0000 (19:51 +0200)]
SpectateCopy the clip load and clip size, to see the ammo of player we're spectating
Mircea Kitsune [Sat, 22 Jan 2011 17:44:36 +0000 (19:44 +0200)]
skip non-reloadable weapons, or we access undefined cvars. Also a balance tweak
Mircea Kitsune [Sat, 22 Jan 2011 17:38:28 +0000 (19:38 +0200)]
Better reload defaults. To be documented and disabled by default once everything is ready
Mircea Kitsune [Sat, 22 Jan 2011 17:21:16 +0000 (19:21 +0200)]
Remove a now useless cvar
Mircea Kitsune [Sat, 22 Jan 2011 17:18:29 +0000 (19:18 +0200)]
Return ammo code I previously removed from the UZI. I don't know what it was there for, and removing it could brake something.
Mircea Kitsune [Sat, 22 Jan 2011 17:15:57 +0000 (19:15 +0200)]
Small fix and precaches
Mircea Kitsune [Sat, 22 Jan 2011 17:03:21 +0000 (19:03 +0200)]
Properly check the weapon we are switching to
Mircea Kitsune [Sat, 22 Jan 2011 16:52:26 +0000 (18:52 +0200)]
Fix seeker cvar
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
Mircea Kitsune [Sat, 22 Jan 2011 16:33:39 +0000 (18:33 +0200)]
Proper weapon ordering
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.
Mircea Kitsune [Sat, 22 Jan 2011 16:15:09 +0000 (18:15 +0200)]
Rename the Laser cvar, to avoid a functionality conflict
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
Mircea Kitsune [Sat, 22 Jan 2011 15:42:38 +0000 (17:42 +0200)]
Lastly, the Hagar and Rocket Launcher
Mircea Kitsune [Sat, 22 Jan 2011 15:18:04 +0000 (17:18 +0200)]
Fix the ammo check for that last change
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)
Mircea Kitsune [Sat, 22 Jan 2011 15:04:32 +0000 (17:04 +0200)]
Simplify that last code a bit
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.
Mircea Kitsune [Sat, 22 Jan 2011 14:31:31 +0000 (16:31 +0200)]
Minstanex and Nex
Mircea Kitsune [Sat, 22 Jan 2011 13:35:35 +0000 (15:35 +0200)]
Seeker
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
Mircea Kitsune [Sat, 22 Jan 2011 12:32:58 +0000 (14:32 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system
Rudolf Polzer [Sat, 22 Jan 2011 09:17:19 +0000 (10:17 +0100)]
more rearranging
Rudolf Polzer [Sat, 22 Jan 2011 09:12:32 +0000 (10:12 +0100)]
add r_coronas_occlusionquery to the effects presets
Rudolf Polzer [Sat, 22 Jan 2011 08:59:06 +0000 (09:59 +0100)]
Russian update
Mircea Kitsune [Sat, 22 Jan 2011 02:22:23 +0000 (04:22 +0200)]
Fix some ammo config issues
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.
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.
Mircea Kitsune [Sat, 22 Jan 2011 01:47:08 +0000 (03:47 +0200)]
Reloading for fireball
Mircea Kitsune [Sat, 22 Jan 2011 00:37:50 +0000 (02:37 +0200)]
Little comment change
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.
Mircea Kitsune [Sat, 22 Jan 2011 00:04:33 +0000 (02:04 +0200)]
Some case sensitivity name changes
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
Mircea Kitsune [Fri, 21 Jan 2011 23:44:54 +0000 (01:44 +0200)]
Move onto to the Crylink and HLAC
Mircea Kitsune [Fri, 21 Jan 2011 23:19:55 +0000 (01:19 +0200)]
Fix a forgotten buggy line of code that was causing issues
Mircea Kitsune [Fri, 21 Jan 2011 22:48:56 +0000 (00:48 +0200)]
Fix issues with electro beam
Mircea Kitsune [Fri, 21 Jan 2011 22:37:02 +0000 (00:37 +0200)]
Remove forgotten code
Mircea Kitsune [Fri, 21 Jan 2011 22:34:28 +0000 (00:34 +0200)]
Port reload code over to the Electro
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.
Mircea Kitsune [Fri, 21 Jan 2011 21:33:10 +0000 (23:33 +0200)]
Properly take ammo bounds when checking for forced reload
Mircea Kitsune [Fri, 21 Jan 2011 21:18:34 +0000 (23:18 +0200)]
Do the Grenade Launcher and Mine Layer
Mircea Kitsune [Fri, 21 Jan 2011 20:50:44 +0000 (22:50 +0200)]
Use self.switchweapon instead of self.weapon where needed
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
Rudolf Polzer [Fri, 21 Jan 2011 19:51:20 +0000 (20:51 +0100)]
fix damage handling when gibbing
Mircea Kitsune [Fri, 21 Jan 2011 18:46:55 +0000 (20:46 +0200)]
Remove an useless ammo code from the UZI
Mircea Kitsune [Fri, 21 Jan 2011 18:40:30 +0000 (20:40 +0200)]
Port reload code over to the UZI
Rudolf Polzer [Fri, 21 Jan 2011 18:35:48 +0000 (19:35 +0100)]
language update, again
Mircea Kitsune [Fri, 21 Jan 2011 18:20:22 +0000 (20:20 +0200)]
"enough ammo" sounds better
Mircea Kitsune [Fri, 21 Jan 2011 18:14:45 +0000 (20:14 +0200)]
Another rename
Mircea Kitsune [Fri, 21 Jan 2011 18:05:17 +0000 (20:05 +0200)]
Rename a stat again
Mircea Kitsune [Fri, 21 Jan 2011 18:03:24 +0000 (20:03 +0200)]
Fix a comment
Mircea Kitsune [Fri, 21 Jan 2011 17:56:49 +0000 (19:56 +0200)]
Rename another float
Mircea Kitsune [Fri, 21 Jan 2011 17:55:30 +0000 (19:55 +0200)]
Better naming for the stats
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.
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.
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.
Mircea Kitsune [Fri, 21 Jan 2011 17:25:00 +0000 (19:25 +0200)]
Comment that last change
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
Mircea Kitsune [Fri, 21 Jan 2011 17:14:19 +0000 (19:14 +0200)]
Add a check that was still necessary
Mircea Kitsune [Fri, 21 Jan 2011 16:45:38 +0000 (18:45 +0200)]
Proper complaining when there's no ammo to reload
Mircea Kitsune [Fri, 21 Jan 2011 16:33:11 +0000 (18:33 +0200)]
Tidy up code and comments
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
Mircea Kitsune [Fri, 21 Jan 2011 16:09:13 +0000 (18:09 +0200)]
Ouch... forgot a fixed cvar
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)
Mircea Kitsune [Fri, 21 Jan 2011 15:53:58 +0000 (17:53 +0200)]
Fix more issues
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)
Mircea Kitsune [Fri, 21 Jan 2011 14:52:43 +0000 (16:52 +0200)]
All weapons must be loaded the first time you get them
Mircea Kitsune [Fri, 21 Jan 2011 14:45:13 +0000 (16:45 +0200)]
Check the weapon load, not player ammo
Mircea Kitsune [Fri, 21 Jan 2011 14:39:16 +0000 (16:39 +0200)]
Properly check the amount of ammo we'd be using too
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
Mircea Kitsune [Fri, 21 Jan 2011 14:20:14 +0000 (16:20 +0200)]
Properly check the necessary amount of ammo for reloading
Rudolf Polzer [Fri, 21 Jan 2011 09:52:56 +0000 (10:52 +0100)]
sort :P
Rudolf Polzer [Fri, 21 Jan 2011 09:52:35 +0000 (10:52 +0100)]
fix Romanian
Rudolf Polzer [Fri, 21 Jan 2011 09:51:28 +0000 (10:51 +0100)]
Merge remote branch 'origin/mirceakitsune/translation_romanian'
Mircea Kitsune [Fri, 21 Jan 2011 02:46:22 +0000 (04:46 +0200)]
Proper cvars and remove old cvars
Mircea Kitsune [Fri, 21 Jan 2011 02:39:49 +0000 (04:39 +0200)]
Fix weapons with reloading disabled
Mircea Kitsune [Fri, 21 Jan 2011 02:30:24 +0000 (04:30 +0200)]
Properly consider ammo we still had in the weapon before reloading
Mircea Kitsune [Fri, 21 Jan 2011 02:23:07 +0000 (04:23 +0200)]
Fix forced reload
Mircea Kitsune [Fri, 21 Jan 2011 02:19:23 +0000 (04:19 +0200)]
Rename something back