]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Sun, 6 Feb 2011 22:42:52 +0000 (00:42 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

13 years agoCPMA has teleport maxspeed of 400, I got told
Rudolf Polzer [Sun, 6 Feb 2011 14:36:29 +0000 (15:36 +0100)]
CPMA has teleport maxspeed of 400, I got told

13 years agoMerge remote branch 'origin/terencehill/typos'
Rudolf Polzer [Sat, 5 Feb 2011 19:14:27 +0000 (20:14 +0100)]
Merge remote branch 'origin/terencehill/typos'

13 years agoMerge remote branch 'origin/terencehill/short_sliders_fix'
Rudolf Polzer [Sat, 5 Feb 2011 19:13:46 +0000 (20:13 +0100)]
Merge remote branch 'origin/terencehill/short_sliders_fix'

13 years agobalanceXonotic: updates by atheros
Rudolf Polzer [Fri, 4 Feb 2011 21:06:27 +0000 (22:06 +0100)]
balanceXonotic: updates by atheros

13 years agoFix length of some sliders in 2 panel dialogs, value field text was unreadable becaus...
terencehill [Wed, 2 Feb 2011 17:25:04 +0000 (18:25 +0100)]
Fix length of some sliders in 2 panel dialogs, value field text was unreadable because too much compressed
These sliders were added to the menu intentionally with a minor size to reduce graphical slider length and let value field text overflow to occupy more space. With the "compact text" system this hack made things worse.

13 years agoRename treshold to threshold in 2 cvar names
terencehill [Mon, 31 Jan 2011 18:09:03 +0000 (19:09 +0100)]
Rename treshold to threshold in 2 cvar names

13 years agoFix some typo in cvars descriptions
terencehill [Mon, 31 Jan 2011 18:06:33 +0000 (19:06 +0100)]
Fix some typo in cvars descriptions

13 years agoadd a format spec comment
Rudolf Polzer [Mon, 31 Jan 2011 15:15:17 +0000 (16:15 +0100)]
add a format spec comment

13 years agoplayer stats: also send team scoreboard
Rudolf Polzer [Mon, 31 Jan 2011 15:02:34 +0000 (16:02 +0100)]
player stats: also send team scoreboard

13 years agoFix laser setting the last used ammo to 1 when reloading it after having switched...
Mircea Kitsune [Sun, 30 Jan 2011 20:56:30 +0000 (22:56 +0200)]
Fix laser setting the last used ammo to 1 when reloading it after having switched to another weapon. We need to use a field float there that is always 0, or the ..float sets the last ammo instead of reporting no ammo.

13 years agoPrettier name for DoReload (TriggerReload)
Mircea Kitsune [Sun, 30 Jan 2011 20:39:21 +0000 (22:39 +0200)]
Prettier name for DoReload (TriggerReload)

13 years agoWrite a useful comment
Mircea Kitsune [Sun, 30 Jan 2011 20:36:38 +0000 (22:36 +0200)]
Write a useful comment

13 years agoShare the final reload code that comes to mind. The reload code is for the most part...
Mircea Kitsune [Sun, 30 Jan 2011 20:35:52 +0000 (22:35 +0200)]
Share the final reload code that comes to mind. The reload code is for the most part shared now :)

13 years agoCreate a RELOADABLE weapon flag, and use it to prevent running useless shared code...
Mircea Kitsune [Sun, 30 Jan 2011 20:17:18 +0000 (22:17 +0200)]
Create a RELOADABLE weapon flag, and use it to prevent running useless shared code for weapons where it's not set

13 years agoCommonize even more code, now that its possible
Mircea Kitsune [Sun, 30 Jan 2011 20:03:46 +0000 (22:03 +0200)]
Commonize even more code, now that its possible

13 years agoFix laser modelindex thingie (doesn't like reload's ammo float being 0)
Mircea Kitsune [Sun, 30 Jan 2011 19:48:07 +0000 (21:48 +0200)]
Fix laser modelindex thingie (doesn't like reload's ammo float being 0)

13 years agoAdapt the laser and its no-ammo usage too
Mircea Kitsune [Sun, 30 Jan 2011 17:57:59 +0000 (19:57 +0200)]
Adapt the laser and its no-ammo usage too

13 years agoFix ammo types
Mircea Kitsune [Sun, 30 Jan 2011 17:25:45 +0000 (19:25 +0200)]
Fix ammo types

13 years agoPort new code to all weapons, part 2
Mircea Kitsune [Sun, 30 Jan 2011 17:19:25 +0000 (19:19 +0200)]
Port new code to all weapons, part 2

13 years agoPort new code to all weapons, part 1
Mircea Kitsune [Sun, 30 Jan 2011 16:58:34 +0000 (18:58 +0200)]
Port new code to all weapons, part 1

13 years agoTurn weapon load floats into a single float with an array. The new system should...
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

13 years agoFirst part of a more common weapon reload code. Implemented for the hagar currently...
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.

