]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoMerge remote branch 'origin/master' into samual/hagar_secondary_autorelease
Samual [Mon, 26 Sep 2011 16:51:08 +0000 (12:51 -0400)]
Merge remote branch 'origin/master' into samual/hagar_secondary_autorelease

Conflicts:
qcsrc/server/w_hagar.qc

13 years agoRevert "In order for dds to save a texture file, its resolution must be a multiple...
Rudolf Polzer [Mon, 26 Sep 2011 04:39:49 +0000 (06:39 +0200)]
Revert "In order for dds to save a texture file, its resolution must be a multiple of four (due to recent engine change which uses hard coded relative texture size instead of ddssize argument) -- This may just be a workaround, but either way it's totally harmless (just resized 1x1 texture files to 4x4 texture files). A real solution would later be a new model which has a real texture." WRONG. This is an engine bug and by doing this workaround, we lose the chance to solve it. Reverting.

This reverts commit c5d711414f9bcf2835e2cead0082454c9976f533.

13 years agoIn order for dds to save a texture file, its resolution must be a multiple of four...
Samual [Mon, 26 Sep 2011 00:28:40 +0000 (20:28 -0400)]
In order for dds to save a texture file, its resolution must be a multiple of four (due to recent engine change which uses hard coded relative texture size instead of ddssize argument) -- This may just be a workaround, but either way it's totally harmless (just resized 1x1 texture files to 4x4 texture files). A real solution would later be a new model which has a real texture.

13 years agoMerge remote branch 'origin/mrbougo/weaplast_on_spawn'
Samual [Mon, 26 Sep 2011 00:21:32 +0000 (20:21 -0400)]
Merge remote branch 'origin/mrbougo/weaplast_on_spawn'

13 years agosupport pitch shifting in the tuba if the engine supports it for faster level loading
Rudolf Polzer [Sat, 24 Sep 2011 15:32:16 +0000 (17:32 +0200)]
support pitch shifting in the tuba if the engine supports it for faster level loading

(currently, we require only sounds for notes -18, -12, -6, 0, 6, 12, 18, 24)

13 years agofixes for the pitch shifting code path
Rudolf Polzer [Sat, 24 Sep 2011 14:54:29 +0000 (16:54 +0200)]
fixes for the pitch shifting code path

13 years agoSeeker: fix missing handling of hitting skybox
Rudolf Polzer [Sat, 24 Sep 2011 14:34:43 +0000 (16:34 +0200)]
Seeker: fix missing handling of hitting skybox

13 years agoremove some more legacy stuff
Rudolf Polzer [Fri, 23 Sep 2011 13:38:40 +0000 (15:38 +0200)]
remove some more legacy stuff

13 years agogive the tuba its own audio channel
Rudolf Polzer [Fri, 23 Sep 2011 13:20:23 +0000 (15:20 +0200)]
give the tuba its own audio channel

13 years agoturn off Xonotic 0.1.0 compatibility workarounds - we no longer need them
Rudolf Polzer [Fri, 23 Sep 2011 13:17:22 +0000 (15:17 +0200)]
turn off Xonotic 0.1.0 compatibility workarounds - we no longer need them

13 years agoMerge remote branch 'origin/samual/balance'
Samual [Fri, 23 Sep 2011 05:58:01 +0000 (01:58 -0400)]
Merge remote branch 'origin/samual/balance'

13 years agoMerge remote branch 'origin/samual/fix_hook_in_vehicles'
Samual [Fri, 23 Sep 2011 05:54:18 +0000 (01:54 -0400)]
Merge remote branch 'origin/samual/fix_hook_in_vehicles'

13 years agoAdd checks to make sure you can't fire hook while inside a vehicle, and also remove...
Samual [Fri, 23 Sep 2011 05:52:17 +0000 (01:52 -0400)]
Add checks to make sure you can't fire hook while inside a vehicle, and also remove any current hooks you have when you enter a vehicle

13 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Thu, 22 Sep 2011 13:41:24 +0000 (09:41 -0400)]
Merge remote branch 'origin/master' into samual/balance

13 years agotuba has a very small refire rate, so fix some false positives of the fire auditing
Rudolf Polzer [Thu, 22 Sep 2011 04:39:49 +0000 (06:39 +0200)]
tuba has a very small refire rate, so fix some false positives of the fire auditing

13 years agoAdjust the self damage slightly (raise it, it was slightly too low before)
Samual [Wed, 21 Sep 2011 19:46:01 +0000 (15:46 -0400)]
Adjust the self damage slightly (raise it, it was slightly too low before)

