]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agoMerge branch 'master' into terencehill/hud_code_cleanup
terencehill [Sun, 16 Jun 2013 15:00:06 +0000 (17:00 +0200)]
Merge branch 'master' into terencehill/hud_code_cleanup

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh

11 years agoCompromise: Try decreasing Nex raise switchdelay
Samual Lenks [Fri, 14 Jun 2013 01:13:18 +0000 (21:13 -0400)]
Compromise: Try decreasing Nex raise switchdelay

11 years agoadd a simple (yet unused) unit test framework.
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.

11 years agoDelete the "attic" folder-- we have git history for a reason, no need for
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

11 years agoMerge remote-tracking branch 'origin/samual/gameplay'
Samual Lenks [Mon, 10 Jun 2013 01:11:09 +0000 (21:11 -0400)]
Merge remote-tracking branch 'origin/samual/gameplay'

11 years agoMake XPM match default weapons too
Samual Lenks [Mon, 10 Jun 2013 01:09:40 +0000 (21:09 -0400)]
Make XPM match default weapons too

11 years agoRevert part of the laser force increase back to normal
Samual Lenks [Thu, 6 Jun 2013 03:59:27 +0000 (23:59 -0400)]
Revert part of the laser force increase back to normal

11 years agoSome updates from a bit of playtesting
Samual Lenks [Thu, 6 Jun 2013 00:36:04 +0000 (20:36 -0400)]
Some updates from a bit of playtesting

11 years agoIncrease rocket force 400->450
Samual Lenks [Wed, 5 Jun 2013 04:19:15 +0000 (00:19 -0400)]
Increase rocket force 400->450

11 years agoIncrease Hagar speed, 2200->2500
Samual Lenks [Wed, 5 Jun 2013 04:18:40 +0000 (00:18 -0400)]
Increase Hagar speed, 2200->2500

11 years agoDouble the negative force on Crylink secondary (great for movement)
Samual Lenks [Wed, 5 Jun 2013 04:17:04 +0000 (00:17 -0400)]
Double the negative force on Crylink secondary (great for movement)

11 years agoIncrease Laser force
Samual Lenks [Wed, 5 Jun 2013 04:16:40 +0000 (00:16 -0400)]
Increase Laser force

11 years agoWorking on a new physics config for Xonotic-
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

11 years agoLimit maximum length of vote commands to 160 by default xonotic-v0.7.0
Samual Lenks [Wed, 5 Jun 2013 00:18:15 +0000 (20:18 -0400)]
Limit maximum length of vote commands to 160 by default

11 years agoList percentage completion for the languages in the list
Samual Lenks [Wed, 5 Jun 2013 00:01:33 +0000 (20:01 -0400)]
List percentage completion for the languages in the list

11 years agoFinal update of language files for 0.7
Samual Lenks [Tue, 4 Jun 2013 23:55:02 +0000 (19:55 -0400)]
Final update of language files for 0.7

11 years agoFix some translation problems in notification system
Samual Lenks [Tue, 4 Jun 2013 23:03:05 +0000 (19:03 -0400)]
Fix some translation problems in notification system

11 years agoUpdate po template
Samual Lenks [Tue, 4 Jun 2013 22:02:43 +0000 (18:02 -0400)]
Update po template

11 years agoUpdate translations from Pootle
Samual Lenks [Tue, 4 Jun 2013 21:51:48 +0000 (17:51 -0400)]
Update translations from Pootle

11 years agoMerge remote-tracking branch 'origin/Mario/extralives_fix'
Samual Lenks [Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)]
Merge remote-tracking branch 'origin/Mario/extralives_fix'

11 years agoAdd a comment to ForbidThrowing
Mario [Tue, 4 Jun 2013 19:53:26 +0000 (05:53 +1000)]
Add a comment to ForbidThrowing

11 years agoRemove a useless health check
Mario [Tue, 4 Jun 2013 19:44:11 +0000 (05:44 +1000)]
Remove a useless health check

