]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoWR_INIT no longer needs to be called from mutator
Mario [Wed, 17 Dec 2014 17:38:00 +0000 (04:38 +1100)]
WR_INIT no longer needs to be called from mutator

9 years agoRemove some unused stuff
Mario [Wed, 17 Dec 2014 17:10:53 +0000 (04:10 +1100)]
Remove some unused stuff

9 years agoAlso check for overkill when adding weapons mapinfo feature
Mario [Wed, 17 Dec 2014 17:06:19 +0000 (04:06 +1100)]
Also check for overkill when adding weapons mapinfo feature

9 years agoRemove a now unused notification
Mario [Wed, 17 Dec 2014 17:01:13 +0000 (04:01 +1100)]
Remove a now unused notification

9 years agoFor other modes, still allow ammo amount to be drawn while holding infinite ammo
Mario [Wed, 17 Dec 2014 16:59:50 +0000 (03:59 +1100)]
For other modes, still allow ammo amount to be drawn while holding infinite ammo

9 years agoRemove overkill toggle from menu (still show it in active mutators list)
Mario [Wed, 17 Dec 2014 16:58:26 +0000 (03:58 +1100)]
Remove overkill toggle from menu (still show it in active mutators list)

9 years agoAttempt to fix nade damage
Mario [Tue, 16 Dec 2014 22:48:57 +0000 (09:48 +1100)]
Attempt to fix nade damage

9 years agoMake it work
Mario [Tue, 16 Dec 2014 22:42:13 +0000 (09:42 +1100)]
Make it work

9 years agoActually use ok_lastwep
Mario [Tue, 16 Dec 2014 22:31:17 +0000 (09:31 +1100)]
Actually use ok_lastwep

9 years agoMerge branch 'master' into Mario/overkill
Mario [Tue, 16 Dec 2014 03:36:30 +0000 (14:36 +1100)]
Merge branch 'master' into Mario/overkill

9 years agoMerge branch 'sev/menu_image_fix' into 'master'
Mario [Tue, 16 Dec 2014 00:40:42 +0000 (00:40 +0000)]
Merge branch 'sev/menu_image_fix' into 'master'

Sev/menu image fix

I noticed a few error messages during start-up (see below).
These are caused by a XonoticScreenshotImage object, which is initialized with an empty (string_null) image source.
On a resizeNotify call, the null string is handed down a long sequence of functions and ultimately causes the errors.

This branch adds a check to the Image base class to prevent this.

> FS_OpenVirtualFile("dds/gfx/menu/luminos/.dds", true): nasty filename rejected
> FS_OpenVirtualFile("gfx/menu/luminos/.tga", true): nasty filename rejected
> FS_OpenVirtualFile("gfx/menu/luminos/.png", true): nasty filename rejected
> FS_OpenVirtualFile("gfx/menu/luminos/.jpg", true): nasty filename rejected
> FS_OpenVirtualFile("gfx/menu/luminos/.pcx", true): nasty filename rejected
> FS_OpenVirtualFile("menu/luminos/.tga", true): nasty filename rejected
> FS_OpenVirtualFile("menu/luminos/.png", true): nasty filename rejected
> FS_OpenVirtualFile("menu/luminos/.jpg", true): nasty filename rejected
> FS_OpenVirtualFile("menu/luminos/.pcx", true): nasty filename rejected
> FS_OpenVirtualFile("gfx/menu/luminos/.lmp", false): nasty filename rejected

See merge request !56

9 years agoPrevent calls to draw_PictureSize with an empty source string
Severin Meyer [Mon, 15 Dec 2014 16:15:47 +0000 (17:15 +0100)]
Prevent calls to draw_PictureSize with an empty source string

9 years agoRemove invalid file wildcards
Mario [Mon, 15 Dec 2014 07:18:37 +0000 (18:18 +1100)]
Remove invalid file wildcards

9 years agoMerge branch 'TimePath/issue-1170' into 'master'
Mario [Mon, 15 Dec 2014 07:05:56 +0000 (07:05 +0000)]
Merge branch 'TimePath/issue-1170' into 'master'