13 years agoTweak rocketlauncher radius a bit
Samual [Wed, 21 Sep 2011 19:10:16 +0000 (15:10 -0400)]
Tweak rocketlauncher radius a bit

13 years agoAdd weapon spread factor into the per-shot spread calculation
Samual [Wed, 21 Sep 2011 18:50:16 +0000 (14:50 -0400)]
Add weapon spread factor into the per-shot spread calculation

13 years agoActually lets change around the calculation for the hagar per-shot spread a bit,...
Samual [Wed, 21 Sep 2011 18:36:34 +0000 (14:36 -0400)]
Actually lets change around the calculation for the hagar per-shot spread a bit, now also has "bias" cvar to control how much spread there is based on how many shots are loaded.

13 years agoAttempt to make the nexgun less spammy without actually nerfing the gun much
Samual [Wed, 21 Sep 2011 16:25:28 +0000 (12:25 -0400)]
Attempt to make the nexgun less spammy without actually nerfing the gun much

13 years agoLower the damage of the hagar primary, but also make it slightly more accurate
Samual [Wed, 21 Sep 2011 16:18:57 +0000 (12:18 -0400)]
Lower the damage of the hagar primary, but also make it slightly more accurate

13 years agoRework how the hagar load secondary spread works slightly (add per-shot spread like...
Samual [Wed, 21 Sep 2011 16:13:09 +0000 (12:13 -0400)]
Rework how the hagar load secondary spread works slightly (add per-shot spread like other normal weapons, plus adjust the normal spread of the attack)

13 years agoTry lower self damage percentage... Got some complaints about different issues regard...
Samual [Wed, 21 Sep 2011 15:03:40 +0000 (11:03 -0400)]
Try lower self damage percentage... Got some complaints about different issues regarding this

13 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Wed, 21 Sep 2011 14:56:56 +0000 (10:56 -0400)]
Merge remote branch 'origin/master' into samual/balance

Conflicts:
balanceXonotic.cfg

13 years agoIncrease the refire time for first shot on uzi
Samual [Wed, 21 Sep 2011 14:50:02 +0000 (10:50 -0400)]
Increase the refire time for first shot on uzi

13 years agovarious fixes for uzi refire
Rudolf Polzer [Wed, 21 Sep 2011 14:24:28 +0000 (16:24 +0200)]
various fixes for uzi refire

(the .cfg change makes it behave like before, except now intentionally so)

13 years agofix auditing of bot scripting weapon state
Rudolf Polzer [Wed, 21 Sep 2011 14:24:09 +0000 (16:24 +0200)]
fix auditing of bot scripting weapon state

13 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Wed, 21 Sep 2011 13:32:29 +0000 (09:32 -0400)]
Merge remote branch 'origin/master' into samual/balance

13 years agoa weird bot command: print and error and highlight the bot if it cannot fire currently
Rudolf Polzer [Wed, 21 Sep 2011 13:16:53 +0000 (15:16 +0200)]
a weird bot command: print and error and highlight the bot if it cannot fire currently

13 years agobot scripting: if we have no command, don't do anything
Rudolf Polzer [Tue, 20 Sep 2011 05:03:31 +0000 (07:03 +0200)]
bot scripting: if we have no command, don't do anything

13 years agokey binder fix
Rudolf Polzer [Mon, 19 Sep 2011 14:50:22 +0000 (16:50 +0200)]
key binder fix

13 years agoa TODO comment
Rudolf Polzer [Mon, 19 Sep 2011 13:20:16 +0000 (15:20 +0200)]
a TODO comment

13 years agoSmall change: use self.weaponname, not self.weapon, for deciding the weapon model
Rudolf Polzer [Mon, 19 Sep 2011 13:17:11 +0000 (15:17 +0200)]
Small change: use self.weaponname, not self.weapon, for deciding the weapon model

This will later allow the same weapon slot to use multiple models if desired.

13 years agobot scripting: also exec commands when dead
Rudolf Polzer [Mon, 19 Sep 2011 08:32:36 +0000 (10:32 +0200)]
bot scripting: also exec commands when dead

for controlled respawn

13 years agoSkill based bot damage? No thanks.
Jakob MG [Sun, 18 Sep 2011 19:33:51 +0000 (21:33 +0200)]
Skill based bot damage? No thanks.

13 years agofix a duplicate variable name
Rudolf Polzer [Sun, 18 Sep 2011 15:31:02 +0000 (17:31 +0200)]
fix a duplicate variable name

13 years agobot_cmd sound: precache the sound when the command is queued
Rudolf Polzer [Sun, 18 Sep 2011 13:43:54 +0000 (15:43 +0200)]
bot_cmd sound: precache the sound when the command is queued

