]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Matthias Krüger [Sun, 23 Jun 2013 20:47:53 +0000 (22:47 +0200)]
Merge branch 'master' into matthiaskrgr/screenshotcmd
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 [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
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 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 [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
Matthias Krüger [Sun, 9 Jun 2013 21:27:25 +0000 (23:27 +0200)]
try to fix some stuff
Matthias Krüger [Sun, 9 Jun 2013 21:15:10 +0000 (23:15 +0200)]
commands: first attempt to implement a simple "plain screenshot" command
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
Samual Lenks [Sun, 2 Jun 2013 03:38:15 +0000 (23:38 -0400)]
Disable debug in notification system now for 0.7
Matthias Krüger [Sat, 1 Jun 2013 22:13:59 +0000 (00:13 +0200)]
gitignore: ignore .lno files.
Samual Lenks [Sat, 1 Jun 2013 19:47:42 +0000 (15:47 -0400)]
Merge remote-tracking branch 'origin/zykure/teamscores'
Jan Behrens [Sat, 1 Jun 2013 17:22:32 +0000 (19:22 +0200)]
fix db-key bug in PlayerStats_TeamScore()
terencehill [Sat, 1 Jun 2013 14:09:33 +0000 (16:09 +0200)]
Workaround for occasional crashes caused by the hud code (please test)
Samual Lenks [Sat, 1 Jun 2013 05:07:04 +0000 (01:07 -0400)]
Merge remote-tracking branch 'origin/samual/fix_deathfade'
Samual Lenks [Sat, 1 Jun 2013 04:16:43 +0000 (00:16 -0400)]
Last thing to clean up, I swear
Samual Lenks [Sat, 1 Jun 2013 04:13:30 +0000 (00:13 -0400)]
Even more cleanup :D
Samual Lenks [Sat, 1 Jun 2013 04:10:37 +0000 (00:10 -0400)]
More cleanup
Samual Lenks [Sat, 1 Jun 2013 04:08:37 +0000 (00:08 -0400)]
A bit of clean up, plus make it ACTUALLY work properly
Samual Lenks [Sat, 1 Jun 2013 03:32:37 +0000 (23:32 -0400)]
Try and unify the color selection code for csqcmodels
Samual Lenks [Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)]
Merge remote-tracking branch 'origin/master' into samual/fix_deathfade
Samual Lenks [Fri, 31 May 2013 22:27:05 +0000 (18:27 -0400)]
Merge remote-tracking branch 'origin/zykure/teamscores'
Samual Lenks [Fri, 31 May 2013 22:26:31 +0000 (18:26 -0400)]
Bump spec version for playerstats
Samual Lenks [Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)]
Merge remote-tracking branch 'origin/master' into zykure/teamscores
Samual Lenks [Fri, 31 May 2013 17:25:47 +0000 (13:25 -0400)]
fix something
Samual Lenks [Fri, 31 May 2013 17:14:42 +0000 (13:14 -0400)]
Fix some !STRING usage
Samual Lenks [Fri, 31 May 2013 16:45:19 +0000 (12:45 -0400)]
Until we get actually nice loading screens, revert back to only one
Samual Lenks [Fri, 31 May 2013 16:35:49 +0000 (12:35 -0400)]
Out portal is blue, not red
Samual Lenks [Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)]
Merge remote-tracking branch 'origin/samual/update_effects_tab'
Samual Lenks [Fri, 31 May 2013 15:52:22 +0000 (11:52 -0400)]
Move that into effects configs
Samual Lenks [Fri, 31 May 2013 15:33:10 +0000 (11:33 -0400)]
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab
Samual Lenks [Fri, 31 May 2013 15:29:12 +0000 (11:29 -0400)]
Merge remote-tracking branch 'origin/samual/updatecommands'
Samual Lenks [Fri, 31 May 2013 15:28:20 +0000 (11:28 -0400)]
Add the proper aliases for the commands
Samual Lenks [Fri, 31 May 2013 15:23:18 +0000 (11:23 -0400)]
Merge remote-tracking branch 'origin/master' into samual/updatecommands
Samual Lenks [Fri, 31 May 2013 15:17:28 +0000 (11:17 -0400)]
Bump Xonotic version to 0.7.0
Samual Lenks [Fri, 31 May 2013 01:55:59 +0000 (21:55 -0400)]
Use the proper indication for swedish .po file
Samual Lenks [Fri, 31 May 2013 01:48:28 +0000 (21:48 -0400)]
Also spacing
Samual Lenks [Fri, 31 May 2013 01:46:51 +0000 (21:46 -0400)]
Long line to shorter line
Samual Lenks [Thu, 30 May 2013 21:04:41 +0000 (17:04 -0400)]
That should be UTF-8 in thar.
Samual Lenks [Thu, 30 May 2013 17:56:40 +0000 (13:56 -0400)]
Whoops, forgot to update those gentle strings with new args. fixes #1597
Samual Lenks [Thu, 30 May 2013 17:15:42 +0000 (13:15 -0400)]
./check-translations.sh pot
Mario [Thu, 30 May 2013 07:23:08 +0000 (17:23 +1000)]
Fix unable to pickup powerups in minstagib, fixes #1575
Samual Lenks [Tue, 28 May 2013 20:21:14 +0000 (16:21 -0400)]
Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
Samual Lenks [Tue, 28 May 2013 20:20:12 +0000 (16:20 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_mouse_jump_fix'
terencehill [Sun, 26 May 2013 10:32:26 +0000 (12:32 +0200)]
If the menu gets closed do not update mouse position: it prevents mouse jumping to '0 0 0' when menu is fading out
terencehill [Fri, 24 May 2013 17:04:05 +0000 (19:04 +0200)]
Prevent a crash (infinite loop) calling the command vote help help
terencehill [Fri, 24 May 2013 16:17:57 +0000 (18:17 +0200)]
Fix trace command