]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Samual Lenks [Sat, 29 Jun 2013 03:54:20 +0000 (23:54 -0400)]
Rename weapon_action to WEP_ACTION
Samual Lenks [Sat, 29 Jun 2013 03:32:26 +0000 (23:32 -0400)]
Move hitplot stuff into a separate file
Samual Lenks [Sat, 29 Jun 2013 02:32:55 +0000 (22:32 -0400)]
Macro macro macro macro macro macro
Samual Lenks [Fri, 28 Jun 2013 22:22:28 +0000 (18:22 -0400)]
Being macro-izing more things :D
Samual Lenks [Fri, 28 Jun 2013 22:05:26 +0000 (18:05 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons
Conflicts:
qcsrc/server/t_items.qc
Rudolf Polzer [Sun, 23 Jun 2013 16:44:39 +0000 (18:44 +0200)]
hide qccversion files
Rudolf Polzer [Sun, 23 Jun 2013 16:42:34 +0000 (18:42 +0200)]
oops, don't call --version that often
Rudolf Polzer [Sun, 23 Jun 2013 16:41:33 +0000 (18:41 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sun, 23 Jun 2013 16:41:19 +0000 (18:41 +0200)]
rebuild on new gmqcc version
Rudolf Polzer [Sun, 23 Jun 2013 16:22:56 +0000 (18:22 +0200)]
try fixing compile
Rudolf Polzer [Sun, 23 Jun 2013 15:45:05 +0000 (17:45 +0200)]
Merge branch 'divVerent/simplified-sound-sliders'
Rudolf Polzer [Sun, 23 Jun 2013 15:42:05 +0000 (17:42 +0200)]
finally forbid mutator blocked guns
Rudolf Polzer [Fri, 21 Jun 2013 17:56:32 +0000 (19:56 +0200)]
set value steps to 0.1 and 1; menu_snd_sliderstep now is 2 (0..10 scale)
Rudolf Polzer [Wed, 19 Jun 2013 11:53:24 +0000 (13:53 +0200)]
add a second percent scale, 3 (slider size percent, having nothing to do with real percent)
Matthias Krüger [Sun, 16 Jun 2013 16:27:22 +0000 (18:27 +0200)]
Merge branch 'master' into matthiaskrgr/gitignore
Samual Lenks [Sun, 16 Jun 2013 02:23:35 +0000 (22:23 -0400)]
Try CTF respawn delay of 5 seconds
Samual Lenks [Sun, 16 Jun 2013 01:57:25 +0000 (21:57 -0400)]
Add WEAPONTODO comments for some stuff I need to take care of later
Mario [Sat, 15 Jun 2013 09:51:31 +0000 (19:51 +1000)]
Move crylink to the new cvar system
Mario [Sat, 15 Jun 2013 08:54:41 +0000 (18:54 +1000)]
Move nex to the new cvar system
Samual Lenks [Sat, 15 Jun 2013 08:03:44 +0000 (04:03 -0400)]
Don't forget to add this to precache when moving weapons to new cvars
Samual Lenks [Sat, 15 Jun 2013 08:02:19 +0000 (04:02 -0400)]
Partly fix compile (BUT WAIT, THERE'S MORE! :D)
Samual Lenks [Sat, 15 Jun 2013 07:12:22 +0000 (03:12 -0400)]
Why does this crash gmqcc?
Samual Lenks [Sat, 15 Jun 2013 06:35:28 +0000 (02:35 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)]
Merge remote-tracking branch 'origin/ablu/bumblebeefix'
Samual Lenks [Sat, 15 Jun 2013 06:14:14 +0000 (02:14 -0400)]
Merge remote-tracking branch 'origin/ablu/vehiclestrengthfix'
Samual Lenks [Sat, 15 Jun 2013 06:13:40 +0000 (02:13 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/simplified-sound-sliders
Erik Schilling [Fri, 14 Jun 2013 18:51:14 +0000 (20:51 +0200)]
Fixed infinite strength in vehicle
Fixes: #1322.
Erik Schilling [Fri, 14 Jun 2013 18:12:05 +0000 (20:12 +0200)]
Removed commented out code
If somebody needs it is is in git history anyway.
Erik Schilling [Fri, 14 Jun 2013 18:11:44 +0000 (20:11 +0200)]
Do not leave a heal beam if pilot exits the bumblebee
Samual Lenks [Fri, 14 Jun 2013 01:13:18 +0000 (21:13 -0400)]
Compromise: Try decreasing Nex raise switchdelay
Samual Lenks [Fri, 14 Jun 2013 00:43:43 +0000 (20:43 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Fri, 14 Jun 2013 00:43:02 +0000 (20:43 -0400)]
Haha, forgot to add this previously
Matthias Krüger [Thu, 13 Jun 2013 20:45:14 +0000 (22:45 +0200)]
Merge branch 'master' into matthiaskrgr/gitignore
Rudolf Polzer [Wed, 12 Jun 2013 11:54:14 +0000 (13:54 +0200)]
add unit test for decibels slider
Rudolf Polzer [Wed, 12 Jun 2013 11:53:50 +0000 (13:53 +0200)]
Merge branch 'master' into divVerent/simplified-sound-sliders
Rudolf Polzer [Wed, 12 Jun 2013 11:52:57 +0000 (13:52 +0200)]
add a simple (yet unused) unit test framework.
Functions starting with _TEST_ are unit tests, shall call TEST_OK() at the end, and TEST_Check(condition) to test conditions.
Rudolf Polzer [Wed, 12 Jun 2013 09:53:52 +0000 (11:53 +0200)]
decibel sliders: far left means zero (linear scaled part); menu_snd_sliderscale changes display of volume values
Samual Lenks [Tue, 11 Jun 2013 20:14:04 +0000 (16:14 -0400)]
Working on cleaning up weapon spawn functions
Samual Lenks [Tue, 11 Jun 2013 18:27:23 +0000 (14:27 -0400)]
Spawnfunc stuffz
Samual Lenks [Tue, 11 Jun 2013 07:51:42 +0000 (03:51 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons
Conflicts:
qcsrc/server/attic/monsters/monster_zombie.qc
Mario [Tue, 11 Jun 2013 07:46:34 +0000 (17:46 +1000)]
Replace if statements with switches in the weapon request functions
Samual Lenks [Tue, 11 Jun 2013 07:12:55 +0000 (03:12 -0400)]
Delete the "attic" folder-- we have git history for a reason, no need for
this folder to remain in master
Samual Lenks [Tue, 11 Jun 2013 06:27:15 +0000 (02:27 -0400)]
Now make the Devastator compile and run (mostly)
Samual Lenks [Tue, 11 Jun 2013 05:00:28 +0000 (01:00 -0400)]
Continue working on moving Rocketlauncher to Devastator name
Samual Lenks [Tue, 11 Jun 2013 03:03:28 +0000 (23:03 -0400)]
Switch the code ENTIRELY to use "Arc" instead of "Lightning" for the name
Samual Lenks [Tue, 11 Jun 2013 02:33:59 +0000 (22:33 -0400)]
Now lets move the switchdelay property over to use new property system
Samual Lenks [Tue, 11 Jun 2013 02:02:35 +0000 (22:02 -0400)]
Start working on a new (independent) way to handle cvars for weapons
Samual Lenks [Tue, 11 Jun 2013 00:18:21 +0000 (20:18 -0400)]
Remove individual weapon.qh files, make it compile
Samual Lenks [Tue, 11 Jun 2013 00:04:06 +0000 (20:04 -0400)]
On second thought, add those prefixes back, it helps a bit
Samual Lenks [Mon, 10 Jun 2013 23:57:20 +0000 (19:57 -0400)]
More cleanup...
Samual Lenks [Mon, 10 Jun 2013 23:22:05 +0000 (19:22 -0400)]
More cleanup, make it compile now
Samual Lenks [Mon, 10 Jun 2013 21:53:20 +0000 (17:53 -0400)]
Being renaming weapons
Samual Lenks [Mon, 10 Jun 2013 21:44:59 +0000 (17:44 -0400)]
Remove the w_ prefix from weapon files in their directory
Samual Lenks [Mon, 10 Jun 2013 18:40:46 +0000 (14:40 -0400)]
Even more proper naming/cleanup
Samual Lenks [Mon, 10 Jun 2013 18:35:28 +0000 (14:35 -0400)]
Move projectile handling to new folder as well
Samual Lenks [Mon, 10 Jun 2013 05:33:06 +0000 (01:33 -0400)]
Working on moving the weapon files to proper directories (plus cleanup)
Samual Lenks [Mon, 10 Jun 2013 03:56:52 +0000 (23:56 -0400)]
Fix the registration of LG
Samual Lenks [Mon, 10 Jun 2013 03:01:50 +0000 (23:01 -0400)]
Make it compile
Samual Lenks [Mon, 10 Jun 2013 02:00:33 +0000 (22:00 -0400)]
deprecate the other balance configs so I can do development more quickly
Samual Lenks [Mon, 10 Jun 2013 01:56:24 +0000 (21:56 -0400)]
Merge remote-tracking branch 'origin/samual/spawn_weapons' into samual/weapons
Conflicts:
balanceXPM.cfg
balanceXonotic.cfg
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/hook.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/progs.src
Samual Lenks [Mon, 10 Jun 2013 01:46:57 +0000 (21:46 -0400)]
Merge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons
Samual Lenks [Mon, 10 Jun 2013 01:24:23 +0000 (21:24 -0400)]
Merge remote-tracking branch 'origin/master' into samual/lightning_gun
Conflicts:
balanceLeeStricklin.cfg
balanceXonotic.cfg
qcsrc/client/hook.qc
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
Samual Lenks [Mon, 10 Jun 2013 01:11:09 +0000 (21:11 -0400)]
Merge remote-tracking branch 'origin/samual/gameplay'
Samual Lenks [Mon, 10 Jun 2013 01:09:40 +0000 (21:09 -0400)]
Make XPM match default weapons too
Samual Lenks [Mon, 10 Jun 2013 01:06:24 +0000 (21:06 -0400)]
Remove whitespace
Samual Lenks [Mon, 10 Jun 2013 00:37:58 +0000 (20:37 -0400)]
Fix crash
Samual Lenks [Mon, 10 Jun 2013 00:32:18 +0000 (20:32 -0400)]
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
Conflicts:
balance25.cfg
balanceFruitieX.cfg
balanceXPM.cfg
balanceXonotic.cfg
effectinfo.txt
qcsrc/common/constants.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/g_damage.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc
Matthias Krüger [Sun, 9 Jun 2013 07:22:21 +0000 (09:22 +0200)]
Merge branch 'master' into matthiaskrgr/gitignore
Samual Lenks [Thu, 6 Jun 2013 03:59:27 +0000 (23:59 -0400)]
Revert part of the laser force increase back to normal
Samual Lenks [Thu, 6 Jun 2013 00:36:04 +0000 (20:36 -0400)]
Some updates from a bit of playtesting
Samual Lenks [Wed, 5 Jun 2013 04:19:15 +0000 (00:19 -0400)]
Increase rocket force 400->450
Samual Lenks [Wed, 5 Jun 2013 04:18:40 +0000 (00:18 -0400)]
Increase Hagar speed, 2200->2500
Samual Lenks [Wed, 5 Jun 2013 04:17:04 +0000 (00:17 -0400)]
Double the negative force on Crylink secondary (great for movement)
Samual Lenks [Wed, 5 Jun 2013 04:16:40 +0000 (00:16 -0400)]
Increase Laser force
Samual Lenks [Wed, 5 Jun 2013 04:12:41 +0000 (00:12 -0400)]
Working on a new physics config for Xonotic-
Increase jump length (keeping same jump height of 111.48qu)
Decrease friction
Decrease air strafe acceleration
Remove aircontrol penalty
Increase stepheight
Samual Lenks [Wed, 5 Jun 2013 00:18:15 +0000 (20:18 -0400)]
Limit maximum length of vote commands to 160 by default
Samual Lenks [Wed, 5 Jun 2013 00:01:33 +0000 (20:01 -0400)]
List percentage completion for the languages in the list
Samual Lenks [Tue, 4 Jun 2013 23:55:02 +0000 (19:55 -0400)]
Final update of language files for 0.7
Samual Lenks [Tue, 4 Jun 2013 23:03:05 +0000 (19:03 -0400)]
Fix some translation problems in notification system
Samual Lenks [Tue, 4 Jun 2013 22:02:43 +0000 (18:02 -0400)]
Update po template
Samual Lenks [Tue, 4 Jun 2013 21:51:48 +0000 (17:51 -0400)]
Update translations from Pootle
Samual Lenks [Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)]
Merge remote-tracking branch 'origin/Mario/extralives_fix'
Mario [Tue, 4 Jun 2013 19:53:26 +0000 (05:53 +1000)]
Add a comment to ForbidThrowing
Mario [Tue, 4 Jun 2013 19:44:11 +0000 (05:44 +1000)]
Remove a useless health check
Mario [Tue, 4 Jun 2013 19:40:52 +0000 (05:40 +1000)]
Fix player not dying from lack of ammo if they have extra lives
Samual Lenks [Tue, 4 Jun 2013 19:20:14 +0000 (15:20 -0400)]
Merge remote-tracking branch 'origin/Mario/minstagib_powerups_fix'
Samual Lenks [Tue, 4 Jun 2013 18:55:48 +0000 (14:55 -0400)]
Remove translated credits (for now, later we'll have another way to do
this)
Samual Lenks [Tue, 4 Jun 2013 18:52:10 +0000 (14:52 -0400)]
Updated credits file by Mirio and me
Samual Lenks [Mon, 3 Jun 2013 23:32:42 +0000 (19:32 -0400)]
Internal errors should NOT be translated (part 2)
Samual Lenks [Mon, 3 Jun 2013 23:07:47 +0000 (19:07 -0400)]
Internal errors are NOT to be translated
Samual Lenks [Mon, 3 Jun 2013 23:04:40 +0000 (19:04 -0400)]
Change the netname back so that it can be displayed where needed
Samual Lenks [Mon, 3 Jun 2013 23:00:36 +0000 (19:00 -0400)]
Comment out the debug prints for panel background
Samual Lenks [Mon, 3 Jun 2013 22:57:23 +0000 (18:57 -0400)]
Merge remote-tracking branch 'origin/terencehill/hud_crash_fix'
Samual Lenks [Mon, 3 Jun 2013 17:49:34 +0000 (13:49 -0400)]
Whoops, we need to seta that in defaultXonotic.cfg
Samual Lenks [Mon, 3 Jun 2013 07:51:39 +0000 (03:51 -0400)]
Update the rest of the .po files now so it matches Pootle
Samual Lenks [Mon, 3 Jun 2013 06:58:29 +0000 (02:58 -0400)]
That's not a normal ascii character :P evil :P
Samual Lenks [Mon, 3 Jun 2013 06:29:23 +0000 (02:29 -0400)]
Update against template
Samual Lenks [Mon, 3 Jun 2013 06:15:25 +0000 (02:15 -0400)]
Update German translation .po files
Samual Lenks [Sun, 2 Jun 2013 16:50:23 +0000 (12:50 -0400)]
Update translation templates
Samual Lenks [Sun, 2 Jun 2013 04:52:29 +0000 (00:52 -0400)]
Clean up notifications code a little bit