Reset all binds

Pulls the default binds into their own cfg so we can `exec` it from the menu

See merge request !47

9 years agoMerge branch 'master' into TimePath/issue-1170
TimePath [Mon, 15 Dec 2014 06:41:09 +0000 (17:41 +1100)]
Merge branch 'master' into TimePath/issue-1170

9 years agoMove more special keys to their own file
TimePath [Mon, 15 Dec 2014 06:23:04 +0000 (17:23 +1100)]
Move more special keys to their own file

9 years ago`unbindall` from menu button instead
TimePath [Mon, 15 Dec 2014 06:16:09 +0000 (17:16 +1100)]
`unbindall` from menu button instead

9 years agoInclude empty binds file for all 'special' keys
TimePath [Mon, 15 Dec 2014 06:13:32 +0000 (17:13 +1100)]
Include empty binds file for all 'special' keys

9 years agoAdd `unbinball` to top of default binds to reset non-standard keys too
TimePath [Mon, 15 Dec 2014 06:12:31 +0000 (17:12 +1100)]
Add `unbinball` to top of default binds to reset non-standard keys too

9 years agoMerge branch 'master' into TimePath/issue-1170
TimePath [Mon, 15 Dec 2014 05:58:42 +0000 (16:58 +1100)]
Merge branch 'master' into TimePath/issue-1170

Conflicts:
qcsrc/menu/classes.c
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/menu/xonotic/dialog_settings_misc.c
qcsrc/menu/xonotic/mainwindow.c

9 years agoFix teamplay/ffa text alignment
Mario [Mon, 15 Dec 2014 05:25:23 +0000 (16:25 +1100)]
Fix teamplay/ffa text alignment

9 years agoMerge branch 'sev/menu_headers' into 'master'
Mario [Mon, 15 Dec 2014 03:31:05 +0000 (03:31 +0000)]
Merge branch 'sev/menu_headers' into 'master'

Sev/menu headers

This branch makes the style of menu headers editable in skinfiles.
It also removes a lot of redundancy by moving the initialization of the header labels into a dedicated function.

Default values have been added to existing skinfiles.

See merge request !55

9 years agoFix accuracy
Mario [Mon, 15 Dec 2014 03:24:18 +0000 (14:24 +1100)]
Fix accuracy

9 years agoFix "lagging" rockets, but also break fireball slowmo again
Mario [Mon, 15 Dec 2014 03:22:25 +0000 (14:22 +1100)]
Fix "lagging" rockets, but also break fireball slowmo again

9 years agoMake the menu header style editable in skinfiles
Severin Meyer [Mon, 15 Dec 2014 01:29:32 +0000 (02:29 +0100)]
Make the menu header style editable in skinfiles

9 years agoFix a small typo
Mario [Mon, 15 Dec 2014 01:05:24 +0000 (12:05 +1100)]
Fix a small typo

9 years agoDon't give accuracy for shooting frozen players
Mario [Mon, 15 Dec 2014 00:34:49 +0000 (11:34 +1100)]
Don't give accuracy for shooting frozen players

9 years agoMerge branch 'terencehill/start_ammo' into 'master'
Mario [Sun, 14 Dec 2014 23:49:30 +0000 (23:49 +0000)]
Merge branch 'terencehill/start_ammo' into 'master'

Terencehill/start ammo

Fixes for a few issues

See merge request !53

9 years agoMerge branch 'terencehill/eventchase' into 'master'
Mario [Sun, 14 Dec 2014 23:46:45 +0000 (23:46 +0000)]
Merge branch 'terencehill/eventchase' into 'master'

Terencehill/eventchase

Changes to the eventchase code

See merge request !54

9 years agoFix a few more stat messages
Mario [Sun, 14 Dec 2014 23:22:45 +0000 (10:22 +1100)]
Fix a few more stat messages

