xonotic/xonotic-data.pk3dir.git
4 years agoMerge branch 'master' into Mario/notifications
Mario [Sat, 20 Dec 2014 04:48:17 +0000 (15:48 +1100)]
Merge branch 'master' into Mario/notifications

Conflicts:
qcsrc/common/notifications.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/teamplay.qc

4 years agoTabs to spaces (to make merging a little less painful)
Mario [Sat, 20 Dec 2014 04:27:31 +0000 (15:27 +1100)]
Tabs to spaces (to make merging a little less painful)

4 years agoAdd TimePath to extended team
Mario [Sat, 20 Dec 2014 03:15:50 +0000 (14:15 +1100)]
Add TimePath to extended team

4 years agoAdd buffs to the menu
Mario [Sat, 20 Dec 2014 03:10:28 +0000 (14:10 +1100)]
Add buffs to the menu

4 years agoRemove unused stats file (was recently moved to common, this file is a leftover)
Mario [Fri, 19 Dec 2014 14:15:02 +0000 (01:15 +1100)]
Remove unused stats file (was recently moved to common, this file is a leftover)

4 years agoMerge branch 'Mario/arc_sounds' into 'master'
Mario [Fri, 19 Dec 2014 12:53:06 +0000 (12:53 +0000)]
Merge branch 'Mario/arc_sounds' into 'master'

Merge branch Mario/arc_sounds (M merge request)

New sounds by Archer, plus a few tweaks to the arc (uses polygon beam instead of trailparticles).

See merge request !62

4 years agoMerge branch 'master' into Mario/arc_sounds
Mario [Fri, 19 Dec 2014 12:48:24 +0000 (23:48 +1100)]
Merge branch 'master' into Mario/arc_sounds

4 years agoMerge branch 'TimePath/menu_tweaks' into 'master'
Mario [Fri, 19 Dec 2014 04:04:39 +0000 (04:04 +0000)]
Merge branch 'TimePath/menu_tweaks' into 'master'

Menu tweaks

Swap decals / particles (as they always were)

Make menu taller so that decal time is not cut off

Make extra reflective effects wider so that it doesn't look weird

See merge request !61

4 years agoTweak menu with suggestions from Mirio and Samual
TimePath [Thu, 18 Dec 2014 23:53:23 +0000 (10:53 +1100)]
Tweak menu with suggestions from Mirio and Samual

4 years agoUse polygons for beam instead of trailparticles
Mario [Thu, 18 Dec 2014 18:02:24 +0000 (05:02 +1100)]
Use polygons for beam instead of trailparticles

4 years agoAdd final arc sounds by Archer
Mario [Thu, 18 Dec 2014 15:59:07 +0000 (02:59 +1100)]
Add final arc sounds by Archer

4 years agoApply even less force (seems instagib has heavy modifiers)
Mario [Thu, 18 Dec 2014 11:00:08 +0000 (22:00 +1100)]
Apply even less force (seems instagib has heavy modifiers)

4 years agoApply a difference force modifier on vaporizer secondary
Mario [Thu, 18 Dec 2014 10:55:45 +0000 (21:55 +1100)]
Apply a difference force modifier on vaporizer secondary

4 years agoFix some bugs with nades, allow lasering a nade around
Mario [Thu, 18 Dec 2014 10:23:00 +0000 (21:23 +1100)]
Fix some bugs with nades, allow lasering a nade around

4 years agoAdd a hack to explode nades when they touch the void, don't remove nades when they...
Mario [Thu, 18 Dec 2014 07:57:04 +0000 (18:57 +1100)]
Add a hack to explode nades when they touch the void, don't remove nades when they hit player clips, still remove nades when they hit sky, fix deathmatch nade explosion effect

4 years agoUpdate French keybinds, patch by Spike
Mario [Thu, 18 Dec 2014 06:37:20 +0000 (17:37 +1100)]
Update French keybinds, patch by Spike

4 years agoMerge branch 'TimePath/issues/1421' into 'master'
Mario [Thu, 18 Dec 2014 06:35:01 +0000 (06:35 +0000)]
Merge branch 'TimePath/issues/1421' into 'master'

Issue 1421 - stats menu crash

The removed call to check stats can possibly return before the menu is ready.
The menu already makes a request when the stats panel is loaded, this one is dangerously redundant.

See merge request !58

4 years agoLower it again (the modded mutator crew are picky)
Mario [Wed, 17 Dec 2014 19:22:42 +0000 (06:22 +1100)]
Lower it again (the modded mutator crew are picky)

4 years agoLower overkill laser force a little to match old balance, as per request
Mario [Wed, 17 Dec 2014 18:36:11 +0000 (05:36 +1100)]
Lower overkill laser force a little to match old balance, as per request

4 years agoMerge branch 'Mario/overkill' into 'master'
Mario [Wed, 17 Dec 2014 17:40:47 +0000 (17:40 +0000)]
Merge branch 'Mario/overkill' into 'master'

Merge branch Mario/overkill (L merge request)

Overkill mutator, cleaned up and stable enough for merge (I hope).

See merge request !57

4 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

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

4 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

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

4 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

4 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)

4 years agoComment out the colorful block behind the arc beam
Mario [Wed, 17 Dec 2014 16:46:22 +0000 (03:46 +1100)]
Comment out the colorful block behind the arc beam

4 years agoUpdate sounds
Mario [Wed, 17 Dec 2014 16:33:11 +0000 (03:33 +1100)]
Update sounds

4 years agoClean up flash handling a bit (was showing in some cases)
Mario [Wed, 17 Dec 2014 14:55:56 +0000 (01:55 +1100)]
Clean up flash handling a bit (was showing in some cases)

4 years agoPossibly fix stats race condition, closes #1421
TimePath [Wed, 17 Dec 2014 09:43:33 +0000 (20:43 +1100)]
Possibly fix stats race condition, closes #1421

4 years agoNew sounds
Mario [Wed, 17 Dec 2014 00:18:13 +0000 (11:18 +1100)]
New sounds

4 years agoAdd newer sounds
Mario [Tue, 16 Dec 2014 23:51:51 +0000 (10:51 +1100)]
Add newer sounds

4 years agoAdd new arc sounds by Archer (known issue: loop sound doesn't loop)
Mario [Tue, 16 Dec 2014 23:44:36 +0000 (10:44 +1100)]
Add new arc sounds by Archer (known issue: loop sound doesn't loop)

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

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

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

4 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

4 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

4 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

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

4 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

4 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

4 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

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

4 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

4 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

4 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

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

4 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

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

4 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

4 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

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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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

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

4 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

4 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

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

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

4 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

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

4 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

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

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

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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

4 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

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

4 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

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

4 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

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

4 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

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

4 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