13 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Sun, 18 Sep 2011 13:32:22 +0000 (09:32 -0400)]
Merge remote branch 'origin/master' into samual/balance

13 years agoremove useless line since cff5b8df
MrBougo [Sun, 18 Sep 2011 12:12:42 +0000 (14:12 +0200)]
remove useless line since cff5b8df

13 years agomake weaplast and laser secondary use the best other weapon if previous is unusable
MrBougo [Sun, 18 Sep 2011 12:09:51 +0000 (14:09 +0200)]
make weaplast and laser secondary use the best other weapon if previous is unusable

this also makes weaplast use the second best weapon on spawn

13 years agoVERY evil debug feature: allow to set independent players by cvar
Rudolf Polzer [Sun, 18 Sep 2011 11:20:00 +0000 (13:20 +0200)]
VERY evil debug feature: allow to set independent players by cvar

13 years agofix a NIX issue
Rudolf Polzer [Sun, 18 Sep 2011 11:17:24 +0000 (13:17 +0200)]
fix a NIX issue

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 17 Sep 2011 14:29:00 +0000 (16:29 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agoClientKill: prevent multiple suicides in same frame
Rudolf Polzer [Sat, 17 Sep 2011 14:28:05 +0000 (16:28 +0200)]
ClientKill: prevent multiple suicides in same frame

13 years agoturn off some clearly broken code (only warns, does nothing at all)
Rudolf Polzer [Fri, 16 Sep 2011 10:21:04 +0000 (12:21 +0200)]
turn off some clearly broken code (only warns, does nothing at all)

13 years agoprepare support for engine side pitch shifting in the tuba
Rudolf Polzer [Fri, 16 Sep 2011 04:43:26 +0000 (06:43 +0200)]
prepare support for engine side pitch shifting in the tuba

13 years agofix the same hook bug another, REAL, way :P
Rudolf Polzer [Thu, 15 Sep 2011 20:16:01 +0000 (22:16 +0200)]
fix the same hook bug another, REAL, way :P

13 years agopossible workaround for a hook related crash
Rudolf Polzer [Thu, 15 Sep 2011 20:08:05 +0000 (22:08 +0200)]
possible workaround for a hook related crash

13 years agothe bot config file is harmless too
Rudolf Polzer [Wed, 14 Sep 2011 12:58:24 +0000 (14:58 +0200)]
the bot config file is harmless too

13 years agonext config version bump to fix possible freetype issues
Rudolf Polzer [Wed, 14 Sep 2011 09:32:03 +0000 (11:32 +0200)]
next config version bump to fix possible freetype issues

13 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Wed, 14 Sep 2011 06:01:12 +0000 (02:01 -0400)]
Merge remote branch 'origin/master' into samual/balance