11 years agoFix player not dying from lack of ammo if they have extra lives
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

11 years agoMerge remote-tracking branch 'origin/Mario/minstagib_powerups_fix'
Samual Lenks [Tue, 4 Jun 2013 19:20:14 +0000 (15:20 -0400)]
Merge remote-tracking branch 'origin/Mario/minstagib_powerups_fix'

11 years agoRemove translated credits (for now, later we'll have another way to do
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)

11 years agoUpdated credits file by Mirio and me
Samual Lenks [Tue, 4 Jun 2013 18:52:10 +0000 (14:52 -0400)]
Updated credits file by Mirio and me

11 years agoInternal errors should NOT be translated (part 2)
Samual Lenks [Mon, 3 Jun 2013 23:32:42 +0000 (19:32 -0400)]
Internal errors should NOT be translated (part 2)

11 years agoInternal errors are NOT to be translated
Samual Lenks [Mon, 3 Jun 2013 23:07:47 +0000 (19:07 -0400)]
Internal errors are NOT to be translated

11 years agoChange the netname back so that it can be displayed where needed
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

11 years agoComment out the debug prints for panel background
Samual Lenks [Mon, 3 Jun 2013 23:00:36 +0000 (19:00 -0400)]
Comment out the debug prints for panel background

11 years agoMerge remote-tracking branch 'origin/terencehill/hud_crash_fix'
Samual Lenks [Mon, 3 Jun 2013 22:57:23 +0000 (18:57 -0400)]
Merge remote-tracking branch 'origin/terencehill/hud_crash_fix'

11 years agoWhoops, we need to seta that in defaultXonotic.cfg
Samual Lenks [Mon, 3 Jun 2013 17:49:34 +0000 (13:49 -0400)]
Whoops, we need to seta that in defaultXonotic.cfg

11 years agoUpdate the rest of the .po files now so it matches Pootle
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

11 years agoThat's not a normal ascii character :P evil :P
Samual Lenks [Mon, 3 Jun 2013 06:58:29 +0000 (02:58 -0400)]
That's not a normal ascii character :P evil :P

11 years agoUpdate against template
Samual Lenks [Mon, 3 Jun 2013 06:29:23 +0000 (02:29 -0400)]
Update against template

11 years agoUpdate German translation .po files
Samual Lenks [Mon, 3 Jun 2013 06:15:25 +0000 (02:15 -0400)]
Update German translation .po files

11 years agoUpdate translation templates
Samual Lenks [Sun, 2 Jun 2013 16:50:23 +0000 (12:50 -0400)]
Update translation templates

11 years agoClean up notifications code a little bit
Samual Lenks [Sun, 2 Jun 2013 04:52:29 +0000 (00:52 -0400)]
Clean up notifications code a little bit

11 years agoDisable debug in notification system now for 0.7
Samual Lenks [Sun, 2 Jun 2013 03:38:15 +0000 (23:38 -0400)]
Disable debug in notification system now for 0.7

11 years agoMerge remote-tracking branch 'origin/zykure/teamscores'
Samual Lenks [Sat, 1 Jun 2013 19:47:42 +0000 (15:47 -0400)]
Merge remote-tracking branch 'origin/zykure/teamscores'

11 years agofix db-key bug in PlayerStats_TeamScore()
Jan Behrens [Sat, 1 Jun 2013 17:22:32 +0000 (19:22 +0200)]
fix db-key bug in PlayerStats_TeamScore()

11 years agoWorkaround for occasional crashes caused by the hud code (please test)
terencehill [Sat, 1 Jun 2013 14:09:33 +0000 (16:09 +0200)]
Workaround for occasional crashes caused by the hud code (please test)

11 years agoMerge remote-tracking branch 'origin/samual/fix_deathfade'
Samual Lenks [Sat, 1 Jun 2013 05:07:04 +0000 (01:07 -0400)]
Merge remote-tracking branch 'origin/samual/fix_deathfade'