9 years agoHide some stat messages and fix an invalid particles cvar
Mario [Sun, 14 Dec 2014 23:13:48 +0000 (10:13 +1100)]
Hide some stat messages and fix an invalid particles cvar

9 years agoDisable extra cubemaps in medium and normal configs, add cl_cubemaps_extra to the...
Mario [Sun, 14 Dec 2014 23:01:16 +0000 (10:01 +1100)]
Disable extra cubemaps in medium and normal configs, add cl_cubemaps_extra to the menu

9 years agoMerge branch 'master' into terencehill/eventchase
terencehill [Sun, 14 Dec 2014 22:45:56 +0000 (23:45 +0100)]
Merge branch 'master' into terencehill/eventchase

9 years agoFix ammo panel bug in hud_config mode
terencehill [Sun, 14 Dec 2014 22:45:20 +0000 (23:45 +0100)]
Fix ammo panel bug in hud_config mode

9 years agoMerge branch 'master' into terencehill/start_ammo
terencehill [Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)]
Merge branch 'master' into terencehill/start_ammo

9 years agoMerge branch 'sev/small_fixes' into 'master'
Mario [Sun, 14 Dec 2014 22:27:34 +0000 (22:27 +0000)]
Merge branch 'sev/small_fixes' into 'master'

Small Fixes

I've had a look at some of the recent changes, great to see so much progress.
This branch adds some very minor fixes for things I noticed:

**Typo**

Fixed typo in the menu (the string is not yet part of the translation files)

**Screenshot viewer controls**

In analogy to the maplist and serverlist, I've added the possibility to open screenshots with LMB and space.

**Arc notification**

The arc kill notification still uses the hlac image, I've updated it

**Slider direction**

Currently, mousewheeldown and the PgDn key move the slider up, while
mousewheelup and the PgUp key move the slider down.
This doesn't make sense, so I've inverted the controls.

**Scrollbar thumb minimum height**

The scrollbar image is subdivided into 3 segments with a ratio of 1:2:1.
While the middle segment is intended to be stretched, the outer segments are not.
The current minimum height for the scrollbar thumb is 1*width, causing the thumb to be cut off, as seen in the advanced settings dialog.
I've changed the minimum height to fully include all "unstretchable" segments.

![minfactor](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/402cf3bdc2/minfactor.png)

See merge request !52

9 years agocl_eventchase_death 2 to active the effect only when the corpse doesn't move anymore
terencehill [Sun, 14 Dec 2014 21:20:25 +0000 (22:20 +0100)]
cl_eventchase_death 2 to active the effect only when the corpse doesn't move anymore

9 years agoPut eventchase conditions in a function for clearness sake
terencehill [Sun, 14 Dec 2014 17:50:48 +0000 (18:50 +0100)]
Put eventchase conditions in a function for clearness sake

9 years agoUse the correct image for the arc kill notification
Severin Meyer [Sun, 14 Dec 2014 17:21:57 +0000 (18:21 +0100)]
Use the correct image for the arc kill notification

9 years agoActive eventchase_nexball only when playing or spectating somebody
terencehill [Sun, 14 Dec 2014 17:17:31 +0000 (18:17 +0100)]
Active eventchase_nexball only when playing or spectating somebody

9 years agoMove the slider UP when using mousewheelup or the PgUp key, and move it DOWN when...
Severin Meyer [Sun, 14 Dec 2014 17:16:46 +0000 (18:16 +0100)]
Move the slider UP when using mousewheelup or the PgUp key, and move it DOWN when using the mousewheeldown or the PgDn key

9 years agoAlso open screenshots with LMB and space in the screenshotlist, analogous to the...
Severin Meyer [Sun, 14 Dec 2014 17:09:25 +0000 (18:09 +0100)]
Also open screenshots with LMB and space in the screenshotlist, analogous to the serverlist and maplist

9 years agoIncrease the minimal height of the scrollbar thumb, to fully show the two unstretchab...
Severin Meyer [Sun, 14 Dec 2014 16:03:05 +0000 (17:03 +0100)]
Increase the minimal height of the scrollbar thumb, to fully show the two unstretchable ends of the thumb image