13 years agoRename W_Reload again. Needed for an upcoming change
Mircea Kitsune [Sun, 30 Jan 2011 14:04:28 +0000 (16:04 +0200)]
Rename W_Reload again. Needed for an upcoming change

13 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Sun, 30 Jan 2011 13:38:16 +0000 (15:38 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

13 years agoMerge remote branch 'origin/terencehill/menu_dialogs_cleanups'
Rudolf Polzer [Sat, 29 Jan 2011 22:10:12 +0000 (23:10 +0100)]
Merge remote branch 'origin/terencehill/menu_dialogs_cleanups'

13 years agoMerge remote branch 'origin/terencehill/cvarlist_patch'
Rudolf Polzer [Sat, 29 Jan 2011 22:09:23 +0000 (23:09 +0100)]
Merge remote branch 'origin/terencehill/cvarlist_patch'

13 years agoMerge remote branch 'origin/terencehill/freezetag_fix'
Rudolf Polzer [Sat, 29 Jan 2011 22:06:38 +0000 (23:06 +0100)]
Merge remote branch 'origin/terencehill/freezetag_fix'

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
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

13 years agotrigger_hurt now can be targeted, and if triggered, the frag will be awarded to the...
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

13 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
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

13 years agodo some sanity checking when getting player entity from #<n> spec
Rudolf Polzer [Sat, 29 Jan 2011 08:28:35 +0000 (09:28 +0100)]
do some sanity checking when getting player entity from #<n> spec

13 years agoshow number of free player slots in the rightclick dialog
Rudolf Polzer [Fri, 28 Jan 2011 21:32:18 +0000 (22:32 +0100)]
show number of free player slots in the rightclick dialog

13 years agowith this, we can allow g_maxplayers on pure servers
Rudolf Polzer [Fri, 28 Jan 2011 21:17:05 +0000 (22:17 +0100)]
with this, we can allow g_maxplayers on pure servers

13 years agocheck for free-slots in menuqc
Rudolf Polzer [Fri, 28 Jan 2011 21:16:11 +0000 (22:16 +0100)]
check for free-slots in menuqc

13 years agoadd number of free player slots to the statusResponse
Rudolf Polzer [Fri, 28 Jan 2011 21:13:05 +0000 (22:13 +0100)]
add number of free player slots to the statusResponse

13 years agodocument the last change better
Rudolf Polzer [Fri, 28 Jan 2011 20:53:27 +0000 (21:53 +0100)]
document the last change better

13 years agoallow changes in help_ cvars (makes PN server pure)
Rudolf Polzer [Fri, 28 Jan 2011 20:52:05 +0000 (21:52 +0100)]
allow changes in help_ cvars (makes PN server pure)

13 years agoCheckLinks: more checking
Rudolf Polzer [Fri, 28 Jan 2011 07:46:38 +0000 (08:46 +0100)]
CheckLinks:  more checking

13 years agocrylink: add some more CheckLinks calls... maybe this will figure out where the probl...
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

13 years agoupdate translation files
Rudolf Polzer [Thu, 27 Jan 2011 16:07:15 +0000 (17:07 +0100)]
update translation files

13 years agoMerge /tmp/bundle
Rudolf Polzer [Thu, 27 Jan 2011 16:06:10 +0000 (17:06 +0100)]
Merge /tmp/bundle

13 years agoupdate of Hungarian
Rudolf Polzer [Thu, 27 Jan 2011 15:43:27 +0000 (16:43 +0100)]
update of Hungarian

13 years agoHungarian translation by xaN1C4n3
Rudolf Polzer [Thu, 27 Jan 2011 15:41:05 +0000 (16:41 +0100)]
Hungarian translation by xaN1C4n3

13 years agoinitial swedish translation by marcus256
Rudolf Polzer [Thu, 27 Jan 2011 15:39:33 +0000 (16:39 +0100)]
initial swedish translation by marcus256

13 years agoFully fix Electro ammo checks
Mircea Kitsune [Tue, 25 Jan 2011 16:51:47 +0000 (18:51 +0200)]
Fully fix Electro ammo checks

13 years agoFix another electro bug, one issue left
Mircea Kitsune [Tue, 25 Jan 2011 16:21:07 +0000 (18:21 +0200)]
Fix another electro bug, one issue left

13 years agoFix electro beam ammo check. Not fully ready
Mircea Kitsune [Tue, 25 Jan 2011 16:07:31 +0000 (18:07 +0200)]
Fix electro beam ammo check. Not fully ready

13 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Tue, 25 Jan 2011 15:31:48 +0000 (17:31 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

13 years agochange extend/reducematchtime from an rpn alias into QC logic
Rudolf Polzer [Tue, 25 Jan 2011 06:47:48 +0000 (07:47 +0100)]
change extend/reducematchtime from an rpn alias into QC logic

13 years agoMerge branch 'master' into terencehill/menu_dialogs_cleanups
terencehill [Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)]
Merge branch 'master' into terencehill/menu_dialogs_cleanups

13 years agooptimize isnan()
Rudolf Polzer [Mon, 24 Jan 2011 06:44:54 +0000 (07:44 +0100)]
optimize isnan()

13 years agoRemove a useless cvar check. If reloading is disabled, the weapon load is always...
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.

13 years agoFix switching to the shotgun with no ammo when melee is active. Also improve another...
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

13 years agoFix Rocket Launcher and Mine Layer ammo check code
Mircea Kitsune [Sun, 23 Jan 2011 23:51:35 +0000 (01:51 +0200)]
Fix Rocket Launcher and Mine Layer ammo check code

13 years agoinclude push-deaths in the weapon stats too
Rudolf Polzer [Sun, 23 Jan 2011 18:39:19 +0000 (19:39 +0100)]
include push-deaths in the weapon stats too

13 years agoweapon profiling. output to a new format
Rudolf Polzer [Sun, 23 Jan 2011 18:33:41 +0000 (19:33 +0100)]
weapon profiling. output to a new format

13 years agoUpdate how much ammo is given when you pick up a weapon, and also attempt to please...
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

13 years agofix "for up to" number format
Rudolf Polzer [Sun, 23 Jan 2011 17:01:16 +0000 (18:01 +0100)]
fix "for up to" number format

13 years agoMerge branch 'master' into mirceakitsune/universal_reload_system
Mircea Kitsune [Sun, 23 Jan 2011 16:01:49 +0000 (18:01 +0200)]
Merge branch 'master' into mirceakitsune/universal_reload_system

13 years agoFix duplicate WR_RESETPLAYER in Sniper code
Mircea Kitsune [Sun, 23 Jan 2011 16:00:04 +0000 (18:00 +0200)]
Fix duplicate WR_RESETPLAYER in Sniper code

13 years agoMove load persistence floats back to their weapon files. That should be the last...
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.

13 years agoSet weapons to fully loaded on respawn in each weapon file instead of cl_client....
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.

13 years agoremove the wish_reload system again
Mircea Kitsune [Sun, 23 Jan 2011 15:07:35 +0000 (17:07 +0200)]
remove the wish_reload system again

13 years agoProperly implement the new check for all weapons (hopefully, only testing can tell)
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)

