]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mircea Kitsune [Sun, 30 Jan 2011 16:58:34 +0000 (18:58 +0200)]
Port new code to all weapons, part 1
Mircea Kitsune [Sun, 30 Jan 2011 16:38:27 +0000 (18:38 +0200)]
Turn weapon load floats into a single float with an array. The new system should be ready, and porting it to all guns is next
Mircea Kitsune [Sun, 30 Jan 2011 16:20:22 +0000 (18:20 +0200)]
First part of a more common weapon reload code. Implemented for the hagar currently, to be ported to other guns.
Mircea Kitsune [Sun, 30 Jan 2011 14:04:28 +0000 (16:04 +0200)]
Rename W_Reload again. Needed for an upcoming change
Mircea Kitsune [Sun, 30 Jan 2011 13:38:16 +0000 (15:38 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system
Rudolf Polzer [Sat, 29 Jan 2011 22:10:12 +0000 (23:10 +0100)]
Merge remote branch 'origin/terencehill/menu_dialogs_cleanups'
Rudolf Polzer [Sat, 29 Jan 2011 22:09:23 +0000 (23:09 +0100)]
Merge remote branch 'origin/terencehill/cvarlist_patch'
Rudolf Polzer [Sat, 29 Jan 2011 22:06:38 +0000 (23:06 +0100)]
Merge remote branch 'origin/terencehill/freezetag_fix'
Rudolf Polzer [Sat, 29 Jan 2011 20:26:18 +0000 (21:26 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 29 Jan 2011 20:25:32 +0000 (21:25 +0100)]
trigger_hurt now can be targeted, and if triggered, the frag will be awarded to the one who triggered it
Rudolf Polzer [Sat, 29 Jan 2011 08:29:20 +0000 (09:29 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 29 Jan 2011 08:28:35 +0000 (09:28 +0100)]
do some sanity checking when getting player entity from #<n> spec
Rudolf Polzer [Fri, 28 Jan 2011 21:32:18 +0000 (22:32 +0100)]
show number of free player slots in the rightclick dialog
Rudolf Polzer [Fri, 28 Jan 2011 21:17:05 +0000 (22:17 +0100)]
with this, we can allow g_maxplayers on pure servers
Rudolf Polzer [Fri, 28 Jan 2011 21:16:11 +0000 (22:16 +0100)]
check for free-slots in menuqc
Rudolf Polzer [Fri, 28 Jan 2011 21:13:05 +0000 (22:13 +0100)]
add number of free player slots to the statusResponse
Rudolf Polzer [Fri, 28 Jan 2011 20:53:27 +0000 (21:53 +0100)]
document the last change better
Rudolf Polzer [Fri, 28 Jan 2011 20:52:05 +0000 (21:52 +0100)]
allow changes in help_ cvars (makes PN server pure)
Rudolf Polzer [Fri, 28 Jan 2011 07:46:38 +0000 (08:46 +0100)]
CheckLinks: more checking
Rudolf Polzer [Fri, 28 Jan 2011 07:45:05 +0000 (08:45 +0100)]
crylink: add some more CheckLinks calls... maybe this will figure out where the problem is
Rudolf Polzer [Thu, 27 Jan 2011 16:07:15 +0000 (17:07 +0100)]
update translation files
Rudolf Polzer [Thu, 27 Jan 2011 16:06:10 +0000 (17:06 +0100)]
Merge /tmp/bundle
Rudolf Polzer [Thu, 27 Jan 2011 15:43:27 +0000 (16:43 +0100)]
update of Hungarian
Rudolf Polzer [Thu, 27 Jan 2011 15:41:05 +0000 (16:41 +0100)]
Hungarian translation by xaN1C4n3
Rudolf Polzer [Thu, 27 Jan 2011 15:39:33 +0000 (16:39 +0100)]
initial swedish translation by marcus256
Mircea Kitsune [Tue, 25 Jan 2011 16:51:47 +0000 (18:51 +0200)]
Fully fix Electro ammo checks
Mircea Kitsune [Tue, 25 Jan 2011 16:21:07 +0000 (18:21 +0200)]
Fix another electro bug, one issue left
Mircea Kitsune [Tue, 25 Jan 2011 16:07:31 +0000 (18:07 +0200)]
Fix electro beam ammo check. Not fully ready
Mircea Kitsune [Tue, 25 Jan 2011 15:31:48 +0000 (17:31 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system
Rudolf Polzer [Tue, 25 Jan 2011 06:47:48 +0000 (07:47 +0100)]
change extend/reducematchtime from an rpn alias into QC logic
terencehill [Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)]
Merge branch 'master' into terencehill/menu_dialogs_cleanups
Rudolf Polzer [Mon, 24 Jan 2011 06:44:54 +0000 (07:44 +0100)]
optimize isnan()
Mircea Kitsune [Mon, 24 Jan 2011 00:33:03 +0000 (02:33 +0200)]
Remove a useless cvar check. If reloading is disabled, the weapon load is always 0, so no need to check the cvar itself.
Mircea Kitsune [Mon, 24 Jan 2011 00:23:28 +0000 (02:23 +0200)]
Fix switching to the shotgun with no ammo when melee is active. Also improve another check
Mircea Kitsune [Sun, 23 Jan 2011 23:51:35 +0000 (01:51 +0200)]
Fix Rocket Launcher and Mine Layer ammo check code
Rudolf Polzer [Sun, 23 Jan 2011 18:39:19 +0000 (19:39 +0100)]
include push-deaths in the weapon stats too
Rudolf Polzer [Sun, 23 Jan 2011 18:33:41 +0000 (19:33 +0100)]
weapon profiling. output to a new format
Samual [Sun, 23 Jan 2011 18:01:45 +0000 (13:01 -0500)]
Update how much ammo is given when you pick up a weapon, and also attempt to please divVerent with Laser/Crylink/Electro
Rudolf Polzer [Sun, 23 Jan 2011 17:01:16 +0000 (18:01 +0100)]
fix "for up to" number format
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