9 years agoFix typo
terencehill [Sun, 14 Dec 2014 15:14:41 +0000 (16:14 +0100)]
Fix typo

9 years agoFix missing initialization of warmup_start_ammo_plasma; also apply the same order...
terencehill [Sun, 14 Dec 2014 15:13:51 +0000 (16:13 +0100)]
Fix missing initialization of warmup_start_ammo_plasma; also apply the same order to start ammo variable initializations

9 years agoFix small typo
Severin Meyer [Sun, 14 Dec 2014 15:03:57 +0000 (16:03 +0100)]
Fix small typo

9 years agoCorrectly initialize start ammo in instagib
terencehill [Sun, 14 Dec 2014 14:41:32 +0000 (15:41 +0100)]
Correctly initialize start ammo in instagib

9 years agoMerge branch 'TimePath/combined_updates' into 'master'
Mario [Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)]
Merge branch 'TimePath/combined_updates' into 'master'

TimePath/combined_updates

samual/combined_updates without the bad merge with nyov's effects changes

See merge request !50

9 years agoEnable categories by default
Mario [Sun, 14 Dec 2014 11:35:46 +0000 (22:35 +1100)]
Enable categories by default

9 years agoFix cases of if not
Mario [Sun, 14 Dec 2014 11:29:19 +0000 (22:29 +1100)]
Fix cases of if not

9 years agoMerge branch 'TimePath/issues/1415' into 'master'
Mario [Sun, 14 Dec 2014 11:09:55 +0000 (11:09 +0000)]
Merge branch 'TimePath/issues/1415' into 'master'

Issue 1415

When plasma is ready, increment `AMMO_COUNT` by 1

See merge request !51

9 years agoFix ammo panel layout
TimePath [Sun, 14 Dec 2014 06:48:34 +0000 (17:48 +1100)]
Fix ammo panel layout
Fixes #1415

9 years agoFix entering HUD editor from main menu
TimePath [Sun, 14 Dec 2014 03:13:13 +0000 (14:13 +1100)]
Fix entering HUD editor from main menu

9 years agoFix particle/decal effects settings
TimePath [Sun, 14 Dec 2014 02:54:14 +0000 (13:54 +1100)]
Fix particle/decal effects settings

9 years agoFix mutator window height
TimePath [Sun, 14 Dec 2014 02:18:05 +0000 (13:18 +1100)]
Fix mutator window height

9 years agoRemove map features listing (again)
TimePath [Sun, 14 Dec 2014 02:02:41 +0000 (13:02 +1100)]
Remove map features listing (again)

9 years agoMerge branch 'master' into TimePath/combined_updates
TimePath [Sun, 14 Dec 2014 01:57:53 +0000 (12:57 +1100)]
Merge branch 'master' into TimePath/combined_updates

Conflicts:
qcsrc/common/notifications.qh

9 years agoMove cvars to the proper location
Mario [Sun, 14 Dec 2014 01:54:09 +0000 (12:54 +1100)]
Move cvars to the proper location

9 years agoMerge remote-tracking branch 'origin/master' into TimePath/combined_updates
TimePath [Sun, 14 Dec 2014 01:22:25 +0000 (12:22 +1100)]
Merge remote-tracking branch 'origin/master' into TimePath/combined_updates

Conflicts:
effects-high.cfg
effects-ultra.cfg
qcsrc/client/View.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
qcsrc/menu/xonotic/dialog_settings_effects.c

9 years agoMerge branch 'master' into TimePath/combined_updates
TimePath [Sun, 14 Dec 2014 01:09:46 +0000 (12:09 +1100)]
Merge branch 'master' into TimePath/combined_updates

9 years agoApply nyov/effects
TimePath [Sun, 14 Dec 2014 01:06:55 +0000 (12:06 +1100)]
Apply nyov/effects

9 years agoMerge branch 'master' into samual/combined_updates
nyov [Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)]
Merge branch 'master' into samual/combined_updates