13 years agoMelee attack always available for shotgun
Mircea Kitsune [Sun, 23 Jan 2011 14:20:20 +0000 (16:20 +0200)]
Melee attack always available for shotgun

13 years agoRemove the switchable check and do all checks in the WR_CHECKAMMO checks. Only fixed...
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

13 years agoDon't look at WR_SWITCHABLE Where we check ammo for firing. Everything is now as...
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 :)

13 years agoUse only WR_SWITCHABLE to check if we can select our weapon. The ammo checks still...
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

13 years agoreturn true in WR_SWITCHABLE for all non-reloadable weapons
Mircea Kitsune [Sat, 22 Jan 2011 23:07:48 +0000 (01:07 +0200)]
return true in WR_SWITCHABLE for all non-reloadable weapons

13 years agoRemove the wish_reload system. WR_RELOAD can replace it
Mircea Kitsune [Sat, 22 Jan 2011 23:04:47 +0000 (01:04 +0200)]
Remove the wish_reload system. WR_RELOAD can replace it

13 years agoDoh, it CAN be done differently than my ugly list. Use WR checks
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

13 years agoFix the weapon load check from last commit. You can no longer switch to a weapon...
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.

13 years agoAttempt to setup a better system for detecting if the weapon still has ammo loading...
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.

13 years agosome bugfixes in CSQC hud messages
Rudolf Polzer [Sat, 22 Jan 2011 20:02:44 +0000 (21:02 +0100)]
some bugfixes in CSQC hud messages

13 years agomake weapon death messages translatable
Rudolf Polzer [Sat, 22 Jan 2011 19:53:54 +0000 (20:53 +0100)]
make weapon death messages translatable

13 years agocredits fixing, more of it
Rudolf Polzer [Sat, 22 Jan 2011 19:49:01 +0000 (20:49 +0100)]
credits fixing, more of it

13 years agofix theShadow and sev in the credits
Rudolf Polzer [Sat, 22 Jan 2011 19:45:33 +0000 (20:45 +0100)]
fix theShadow and sev in the credits

13 years agoMove weapon load floats in defs.qh, rather than in each weapon file. Necessary to...
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

13 years agoSpectateCopy the clip load and clip size, to see the ammo of player we're spectating
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

13 years agoskip non-reloadable weapons, or we access undefined cvars. Also a balance tweak
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

13 years agoBetter reload defaults. To be documented and disabled by default once everything...
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

13 years agoRemove a now useless cvar
Mircea Kitsune [Sat, 22 Jan 2011 17:21:16 +0000 (19:21 +0200)]
Remove a now useless cvar

13 years agoReturn ammo code I previously removed from the UZI. I don't know what it was there...
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.

13 years agoSmall fix and precaches
Mircea Kitsune [Sat, 22 Jan 2011 17:15:57 +0000 (19:15 +0200)]
Small fix and precaches

13 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

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

13 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

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

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

13 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

13 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

13 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

13 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

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

13 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

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

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

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

13 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