13 years agoIncrease radius of rocketlauncher to make it perhaps more useful (experimental, hopef...
Samual [Wed, 14 Sep 2011 05:59:22 +0000 (01:59 -0400)]
Increase radius of rocketlauncher to make it perhaps more useful (experimental, hopefully doesn't make this overpowered or bring this into the over-used-weapon-tier :D)

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 13 Sep 2011 18:49:23 +0000 (20:49 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agofix an oops :P sorry for breaking jumping
Rudolf Polzer [Tue, 13 Sep 2011 18:49:04 +0000 (20:49 +0200)]
fix an oops :P sorry for breaking jumping

13 years agoMerge remote branch 'origin/master' into samual/balance
Samual [Tue, 13 Sep 2011 17:54:02 +0000 (13:54 -0400)]
Merge remote branch 'origin/master' into samual/balance

13 years agoLower damage for machine gun primary
Samual [Tue, 13 Sep 2011 17:48:56 +0000 (13:48 -0400)]
Lower damage for machine gun primary

13 years agoMerge remote-tracking branch 'origin/terencehill/align_fix'
Rudolf Polzer [Tue, 13 Sep 2011 14:25:28 +0000 (16:25 +0200)]
Merge remote-tracking branch 'origin/terencehill/align_fix'

13 years agoMerge remote-tracking branch 'origin/terencehill/arena_stuff'
Rudolf Polzer [Tue, 13 Sep 2011 14:22:13 +0000 (16:22 +0200)]
Merge remote-tracking branch 'origin/terencehill/arena_stuff'

13 years agoonly set the prevent-join-msg timer if actually sending the message
Rudolf Polzer [Tue, 13 Sep 2011 14:19:23 +0000 (16:19 +0200)]
only set the prevent-join-msg timer if actually sending the message

13 years agoMerge remote-tracking branch 'origin/terencehill/less_spammy_prevent_join_msg'
Rudolf Polzer [Tue, 13 Sep 2011 14:19:07 +0000 (16:19 +0200)]
Merge remote-tracking branch 'origin/terencehill/less_spammy_prevent_join_msg'

13 years agoFix name description alignment in scoreboard_columns_set help
terencehill [Tue, 13 Sep 2011 12:48:18 +0000 (14:48 +0200)]
Fix name description alignment in scoreboard_columns_set help

13 years agoalso don't save campaign progress when winning the whole campaign by levelwarp
Rudolf Polzer [Tue, 13 Sep 2011 07:57:57 +0000 (09:57 +0200)]
also don't save campaign progress when winning the whole campaign by levelwarp

13 years agoadd a campaign levelwarp command "warp"
Rudolf Polzer [Tue, 13 Sep 2011 07:55:41 +0000 (09:55 +0200)]
add a campaign levelwarp command "warp"

usage:

warp - skips current level
warp 10 - skips to level 10

The warp'd progress is NOT saved!

13 years agofix consistency in german translation
Rudolf Polzer [Mon, 12 Sep 2011 11:00:24 +0000 (13:00 +0200)]
fix consistency in german translation

13 years agoupdate german
Rudolf Polzer [Mon, 12 Sep 2011 10:26:52 +0000 (12:26 +0200)]
update german

13 years agoupdate .pot files
Rudolf Polzer [Mon, 12 Sep 2011 10:24:33 +0000 (12:24 +0200)]
update .pot files

13 years agoforce-update config.cfg to r_shadow_realtime_world_lightmaps as apparently people...
Rudolf Polzer [Mon, 12 Sep 2011 10:21:04 +0000 (12:21 +0200)]
force-update config.cfg to r_shadow_realtime_world_lightmaps as apparently people have broken config files

13 years agoremove sv_pogostick cvar, this is now controlled clientside
Rudolf Polzer [Mon, 12 Sep 2011 09:34:35 +0000 (11:34 +0200)]
remove sv_pogostick cvar, this is now controlled clientside

13 years agoMerge remote branch 'origin/divVerent/typofix'
Samual [Mon, 12 Sep 2011 07:27:41 +0000 (03:27 -0400)]
Merge remote branch 'origin/divVerent/typofix'

13 years agoMerge remote branch 'origin/terencehill/essential_weapons_panel'
Samual [Mon, 12 Sep 2011 07:25:55 +0000 (03:25 -0400)]
Merge remote branch 'origin/terencehill/essential_weapons_panel'

13 years agoMerge remote branch 'origin/master' into terencehill/essential_weapons_panel
Samual [Mon, 12 Sep 2011 06:37:32 +0000 (02:37 -0400)]
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel

13 years agoMerge remote branch 'origin/terencehill/megaerebus_image_fix'
Samual [Mon, 12 Sep 2011 06:30:27 +0000 (02:30 -0400)]
Merge remote branch 'origin/terencehill/megaerebus_image_fix'

13 years agoMerge remote branch 'origin/terencehill/centerprint_fix'
Samual [Mon, 12 Sep 2011 05:48:48 +0000 (01:48 -0400)]
Merge remote branch 'origin/terencehill/centerprint_fix'

13 years agoselectteam: refuse changing to the team you're already on
Rudolf Polzer [Sun, 11 Sep 2011 20:08:04 +0000 (22:08 +0200)]
selectteam: refuse changing to the team you're already on

13 years agominor improvements for update notification (can now also show a custom URL)
Rudolf Polzer [Sun, 11 Sep 2011 19:56:14 +0000 (21:56 +0200)]
minor improvements for update notification (can now also show a custom URL)

13 years agoadd autoexec.cfg and autoexec/empty.cfg to hide some more startup errors
Rudolf Polzer [Sun, 11 Sep 2011 16:18:55 +0000 (18:18 +0200)]
add autoexec.cfg and autoexec/empty.cfg to hide some more startup errors

13 years agohide error for data/campaign.cfg
Rudolf Polzer [Sun, 11 Sep 2011 16:18:07 +0000 (18:18 +0200)]
hide error for data/campaign.cfg

13 years agoget rid of some old legacy
Rudolf Polzer [Sun, 11 Sep 2011 16:17:06 +0000 (18:17 +0200)]
get rid of some old legacy

13 years agoget rid of cl_nopogostick, replace it by cl_movement_track_canjump now that the engin...
Rudolf Polzer [Sun, 11 Sep 2011 13:59:58 +0000 (15:59 +0200)]
get rid of cl_nopogostick, replace it by cl_movement_track_canjump now that the engine can handle it somewhat ok; also add it to the menu

13 years agofactor out player jump checking into a CheckPlayerJump() function
Rudolf Polzer [Sun, 11 Sep 2011 13:40:31 +0000 (15:40 +0200)]
factor out player jump checking into a CheckPlayerJump() function

13 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sun, 11 Sep 2011 12:47:40 +0000 (14:47 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agosv_doublejump: clip velocity when landing (fixes sticking-to-floor bug)
Rudolf Polzer [Sun, 11 Sep 2011 12:47:17 +0000 (14:47 +0200)]
sv_doublejump: clip velocity when landing (fixes sticking-to-floor bug)

13 years agoLess spammy centerprint msg shown when one tries to play and the number of players...
terencehill [Sat, 10 Sep 2011 19:44:19 +0000 (21:44 +0200)]
Less spammy centerprint msg shown when one tries to play and the number of players (not bots) already reached g_maxplayers

13 years agosplit Makefile into two for more convenient source packaging
Rudolf Polzer [Sat, 10 Sep 2011 18:31:29 +0000 (20:31 +0200)]
split Makefile into two for more convenient source packaging

13 years agocvar cl_nopogostick (allows a client to turn off sv_pogostick for itself)
Rudolf Polzer [Thu, 8 Sep 2011 19:21:11 +0000 (21:21 +0200)]
cvar cl_nopogostick (allows a client to turn off sv_pogostick for itself)

for people who like to cripple themselves

13 years agoon nagger: treat "autobuild" the same as "git"
Rudolf Polzer [Thu, 8 Sep 2011 08:25:37 +0000 (10:25 +0200)]
on nagger: treat "autobuild" the same as "git"
s Please enter the commit message for your changes. Lines starting

13 years agofix xonotic.com -> xonotic.org
Rudolf Polzer [Wed, 7 Sep 2011 19:05:23 +0000 (21:05 +0200)]
fix xonotic.com -> xonotic.org

13 years agomapvote: support numpad
Rudolf Polzer [Wed, 7 Sep 2011 19:05:15 +0000 (21:05 +0200)]
mapvote: support numpad

13 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Wed, 7 Sep 2011 19:01:09 +0000 (21:01 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

13 years agomenu: be more robust about menu_skin, reset to default on error
Rudolf Polzer [Wed, 7 Sep 2011 18:59:15 +0000 (20:59 +0200)]
menu: be more robust about menu_skin, reset to default on error

this helps csqc find the mouse cursor

13 years agomake some guns able to be "excessive" xonotic-v0.5.0
Rudolf Polzer [Mon, 5 Sep 2011 18:21:00 +0000 (20:21 +0200)]
make some guns able to be "excessive"

13 years agoadd a field for the current switching-to weapon. Finally fixes #648
Rudolf Polzer [Sun, 4 Sep 2011 17:10:41 +0000 (19:10 +0200)]
add a field for the current switching-to weapon. Finally fixes #648

13 years agoclean up handling of active and switch weapon
Rudolf Polzer [Sun, 4 Sep 2011 16:48:59 +0000 (18:48 +0200)]
clean up handling of active and switch weapon

13 years agoshow crosshair for the ACTIVE, not SWITCHING-TO weapon
Rudolf Polzer [Sun, 4 Sep 2011 16:41:37 +0000 (18:41 +0200)]
show crosshair for the ACTIVE, not SWITCHING-TO weapon

13 years agoMerge remote-tracking branch 'origin/terencehill/it_update'
Rudolf Polzer [Sun, 4 Sep 2011 06:01:02 +0000 (08:01 +0200)]
Merge remote-tracking branch 'origin/terencehill/it_update'

13 years agoReplace the image...
terencehill [Sat, 3 Sep 2011 23:52:10 +0000 (01:52 +0200)]
Replace the image...

13 years agoTranslate the 2 new strings
terencehill [Sat, 3 Sep 2011 23:42:48 +0000 (01:42 +0200)]
Translate the 2 new strings

13 years agoMerge branch 'master' into terencehill/it_update
terencehill [Sat, 3 Sep 2011 23:35:11 +0000 (01:35 +0200)]
Merge branch 'master' into terencehill/it_update

Conflicts:
csprogs.dat.it.po
menu.dat.it.po

13 years agoFix centerprint msg occasionally showing again for just 1 frame after it faded out
terencehill [Sat, 3 Sep 2011 16:02:56 +0000 (18:02 +0200)]
Fix centerprint msg occasionally showing again for just 1 frame after it faded out

13 years agoFinnish improved
Rudolf Polzer [Sat, 3 Sep 2011 14:43:28 +0000 (16:43 +0200)]
Finnish improved