9 years agoMerge branch 'mirceakitsune/player_cubemaps' into 'master'
Mario [Sun, 14 Dec 2014 00:24:42 +0000 (00:24 +0000)]
Merge branch 'mirceakitsune/player_cubemaps' into 'master'

Merge branch mirceakitsune/player_cubemaps (L merge request)

Adds reflective shaders to the player models.

See merge request !49

9 years agoAdd Arc to keybinds, for Mirio
Mario [Sun, 14 Dec 2014 00:04:14 +0000 (11:04 +1100)]
Add Arc to keybinds, for Mirio

9 years agoMerge branch 'master' into mirceakitsune/player_cubemaps
Mario [Sat, 13 Dec 2014 23:52:41 +0000 (10:52 +1100)]
Merge branch 'master' into mirceakitsune/player_cubemaps

9 years agoUpdate English weapon names
Mario [Sat, 13 Dec 2014 23:11:30 +0000 (10:11 +1100)]
Update English weapon names

9 years agoRemove an old comment for the sake of clearing fteqcc's name
Mario [Sat, 13 Dec 2014 12:02:58 +0000 (23:02 +1100)]
Remove an old comment for the sake of clearing fteqcc's name

9 years agoUltra minor cleanup
Mario [Sat, 13 Dec 2014 12:01:58 +0000 (23:01 +1100)]
Ultra minor cleanup

9 years agoGet rid of a Nexuiz legacy commented code block
Mario [Sat, 13 Dec 2014 11:50:54 +0000 (22:50 +1100)]
Get rid of a Nexuiz legacy commented code block

9 years agoRemove even more fteqcc junk
Mario [Sat, 13 Dec 2014 11:49:16 +0000 (22:49 +1100)]
Remove even more fteqcc junk

9 years agoRemove some old fteqcc legacy bug checks
Mario [Sat, 13 Dec 2014 11:45:49 +0000 (22:45 +1100)]
Remove some old fteqcc legacy bug checks

9 years agoFix shotgun nade damage
Mario [Sat, 13 Dec 2014 11:38:29 +0000 (22:38 +1100)]
Fix shotgun nade damage

9 years agoAllow laser jumps right after spawning
Mario [Sat, 13 Dec 2014 11:31:07 +0000 (22:31 +1100)]
Allow laser jumps right after spawning

9 years agoFix HMG
Mario [Sat, 13 Dec 2014 11:26:13 +0000 (22:26 +1100)]
Fix HMG

9 years agoMerge branch 'master' into Mario/overkill
Mario [Sat, 13 Dec 2014 11:12:43 +0000 (22:12 +1100)]
Merge branch 'master' into Mario/overkill

Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/mutators/mutator_instagib.qc

9 years agoFix compile
Mario [Sat, 13 Dec 2014 09:49:21 +0000 (20:49 +1100)]
Fix compile

9 years agoFix !(x == y) in pathlib
Mario [Sat, 13 Dec 2014 09:33:05 +0000 (20:33 +1100)]
Fix !(x == y) in pathlib

9 years agoRemove a bad call from nexball (weapons are already initialized at start)
Mario [Sat, 13 Dec 2014 09:24:45 +0000 (20:24 +1100)]
Remove a bad call from nexball (weapons are already initialized at start)

9 years agoApply antilag to monsters in g_subs
Mario [Sat, 13 Dec 2014 09:07:27 +0000 (20:07 +1100)]
Apply antilag to monsters in g_subs

9 years agoFix paranthesis
Mario [Sat, 13 Dec 2014 09:04:30 +0000 (20:04 +1100)]
Fix paranthesis

9 years agoUnfreeze players on round reset
Mario [Sat, 13 Dec 2014 09:00:34 +0000 (20:00 +1100)]
Unfreeze players on round reset

9 years agoDon't send taunt sounds to spectatees
Mario [Sat, 13 Dec 2014 08:50:09 +0000 (19:50 +1100)]
Don't send taunt sounds to spectatees