11 years agoLast thing to clean up, I swear
Samual Lenks [Sat, 1 Jun 2013 04:16:43 +0000 (00:16 -0400)]
Last thing to clean up, I swear

11 years agoEven more cleanup :D
Samual Lenks [Sat, 1 Jun 2013 04:13:30 +0000 (00:13 -0400)]
Even more cleanup :D

11 years agoMore cleanup
Samual Lenks [Sat, 1 Jun 2013 04:10:37 +0000 (00:10 -0400)]
More cleanup

11 years agoA bit of clean up, plus make it ACTUALLY work properly
Samual Lenks [Sat, 1 Jun 2013 04:08:37 +0000 (00:08 -0400)]
A bit of clean up, plus make it ACTUALLY work properly

11 years agoTry and unify the color selection code for csqcmodels
Samual Lenks [Sat, 1 Jun 2013 03:32:37 +0000 (23:32 -0400)]
Try and unify the color selection code for csqcmodels

11 years agoMerge remote-tracking branch 'origin/master' into samual/fix_deathfade
Samual Lenks [Sat, 1 Jun 2013 02:01:02 +0000 (22:01 -0400)]
Merge remote-tracking branch 'origin/master' into samual/fix_deathfade

11 years agoMerge remote-tracking branch 'origin/zykure/teamscores'
Samual Lenks [Fri, 31 May 2013 22:27:05 +0000 (18:27 -0400)]
Merge remote-tracking branch 'origin/zykure/teamscores'

11 years agoBump spec version for playerstats
Samual Lenks [Fri, 31 May 2013 22:26:31 +0000 (18:26 -0400)]
Bump spec version for playerstats

11 years agoMerge remote-tracking branch 'origin/master' into zykure/teamscores
Samual Lenks [Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)]
Merge remote-tracking branch 'origin/master' into zykure/teamscores

11 years agofix something
Samual Lenks [Fri, 31 May 2013 17:25:47 +0000 (13:25 -0400)]
fix something

11 years agoFix some !STRING usage
Samual Lenks [Fri, 31 May 2013 17:14:42 +0000 (13:14 -0400)]
Fix some !STRING usage

11 years agoUntil we get actually nice loading screens, revert back to only one
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

11 years agoOut portal is blue, not red
Samual Lenks [Fri, 31 May 2013 16:35:49 +0000 (12:35 -0400)]
Out portal is blue, not red

11 years agoMerge remote-tracking branch 'origin/samual/update_effects_tab'
Samual Lenks [Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)]
Merge remote-tracking branch 'origin/samual/update_effects_tab'

11 years agoMove that into effects configs
Samual Lenks [Fri, 31 May 2013 15:52:22 +0000 (11:52 -0400)]
Move that into effects configs

11 years agoMerge remote-tracking branch 'origin/master' into samual/update_effects_tab
Samual Lenks [Fri, 31 May 2013 15:33:10 +0000 (11:33 -0400)]
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

11 years agoMerge remote-tracking branch 'origin/samual/updatecommands'
Samual Lenks [Fri, 31 May 2013 15:29:12 +0000 (11:29 -0400)]
Merge remote-tracking branch 'origin/samual/updatecommands'

11 years agoAdd the proper aliases for the commands
Samual Lenks [Fri, 31 May 2013 15:28:20 +0000 (11:28 -0400)]
Add the proper aliases for the commands

11 years agoMerge remote-tracking branch 'origin/master' into samual/updatecommands
Samual Lenks [Fri, 31 May 2013 15:23:18 +0000 (11:23 -0400)]
Merge remote-tracking branch 'origin/master' into samual/updatecommands

11 years agoBump Xonotic version to 0.7.0
Samual Lenks [Fri, 31 May 2013 15:17:28 +0000 (11:17 -0400)]
Bump Xonotic version to 0.7.0

