]>
git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Sat, 20 Dec 2014 11:00:02 +0000 (22:00 +1100)]
Merge branch 'master' into TimePath/issues/1428
TimePath [Sat, 20 Dec 2014 10:46:01 +0000 (21:46 +1100)]
Force arc to always play pitch shifted hitsounds for consistency
TimePath [Sat, 20 Dec 2014 10:39:09 +0000 (21:39 +1100)]
Improve reliability by using total damage
TimePath [Sat, 20 Dec 2014 08:41:22 +0000 (19:41 +1100)]
Tidying up, consider #1428 fixed
TimePath [Sat, 20 Dec 2014 08:05:24 +0000 (19:05 +1100)]
Track hit time so that constant damage makes a noise
Mario [Sat, 20 Dec 2014 06:22:21 +0000 (17:22 +1100)]
Remove cl_cubemaps_extra
Mario [Sat, 20 Dec 2014 05:05:16 +0000 (05:05 +0000)]
Merge branch 'Mario/notifications' into 'master'
Merge branch Mario/notifications (M merge request)
Moves some prints into the notifications system.
See merge request !63
Mario [Sat, 20 Dec 2014 05:03:39 +0000 (16:03 +1100)]
Fix some minor problems
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
Mario [Sat, 20 Dec 2014 04:27:31 +0000 (15:27 +1100)]
Tabs to spaces (to make merging a little less painful)
Mario [Sat, 20 Dec 2014 03:15:50 +0000 (14:15 +1100)]
Add TimePath to extended team
Mario [Sat, 20 Dec 2014 03:10:28 +0000 (14:10 +1100)]
Add buffs to the menu
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)
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
Mario [Fri, 19 Dec 2014 12:48:24 +0000 (23:48 +1100)]
Merge branch 'master' into Mario/arc_sounds
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
TimePath [Thu, 18 Dec 2014 23:53:23 +0000 (10:53 +1100)]
Tweak menu with suggestions from Mirio and Samual
Mario [Thu, 18 Dec 2014 18:02:24 +0000 (05:02 +1100)]
Use polygons for beam instead of trailparticles
Mario [Thu, 18 Dec 2014 15:59:07 +0000 (02:59 +1100)]
Add final arc sounds by Archer
Mario [Thu, 18 Dec 2014 11:00:08 +0000 (22:00 +1100)]
Apply even less force (seems instagib has heavy modifiers)
Mario [Thu, 18 Dec 2014 10:55:45 +0000 (21:55 +1100)]
Apply a difference force modifier on vaporizer secondary
Mario [Thu, 18 Dec 2014 10:23:00 +0000 (21:23 +1100)]
Fix some bugs with nades, allow lasering a nade around
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
Mario [Thu, 18 Dec 2014 06:37:20 +0000 (17:37 +1100)]
Update French keybinds, patch by Spike
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
Mario [Wed, 17 Dec 2014 19:22:42 +0000 (06:22 +1100)]
Lower it again (the modded mutator crew are picky)
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
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
Mario [Wed, 17 Dec 2014 17:38:00 +0000 (04:38 +1100)]
WR_INIT no longer needs to be called from mutator
Mario [Wed, 17 Dec 2014 17:10:53 +0000 (04:10 +1100)]
Remove some unused stuff
Mario [Wed, 17 Dec 2014 17:06:19 +0000 (04:06 +1100)]
Also check for overkill when adding weapons mapinfo feature
Mario [Wed, 17 Dec 2014 17:01:13 +0000 (04:01 +1100)]
Remove a now unused notification
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
Mario [Wed, 17 Dec 2014 16:58:26 +0000 (03:58 +1100)]
Remove overkill toggle from menu (still show it in active mutators list)
Mario [Wed, 17 Dec 2014 16:46:22 +0000 (03:46 +1100)]
Comment out the colorful block behind the arc beam
Mario [Wed, 17 Dec 2014 16:33:11 +0000 (03:33 +1100)]
Update sounds
Mario [Wed, 17 Dec 2014 14:55:56 +0000 (01:55 +1100)]
Clean up flash handling a bit (was showing in some cases)
TimePath [Wed, 17 Dec 2014 09:43:33 +0000 (20:43 +1100)]
Possibly fix stats race condition, closes #1421
Mario [Wed, 17 Dec 2014 00:18:13 +0000 (11:18 +1100)]
New sounds
Mario [Tue, 16 Dec 2014 23:51:51 +0000 (10:51 +1100)]
Add newer sounds
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)
Mario [Tue, 16 Dec 2014 22:48:57 +0000 (09:48 +1100)]
Attempt to fix nade damage
Mario [Tue, 16 Dec 2014 22:42:13 +0000 (09:42 +1100)]
Make it work
Mario [Tue, 16 Dec 2014 22:31:17 +0000 (09:31 +1100)]
Actually use ok_lastwep
Mario [Tue, 16 Dec 2014 03:36:30 +0000 (14:36 +1100)]
Merge branch 'master' into Mario/overkill
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
Severin Meyer [Mon, 15 Dec 2014 16:15:47 +0000 (17:15 +0100)]
Prevent calls to draw_PictureSize with an empty source string
Mario [Mon, 15 Dec 2014 07:18:37 +0000 (18:18 +1100)]
Remove invalid file wildcards
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
TimePath [Mon, 15 Dec 2014 06:41:09 +0000 (17:41 +1100)]
Merge branch 'master' into TimePath/issue-1170
TimePath [Mon, 15 Dec 2014 06:23:04 +0000 (17:23 +1100)]
Move more special keys to their own file
TimePath [Mon, 15 Dec 2014 06:16:09 +0000 (17:16 +1100)]
`unbindall` from menu button instead
TimePath [Mon, 15 Dec 2014 06:13:32 +0000 (17:13 +1100)]
Include empty binds file for all 'special' keys
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
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
Mario [Mon, 15 Dec 2014 05:25:23 +0000 (16:25 +1100)]
Fix teamplay/ffa text alignment
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
Mario [Mon, 15 Dec 2014 03:24:18 +0000 (14:24 +1100)]
Fix accuracy
Mario [Mon, 15 Dec 2014 03:22:25 +0000 (14:22 +1100)]
Fix "lagging" rockets, but also break fireball slowmo again
Severin Meyer [Mon, 15 Dec 2014 01:29:32 +0000 (02:29 +0100)]
Make the menu header style editable in skinfiles
Mario [Mon, 15 Dec 2014 01:05:24 +0000 (12:05 +1100)]
Fix a small typo
Mario [Mon, 15 Dec 2014 00:34:49 +0000 (11:34 +1100)]
Don't give accuracy for shooting frozen players
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
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
Mario [Sun, 14 Dec 2014 23:22:45 +0000 (10:22 +1100)]
Fix a few more stat messages
Mario [Sun, 14 Dec 2014 23:13:48 +0000 (10:13 +1100)]
Hide some stat messages and fix an invalid particles cvar
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
terencehill [Sun, 14 Dec 2014 22:45:56 +0000 (23:45 +0100)]
Merge branch 'master' into terencehill/eventchase
terencehill [Sun, 14 Dec 2014 22:45:20 +0000 (23:45 +0100)]
Fix ammo panel bug in hud_config mode
terencehill [Sun, 14 Dec 2014 22:42:07 +0000 (23:42 +0100)]
Merge branch 'master' into terencehill/start_ammo
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
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
terencehill [Sun, 14 Dec 2014 17:50:48 +0000 (18:50 +0100)]
Put eventchase conditions in a function for clearness sake
Severin Meyer [Sun, 14 Dec 2014 17:21:57 +0000 (18:21 +0100)]
Use the correct image for the arc kill notification
terencehill [Sun, 14 Dec 2014 17:17:31 +0000 (18:17 +0100)]
Active eventchase_nexball only when playing or spectating somebody
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
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
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
terencehill [Sun, 14 Dec 2014 15:14:41 +0000 (16:14 +0100)]
Fix typo
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
Severin Meyer [Sun, 14 Dec 2014 15:03:57 +0000 (16:03 +0100)]
Fix small typo
terencehill [Sun, 14 Dec 2014 14:41:32 +0000 (15:41 +0100)]
Correctly initialize start ammo in instagib
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
Mario [Sun, 14 Dec 2014 11:35:46 +0000 (22:35 +1100)]
Enable categories by default
Mario [Sun, 14 Dec 2014 11:29:19 +0000 (22:29 +1100)]
Fix cases of if not
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
TimePath [Sun, 14 Dec 2014 06:48:34 +0000 (17:48 +1100)]
Fix ammo panel layout
Fixes #1415
TimePath [Sun, 14 Dec 2014 03:13:13 +0000 (14:13 +1100)]
Fix entering HUD editor from main menu
TimePath [Sun, 14 Dec 2014 02:54:14 +0000 (13:54 +1100)]
Fix particle/decal effects settings
TimePath [Sun, 14 Dec 2014 02:18:05 +0000 (13:18 +1100)]
Fix mutator window height
TimePath [Sun, 14 Dec 2014 02:02:41 +0000 (13:02 +1100)]
Remove map features listing (again)
TimePath [Sun, 14 Dec 2014 01:57:53 +0000 (12:57 +1100)]
Merge branch 'master' into TimePath/combined_updates
Conflicts:
qcsrc/common/notifications.qh
Mario [Sun, 14 Dec 2014 01:54:09 +0000 (12:54 +1100)]
Move cvars to the proper location
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
TimePath [Sun, 14 Dec 2014 01:09:46 +0000 (12:09 +1100)]
Merge branch 'master' into TimePath/combined_updates
TimePath [Sun, 14 Dec 2014 01:06:55 +0000 (12:06 +1100)]
Apply nyov/effects
nyov [Tue, 25 Nov 2014 08:31:16 +0000 (08:31 +0000)]
Merge branch 'master' into samual/combined_updates
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
Mario [Sun, 14 Dec 2014 00:04:14 +0000 (11:04 +1100)]
Add Arc to keybinds, for Mirio
Mario [Sat, 13 Dec 2014 23:52:41 +0000 (10:52 +1100)]
Merge branch 'master' into mirceakitsune/player_cubemaps