9 years agoUse x != y instead of !(x == y)
Mario [Sat, 13 Dec 2014 08:35:27 +0000 (19:35 +1100)]
Use x != y instead of !(x == y)

9 years agoClean up a bot weapon check
Mario [Sat, 13 Dec 2014 08:33:54 +0000 (19:33 +1100)]
Clean up a bot weapon check

9 years agoElectro can be used to climb
Mario [Sat, 13 Dec 2014 08:28:59 +0000 (19:28 +1100)]
Electro can be used to climb

9 years agoRestore infinite mine lifetime function
Mario [Sat, 13 Dec 2014 08:22:51 +0000 (19:22 +1100)]
Restore infinite mine lifetime function

9 years agoFix casing of buff notifications
Mario [Sat, 13 Dec 2014 08:03:58 +0000 (19:03 +1100)]
Fix casing of buff notifications

9 years agoUse spaces in notifications list
Mario [Sat, 13 Dec 2014 08:01:18 +0000 (19:01 +1100)]
Use spaces in notifications list

9 years agoSupposedly fix "lagging" rockets
Mario [Sat, 13 Dec 2014 05:58:51 +0000 (16:58 +1100)]
Supposedly fix "lagging" rockets

9 years agoAdd new cubemaps cvar to configs
Mario [Sat, 13 Dec 2014 05:53:25 +0000 (16:53 +1100)]
Add new cubemaps cvar to configs

9 years agoMerge branch 'Mario/ctf_leadlimit' into 'master'
Mario [Sat, 13 Dec 2014 05:37:47 +0000 (05:37 +0000)]
Merge branch 'Mario/ctf_leadlimit' into 'master'

Merge branch Mario/ctf_leadlimit (XXS merge request)

Sets CTF lead limit to 6, as requested in issue #102.

See merge request !28

9 years agoMerge branch 'terencehill/insta_notifications' into 'master'
Mario [Sat, 13 Dec 2014 05:34:44 +0000 (05:34 +0000)]
Merge branch 'terencehill/insta_notifications' into 'master'

Terencehill/insta notifications

Rename some notifications: MINSTA -> INSTAGIB

See merge request !41

9 years agoApply an optimization by terencehill
Mario [Sat, 13 Dec 2014 05:33:25 +0000 (16:33 +1100)]
Apply an optimization by terencehill

9 years agoMerge branch 'master' into terencehill/insta_notifications
Mario [Sat, 13 Dec 2014 05:29:48 +0000 (16:29 +1100)]
Merge branch 'master' into terencehill/insta_notifications

Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/mutators/mutator_instagib.qc

9 years agoMerge branch 'terencehill/centerprint_panel_fix' into 'master'
Mario [Sat, 13 Dec 2014 05:22:47 +0000 (05:22 +0000)]
Merge branch 'terencehill/centerprint_panel_fix' into 'master'

Terencehill/centerprint panel fix

A generic message centerprinted together with a countdown message leaps every second at low fps

See merge request !45

9 years agoMerge branch 'terencehill/misc_cleanups' into 'master'
Mario [Sat, 13 Dec 2014 05:19:00 +0000 (05:19 +0000)]
Merge branch 'terencehill/misc_cleanups' into 'master'

Terencehill/misc cleanups

Miscellaneous cleanups and some small fixes

See merge request !46

9 years agoFix another silly use of translation
Mario [Sat, 13 Dec 2014 04:57:17 +0000 (15:57 +1100)]
Fix another silly use of translation

9 years agoAssuming letters can be translated in some languages, undo fix of decimals translation
Mario [Sat, 13 Dec 2014 04:55:21 +0000 (15:55 +1100)]
Assuming letters can be translated in some languages, undo fix of decimals translation

9 years agoFix some silly translated strings
Mario [Sat, 13 Dec 2014 04:51:41 +0000 (15:51 +1100)]
Fix some silly translated strings

9 years agoUse overkill balance
Mario [Sat, 13 Dec 2014 03:00:32 +0000 (14:00 +1100)]
Use overkill balance