11 years agoUse the proper indication for swedish .po file
Samual Lenks [Fri, 31 May 2013 01:55:59 +0000 (21:55 -0400)]
Use the proper indication for swedish .po file

11 years agoAlso spacing
Samual Lenks [Fri, 31 May 2013 01:48:28 +0000 (21:48 -0400)]
Also spacing

11 years agoLong line to shorter line
Samual Lenks [Fri, 31 May 2013 01:46:51 +0000 (21:46 -0400)]
Long line to shorter line

11 years agoMerge branch 'master' into terencehill/hud_code_cleanup
terencehill [Thu, 30 May 2013 21:27:54 +0000 (23:27 +0200)]
Merge branch 'master' into terencehill/hud_code_cleanup

11 years agoThat should be UTF-8 in thar.
Samual Lenks [Thu, 30 May 2013 21:04:41 +0000 (17:04 -0400)]
That should be UTF-8 in thar.

11 years agoReduce scope of panel_bg
terencehill [Thu, 30 May 2013 18:00:18 +0000 (20:00 +0200)]
Reduce scope of panel_bg

11 years agoDon't try to precache "0" bg
terencehill [Thu, 30 May 2013 17:58:13 +0000 (19:58 +0200)]
Don't try to precache "0" bg

11 years agoWhoops, forgot to update those gentle strings with new args. fixes #1597
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

