]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Samual [Thu, 21 Apr 2011 02:17:54 +0000 (22:17 -0400)]
Merge remote branch 'origin/master' into mirceakitsune/weapon_hagar_secondary_load
Mircea Kitsune [Wed, 20 Apr 2011 15:53:26 +0000 (18:53 +0300)]
Lastly, default the default balance back to what it was, and just comment the defaults. This should make the code ready for merge, as discussed last night on the balance channel.
Mircea Kitsune [Wed, 20 Apr 2011 15:44:21 +0000 (18:44 +0300)]
Always play the beep sound when loading the last rocket, even if we can only load fewer rockets due to lack of ammo. This should perfect the hagar loading to the finest detail of functionality :)
Mircea Kitsune [Wed, 20 Apr 2011 15:09:19 +0000 (18:09 +0300)]
Check both ammos before attempting to switch guns
Mircea Kitsune [Wed, 20 Apr 2011 14:54:47 +0000 (17:54 +0300)]
Default damage to 36. Else primary fire is still too good compared to secondary
Mircea Kitsune [Wed, 20 Apr 2011 14:54:14 +0000 (17:54 +0300)]
Fix issues when hagar is reloadable (now respects weapon load properly)
Rudolf Polzer [Wed, 20 Apr 2011 14:20:20 +0000 (16:20 +0200)]
only do headshot announcer if headshot bonus is > 0
Rudolf Polzer [Wed, 20 Apr 2011 14:03:06 +0000 (16:03 +0200)]
fix scoreboard field widths when translated
Rudolf Polzer [Wed, 20 Apr 2011 13:42:56 +0000 (15:42 +0200)]
fix an obvious typo
Rudolf Polzer [Wed, 20 Apr 2011 13:40:28 +0000 (15:40 +0200)]
more updates to translations
Rudolf Polzer [Wed, 20 Apr 2011 13:36:59 +0000 (15:36 +0200)]
activate csprogs.dat translation for German
Rudolf Polzer [Wed, 20 Apr 2011 13:36:40 +0000 (15:36 +0200)]
more .po updates, csprogs.dat.de.po.disabled done!
Rudolf Polzer [Wed, 20 Apr 2011 12:50:05 +0000 (14:50 +0200)]
German: s/Sie/du/g
Rudolf Polzer [Wed, 20 Apr 2011 12:33:58 +0000 (14:33 +0200)]
more German
Rudolf Polzer [Wed, 20 Apr 2011 12:27:08 +0000 (14:27 +0200)]
fix an annoying spelling mistake
Rudolf Polzer [Wed, 20 Apr 2011 08:53:44 +0000 (10:53 +0200)]
add .pot files too
Rudolf Polzer [Wed, 20 Apr 2011 08:47:42 +0000 (10:47 +0200)]
fix the fuzzy ones
Rudolf Polzer [Wed, 20 Apr 2011 08:44:34 +0000 (10:44 +0200)]
fix another untranslated german string
Rudolf Polzer [Wed, 20 Apr 2011 08:43:55 +0000 (10:43 +0200)]
remove unused entries
Rudolf Polzer [Wed, 20 Apr 2011 08:43:22 +0000 (10:43 +0200)]
update some translation files
mand1nga [Wed, 20 Apr 2011 05:29:52 +0000 (02:29 -0300)]
Merge remote branch 'origin/mand1nga/bot-debug'
mand1nga [Wed, 20 Apr 2011 05:28:02 +0000 (02:28 -0300)]
Merge branch 'master' into mand1nga/bot-debug
mand1nga [Wed, 20 Apr 2011 05:27:58 +0000 (02:27 -0300)]
Added cvar bot_wander_enable
Mircea Kitsune [Tue, 19 Apr 2011 21:56:26 +0000 (00:56 +0300)]
Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
Rudolf Polzer [Tue, 19 Apr 2011 17:03:40 +0000 (19:03 +0200)]
no need to preset g_maplist...
Rudolf Polzer [Tue, 19 Apr 2011 16:37:38 +0000 (18:37 +0200)]
rifle: fix damage calculation for accuracy stats
mand1nga [Tue, 19 Apr 2011 01:41:08 +0000 (22:41 -0300)]
Merge remote branch 'origin/mirceakitsune/multijump_fix'
mand1nga [Tue, 19 Apr 2011 01:37:40 +0000 (22:37 -0300)]
Merge remote branch 'origin/mand1nga/bot-debug'
mand1nga [Tue, 19 Apr 2011 01:36:26 +0000 (22:36 -0300)]
Merge branch 'master' into mand1nga/bot-debug
mand1nga [Tue, 19 Apr 2011 01:16:51 +0000 (22:16 -0300)]
Added cvar bot_debug_goalstack to visualize the path that each bot is trying to follow
mand1nga [Tue, 19 Apr 2011 01:01:21 +0000 (22:01 -0300)]
Added cvar bot_debug_tracewalk to enable visual indicators for short-term navigation
Rudolf Polzer [Mon, 18 Apr 2011 19:41:23 +0000 (21:41 +0200)]
rifle code: make it have a _shots cvar too
Rudolf Polzer [Sun, 17 Apr 2011 18:32:33 +0000 (20:32 +0200)]
add more checkfails
Rudolf Polzer [Fri, 15 Apr 2011 14:36:46 +0000 (16:36 +0200)]
remove some unused functions; add "checkfail" logic with some example checks one can do
Mircea Kitsune [Thu, 14 Apr 2011 11:42:51 +0000 (14:42 +0300)]
Fix an issue with the multijump code that caused infinite multi-jumps not to work (setting g_multijump to -1).
mand1nga [Wed, 13 Apr 2011 14:37:01 +0000 (11:37 -0300)]
Merge remote branch 'origin/mand1nga/bot-misc-fixes'
Mircea Kitsune [Tue, 12 Apr 2011 23:35:33 +0000 (02:35 +0300)]
Disable the load block in WR_SETUP, to prevent a minor possible inconvenience
Mircea Kitsune [Tue, 12 Apr 2011 23:31:49 +0000 (02:31 +0300)]
Remove the WR_DROP weapon_action, now that it's not needed any more. I don't know how safe that was, nor believe it has any real utility now.
Mircea Kitsune [Tue, 12 Apr 2011 23:20:22 +0000 (02:20 +0300)]
More correct sorting
Mircea Kitsune [Tue, 12 Apr 2011 23:17:13 +0000 (02:17 +0300)]
Actually, create a weapon independent function that forbids the player to change their weapon (drop or switch to another) while active. Can once again be used for other weapons and reasons.
Mircea Kitsune [Tue, 12 Apr 2011 23:08:31 +0000 (02:08 +0300)]
Actually, forbid throwing the hagar at all while loading it!
Mircea Kitsune [Tue, 12 Apr 2011 23:04:23 +0000 (02:04 +0300)]
Further secure dropping while loading, and also create a WR_DROP event for weapons, which can be useful
Mircea Kitsune [Tue, 12 Apr 2011 22:56:53 +0000 (01:56 +0300)]
Fix giving back ammo to the player if they drop the weapon while loading. This code should also secure against other possible issues I think.
Mircea Kitsune [Tue, 12 Apr 2011 22:47:39 +0000 (01:47 +0300)]
Fix a bug with dropping the hagar while loading it. You still lose the ammo though, which needs to be fixed too
Mircea Kitsune [Tue, 12 Apr 2011 22:44:01 +0000 (01:44 +0300)]
Reduce now useless ammo checking code
Mircea Kitsune [Tue, 12 Apr 2011 22:39:20 +0000 (01:39 +0300)]
Fix ammo checks, all works properly again
Mircea Kitsune [Tue, 12 Apr 2011 22:16:45 +0000 (01:16 +0300)]
Decrease ammo with each rocket we load, and not suddenly when firing. If the loading is aborted, the ammo is then given back to the player (unless he dies).
Mircea Kitsune [Tue, 12 Apr 2011 20:35:08 +0000 (23:35 +0300)]
Cvar the feature of releasing loaded rockets upon death
Mircea Kitsune [Tue, 12 Apr 2011 20:29:46 +0000 (23:29 +0300)]
Release loaded rockets when the player dies
Mircea Kitsune [Tue, 12 Apr 2011 20:25:01 +0000 (23:25 +0300)]
Move the releasing of loaded rockets in its own function.
Mircea Kitsune [Tue, 12 Apr 2011 20:12:07 +0000 (23:12 +0300)]
Implement a new weapon check called WR_PLAYERDEATH. It will be used in the hagar code to make players release the rockets they have loaded when they die.
Mircea Kitsune [Tue, 12 Apr 2011 17:18:40 +0000 (20:18 +0300)]
Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
Jakob MG [Tue, 12 Apr 2011 17:14:12 +0000 (19:14 +0200)]
Merge remote-tracking branch 'origin/samual/balance'
Mircea Kitsune [Tue, 12 Apr 2011 17:13:01 +0000 (20:13 +0300)]
Don't allow switching to another weapon if we're loading rockets into the hagar
Mircea Kitsune [Tue, 12 Apr 2011 16:56:13 +0000 (19:56 +0300)]
Also use the beep sound when aborting loading.
Mircea Kitsune [Tue, 12 Apr 2011 16:54:10 +0000 (19:54 +0300)]
Higher pitch beep sound
Mircea Kitsune [Tue, 12 Apr 2011 16:52:26 +0000 (19:52 +0300)]
Play the beep sound when the last rocket is loaded, to notify the player of that. Idea by FruitieX
Mircea Kitsune [Tue, 12 Apr 2011 16:48:19 +0000 (19:48 +0300)]
Hagar beep, sound file
Mircea Kitsune [Tue, 12 Apr 2011 16:39:49 +0000 (19:39 +0300)]
Cvar the abort feature
Mircea Kitsune [Tue, 12 Apr 2011 16:32:53 +0000 (19:32 +0300)]
Pause until we can load rockets again, once we re-press the alt fire button
Mircea Kitsune [Tue, 12 Apr 2011 16:29:48 +0000 (19:29 +0300)]
Rename stuff in the code
Mircea Kitsune [Tue, 12 Apr 2011 16:27:53 +0000 (19:27 +0300)]
Another change to the buttons, making them work much better
Mircea Kitsune [Tue, 12 Apr 2011 16:12:59 +0000 (19:12 +0300)]
Another minor code sorting to the button checks
Samual [Tue, 12 Apr 2011 16:11:37 +0000 (12:11 -0400)]
Slightly less rotlinear so that your health/armor doesn't TOTALLY disappear instantly.
Mircea Kitsune [Tue, 12 Apr 2011 16:07:58 +0000 (19:07 +0300)]
Further improve that last check, and make sure it does run each frame all the time (unless the feature is disabled or reloading is blocking it)
Mircea Kitsune [Tue, 12 Apr 2011 15:57:14 +0000 (18:57 +0300)]
Improve how firing buttons are checked
Mircea Kitsune [Tue, 12 Apr 2011 15:43:24 +0000 (18:43 +0300)]
Require letting go of both firing buttons before we can load again, if we abort with primary fire
Mircea Kitsune [Tue, 12 Apr 2011 15:34:39 +0000 (18:34 +0300)]
Allow primary fire button to abort loading if clicking it while holding secondary down to load. Not ready yet.
Mircea Kitsune [Tue, 12 Apr 2011 15:15:46 +0000 (18:15 +0300)]
Also apply a loading brake after the last rocket has been loaded, rather than firing it instantly, as discussed with FruitieX
Mircea Kitsune [Tue, 12 Apr 2011 14:52:11 +0000 (17:52 +0300)]
Bump secondary push to 160
Mircea Kitsune [Tue, 12 Apr 2011 14:26:38 +0000 (17:26 +0300)]
Bump default damage up to 32. 20 is way too useless, and everyone would just use primary instead (might need to be even higher than this eventually)
Mircea Kitsune [Mon, 11 Apr 2011 22:21:53 +0000 (01:21 +0300)]
Revert that last change, as it cannot check for ammo any longer.
Mircea Kitsune [Mon, 11 Apr 2011 22:16:28 +0000 (01:16 +0300)]
If no loading speed is set, fill in all the rockets at once. Might be a better and safer behavior.
Mircea Kitsune [Mon, 11 Apr 2011 21:50:30 +0000 (00:50 +0300)]
Change the default load speed in all balances.
Mircea Kitsune [Mon, 11 Apr 2011 21:49:57 +0000 (00:49 +0300)]
And a refire of 0.8 however
Mircea Kitsune [Mon, 11 Apr 2011 21:47:24 +0000 (00:47 +0300)]
Faster rocket loading speed with slightly less damage
Mircea Kitsune [Mon, 11 Apr 2011 21:44:27 +0000 (00:44 +0300)]
A bit lower pitch though
Mircea Kitsune [Mon, 11 Apr 2011 21:43:27 +0000 (00:43 +0300)]
Make the sound faster, so it can match faster loading speeds like 0.6. Xonotic is too fast-paced for rocket loading speed to be 1.
Mircea Kitsune [Mon, 11 Apr 2011 21:17:51 +0000 (00:17 +0300)]
Bump damage from 22 to 24. It's much better practically.
Mircea Kitsune [Mon, 11 Apr 2011 21:01:37 +0000 (00:01 +0300)]
Remove an useless code
Mircea Kitsune [Mon, 11 Apr 2011 20:19:20 +0000 (23:19 +0300)]
Rename something in the code
Mircea Kitsune [Mon, 11 Apr 2011 20:06:28 +0000 (23:06 +0300)]
Default refire to 0.6, while leaving rocket loading speed at 1.
Mircea Kitsune [Mon, 11 Apr 2011 20:03:52 +0000 (23:03 +0300)]
Use a different cvar for rocket loading speed than refire. So the delay after the weapon fires (and may fire again) is different than the speed rockets are loaded with.
Mircea Kitsune [Mon, 11 Apr 2011 20:00:38 +0000 (23:00 +0300)]
OMG, forgot the firing animation *beats self*
Mircea Kitsune [Mon, 11 Apr 2011 19:55:01 +0000 (22:55 +0300)]
Also update the reload delay when firing, to add a forced pause that was missing
Mircea Kitsune [Mon, 11 Apr 2011 19:51:47 +0000 (22:51 +0300)]
Add some weapon firing functions that are prolly important.
Mircea Kitsune [Mon, 11 Apr 2011 19:38:09 +0000 (22:38 +0300)]
Rename some cvars
Mircea Kitsune [Mon, 11 Apr 2011 16:35:51 +0000 (19:35 +0300)]
Bump rocket damage up to 22. Don't worry, it doesn't really do that much damage, and this seems like a good balancing from my tests. With this, I declare the code ready for testing, and finding any existing bugs. Otherwise, it is ready.
Mircea Kitsune [Mon, 11 Apr 2011 16:22:34 +0000 (19:22 +0300)]
Add the correct .use function, fixes damage value
Mircea Kitsune [Mon, 11 Apr 2011 16:05:38 +0000 (19:05 +0300)]
Use the normal secondary spread cvar
Mircea Kitsune [Mon, 11 Apr 2011 16:01:56 +0000 (19:01 +0300)]
A bit more spread and much more damage (as it's unlikely for all 4 rockets to hit someone full-on).
Mircea Kitsune [Mon, 11 Apr 2011 15:50:30 +0000 (18:50 +0300)]
Code comments and cleanups
Mircea Kitsune [Mon, 11 Apr 2011 15:34:04 +0000 (18:34 +0300)]
Force switch to another weapon when out of ammo (needs to be done separately here)
Mircea Kitsune [Mon, 11 Apr 2011 15:27:05 +0000 (18:27 +0300)]
Release the rockets we loaded so far if canhold is disabled and we ran out of ammo, even if we didn't reach maximum amount.
Mircea Kitsune [Mon, 11 Apr 2011 15:24:26 +0000 (18:24 +0300)]
Make sure we have enough ammo for all the rockets we are about to load. If not, stop loading rockets when running out of ammo (or weapon load, when the hagar is set reloadable).
Mircea Kitsune [Mon, 11 Apr 2011 14:52:37 +0000 (17:52 +0300)]
Add cvars to all balances, so Samual won't kill me :P Disabled by default in all but the default balance, as it's for the owners of these balances to decide to tweak it. Also increase default spread a tiny bit.
Mircea Kitsune [Mon, 11 Apr 2011 14:23:30 +0000 (17:23 +0300)]
No need to keep the fully loaded status a global any more
Mircea Kitsune [Mon, 11 Apr 2011 14:19:23 +0000 (17:19 +0300)]
Add a canhold cvar. When enabled, reaching the maximum number of rockets will allow you to hold your hagar without auto-firing it. Else when the hagar is fully loaded, it discharges automatically. Currently disabled by default.
Mircea Kitsune [Mon, 11 Apr 2011 14:05:04 +0000 (17:05 +0300)]
5 sounds like an ok value for rocket damage
Mircea Kitsune [Mon, 11 Apr 2011 14:02:37 +0000 (17:02 +0300)]
Way lower damage, now that we fire 4 rockets at a time (max). lower each rocket's damage from 14 to 4. Better balancing can be decided later in time though.