11 years agoUse panel.current_panel_bg to keep and display panel bg instead of panel_bg (which...
terencehill [Thu, 30 May 2013 17:50:17 +0000 (19:50 +0200)]
Use panel.current_panel_bg to keep and display panel bg instead of panel_bg (which now is a temp var) so that only one must be zoned. Previous code could crash sometimes.

11 years ago./check-translations.sh pot
Samual Lenks [Thu, 30 May 2013 17:15:42 +0000 (13:15 -0400)]
./check-translations.sh pot

11 years agoFix unable to pickup powerups in minstagib, fixes #1575
Mario [Thu, 30 May 2013 07:23:08 +0000 (17:23 +1000)]
Fix unable to pickup powerups in minstagib, fixes #1575

11 years agoMerge remote-tracking branch 'origin/terencehill/cmd_fixes'
Samual Lenks [Tue, 28 May 2013 20:21:14 +0000 (16:21 -0400)]
Merge remote-tracking branch 'origin/terencehill/cmd_fixes'

11 years agoMerge remote-tracking branch 'origin/terencehill/menu_mouse_jump_fix'
Samual Lenks [Tue, 28 May 2013 20:20:12 +0000 (16:20 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_mouse_jump_fix'

11 years agoGet rid of the HUD_Panel_ApplyFadeAlpha macro
terencehill [Sun, 26 May 2013 16:42:07 +0000 (18:42 +0200)]
Get rid of the HUD_Panel_ApplyFadeAlpha macro

11 years agoIf the menu gets closed do not update mouse position: it prevents mouse jumping to...
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

11 years agoPrevent a crash (infinite loop) calling the command vote help help
terencehill [Fri, 24 May 2013 17:04:05 +0000 (19:04 +0200)]
Prevent a crash (infinite loop) calling the command vote help help

11 years agoFix trace command
terencehill [Fri, 24 May 2013 16:17:57 +0000 (18:17 +0200)]
Fix trace command

11 years agoRemove stupid code: hud_fade_alpha is already 1 if that condition is true
terencehill [Wed, 22 May 2013 13:27:26 +0000 (15:27 +0200)]
Remove stupid code: hud_fade_alpha is already 1 if that condition is true

11 years agoWorking on some updates to effects tab (better grouping, added spawnpoint
Samual Lenks [Wed, 22 May 2013 04:56:25 +0000 (00:56 -0400)]
Working on some updates to effects tab (better grouping, added spawnpoint
options)

11 years agoMerge remote-tracking branch 'origin/master' into samual/update_effects_tab
Samual Lenks [Wed, 22 May 2013 02:34:46 +0000 (22:34 -0400)]
Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

Conflicts:
tooltips.db

11 years agoMerge remote-tracking branch 'origin/Mario/vehicle_fixes'
Samual Lenks [Tue, 21 May 2013 20:59:05 +0000 (16:59 -0400)]
Merge remote-tracking branch 'origin/Mario/vehicle_fixes'

11 years agoHUD_Panel_UpdatePosSize_ForMenu is more correct this way
terencehill [Mon, 20 May 2013 19:03:32 +0000 (21:03 +0200)]
HUD_Panel_UpdatePosSize_ForMenu is more correct this way

11 years agoMake menu_enable_* vars locals
terencehill [Sun, 19 May 2013 10:39:08 +0000 (12:39 +0200)]
Make menu_enable_* vars locals

11 years agoFix crash in CTF caused by improper player check #1574
Samual Lenks [Sun, 19 May 2013 03:03:44 +0000 (23:03 -0400)]
Fix crash in CTF caused by improper player check #1574

11 years agoMove VehicleTouch to the correct function
Mario [Fri, 17 May 2013 01:28:32 +0000 (11:28 +1000)]
Move VehicleTouch to the correct function

11 years agoFixes for some vehicle related issues
Mario [Fri, 17 May 2013 01:26:44 +0000 (11:26 +1000)]
Fixes for some vehicle related issues

11 years agoRearrange a check
terencehill [Thu, 16 May 2013 08:23:22 +0000 (10:23 +0200)]
Rearrange a check

11 years agoSave team count instead of recounting teams every frame multiple times
terencehill [Thu, 16 May 2013 08:06:51 +0000 (10:06 +0200)]
Save team count instead of recounting teams every frame multiple times

11 years agoDecide which ModIcons panel to display right after game type initialization
terencehill [Thu, 16 May 2013 06:43:42 +0000 (08:43 +0200)]
Decide which ModIcons panel to display right after game type initialization

11 years agoAdd new 'Q' field to format spec comment
Jan Behrens [Wed, 15 May 2013 22:31:04 +0000 (00:31 +0200)]
Add new 'Q' field to format spec comment

11 years agoUnify HUD_Panel_GetMenuPos and HUD_Panel_GetMenuSize
terencehill [Wed, 15 May 2013 18:41:44 +0000 (20:41 +0200)]
Unify HUD_Panel_GetMenuPos and HUD_Panel_GetMenuSize

11 years agoGet rid of HUD_Panel_GetStringVars
terencehill [Wed, 15 May 2013 14:45:00 +0000 (16:45 +0200)]
Get rid of HUD_Panel_GetStringVars

11 years agoOn second thought, disable crosshair_hittest_showimpact, it's too glitchy
Samual Lenks [Wed, 15 May 2013 01:50:39 +0000 (21:50 -0400)]
On second thought, disable crosshair_hittest_showimpact, it's too glitchy

11 years ago"teamplay" is not set yet, just check the serverflag directly
Samual Lenks [Wed, 15 May 2013 01:47:09 +0000 (21:47 -0400)]
"teamplay" is not set yet, just check the serverflag directly

11 years agoEnable crosshair_hittest_showimpact 1 by default
Samual Lenks [Wed, 15 May 2013 01:14:29 +0000 (21:14 -0400)]
Enable crosshair_hittest_showimpact 1 by default

11 years agoFix ItemTouch mutator hook usage (fixes #1572)
Samual Lenks [Wed, 15 May 2013 01:00:19 +0000 (21:00 -0400)]
Fix ItemTouch mutator hook usage (fixes #1572)

11 years agoMerge remote-tracking branch 'origin/samual/individual_switchdelay'
Samual Lenks [Tue, 14 May 2013 22:21:28 +0000 (18:21 -0400)]
Merge remote-tracking branch 'origin/samual/individual_switchdelay'