]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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
Severin Meyer [Sun, 14 Dec 2014 17:21:57 +0000 (18:21 +0100)]
Use the correct image for the arc kill notification
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
Severin Meyer [Sun, 14 Dec 2014 15:03:57 +0000 (16:03 +0100)]
Fix small typo
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
Mario [Sat, 13 Dec 2014 23:11:30 +0000 (10:11 +1100)]
Update English weapon names
Mario [Sat, 13 Dec 2014 12:02:58 +0000 (23:02 +1100)]
Remove an old comment for the sake of clearing fteqcc's name
Mario [Sat, 13 Dec 2014 12:01:58 +0000 (23:01 +1100)]
Ultra minor cleanup
Mario [Sat, 13 Dec 2014 11:50:54 +0000 (22:50 +1100)]
Get rid of a Nexuiz legacy commented code block
Mario [Sat, 13 Dec 2014 11:49:16 +0000 (22:49 +1100)]
Remove even more fteqcc junk
Mario [Sat, 13 Dec 2014 11:45:49 +0000 (22:45 +1100)]
Remove some old fteqcc legacy bug checks
Mario [Sat, 13 Dec 2014 09:49:21 +0000 (20:49 +1100)]
Fix compile
Mario [Sat, 13 Dec 2014 09:33:05 +0000 (20:33 +1100)]
Fix !(x == y) in pathlib
Mario [Sat, 13 Dec 2014 09:24:45 +0000 (20:24 +1100)]
Remove a bad call from nexball (weapons are already initialized at start)
Mario [Sat, 13 Dec 2014 09:07:27 +0000 (20:07 +1100)]
Apply antilag to monsters in g_subs
Mario [Sat, 13 Dec 2014 09:04:30 +0000 (20:04 +1100)]
Fix paranthesis
Mario [Sat, 13 Dec 2014 09:00:34 +0000 (20:00 +1100)]
Unfreeze players on round reset
Mario [Sat, 13 Dec 2014 08:50:09 +0000 (19:50 +1100)]
Don't send taunt sounds to spectatees
Mario [Sat, 13 Dec 2014 08:35:27 +0000 (19:35 +1100)]
Use x != y instead of !(x == y)
Mario [Sat, 13 Dec 2014 08:33:54 +0000 (19:33 +1100)]
Clean up a bot weapon check
Mario [Sat, 13 Dec 2014 08:28:59 +0000 (19:28 +1100)]
Electro can be used to climb
Mario [Sat, 13 Dec 2014 08:22:51 +0000 (19:22 +1100)]
Restore infinite mine lifetime function
Mario [Sat, 13 Dec 2014 08:03:58 +0000 (19:03 +1100)]
Fix casing of buff notifications
Mario [Sat, 13 Dec 2014 08:01:18 +0000 (19:01 +1100)]
Use spaces in notifications list
Mario [Sat, 13 Dec 2014 05:58:51 +0000 (16:58 +1100)]
Supposedly fix "lagging" rockets
Mario [Sat, 13 Dec 2014 05:53:25 +0000 (16:53 +1100)]
Add new cubemaps cvar to configs
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
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
Mario [Sat, 13 Dec 2014 05:33:25 +0000 (16:33 +1100)]
Apply an optimization by terencehill
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
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
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
Mario [Sat, 13 Dec 2014 04:57:17 +0000 (15:57 +1100)]
Fix another silly use of 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
Mario [Sat, 13 Dec 2014 04:51:41 +0000 (15:51 +1100)]
Fix some silly translated strings
Mario [Thu, 11 Dec 2014 23:44:07 +0000 (10:44 +1100)]
Add Archer to the credits
Mario [Thu, 11 Dec 2014 23:38:41 +0000 (10:38 +1100)]
Merge remote-tracking branch 'origin/Mirio/credits'
Mario [Thu, 11 Dec 2014 23:22:03 +0000 (10:22 +1100)]
Merge branch 'Mario/weapons_new'
Mario [Thu, 11 Dec 2014 23:18:57 +0000 (10:18 +1100)]
Make crylink force match master
Mirio [Thu, 11 Dec 2014 23:15:15 +0000 (00:15 +0100)]
Updated team members, translators
Mario [Thu, 11 Dec 2014 23:10:25 +0000 (10:10 +1100)]
Remove shockwave from mutator menu
Mario [Thu, 11 Dec 2014 22:57:09 +0000 (09:57 +1100)]
Fix comment
Mario [Tue, 9 Dec 2014 01:52:23 +0000 (12:52 +1100)]
Merge branch 'master' into Mario/weapons_new
Rudolf Polzer [Mon, 8 Dec 2014 11:17:13 +0000 (12:17 +0100)]
Get rid of hardcoded "Player" string for checking whether the name needs changing - instead compare to the cvar default.
Rudolf Polzer [Sun, 7 Dec 2014 15:59:34 +0000 (16:59 +0100)]
csqcplayers: for player models, always overwrite .frame each frame.
terencehill [Sun, 7 Dec 2014 15:37:26 +0000 (16:37 +0100)]
Remove an unused field
terencehill [Sun, 7 Dec 2014 14:29:55 +0000 (15:29 +0100)]
Move remaining gametype score rules to the respective gametype files
terencehill [Sat, 6 Dec 2014 18:20:58 +0000 (19:20 +0100)]
Fix this bug: A generic message centerprinted together with a countdown message leaps every second at low fps
terencehill [Fri, 5 Dec 2014 23:11:09 +0000 (00:11 +0100)]
Fix "Fade time" slider in the centerprint panel: hud_panel_centerprint_fadetime doesn't exist anymore
terencehill [Fri, 5 Dec 2014 23:07:55 +0000 (00:07 +0100)]
Make Centerprint Panel title coherent with other panel dialogs
terencehill [Fri, 5 Dec 2014 23:05:13 +0000 (00:05 +0100)]
Fix for a small bug
terencehill [Fri, 5 Dec 2014 23:02:41 +0000 (00:02 +0100)]
A few simple optimizations
terencehill [Fri, 5 Dec 2014 22:57:14 +0000 (23:57 +0100)]
MUTATOR_ONREMOVE for domination should be handled this way, like in the all the other game types
terencehill [Fri, 5 Dec 2014 22:51:32 +0000 (23:51 +0100)]
Remove duplicated stuff
terencehill [Fri, 5 Dec 2014 22:49:06 +0000 (23:49 +0100)]
Remove old/unused stuff
Mario [Fri, 5 Dec 2014 13:13:58 +0000 (00:13 +1100)]
Duplicate some bad code for the sake of fixing bot melee spam when out of ammo (WEAPONTODO)
Mario [Fri, 5 Dec 2014 12:54:36 +0000 (23:54 +1100)]
Disable reloading when weapon use is forbidden (fixes reload spam while frozen)
Mario [Fri, 5 Dec 2014 12:29:52 +0000 (23:29 +1100)]
Add a simple delay to prevent drawing projectiles in slowmo 0
Mario [Fri, 5 Dec 2014 12:03:18 +0000 (23:03 +1100)]
Merge branch 'master' into Mario/weapons_new
Mario [Fri, 5 Dec 2014 11:43:04 +0000 (22:43 +1100)]
Temporary fix for missing alternate flag textures (in the future, we should get proper model replacements for these)
Mario [Fri, 5 Dec 2014 11:29:07 +0000 (22:29 +1100)]
Merge branch 'terencehill/ca_fixes_and_more'
Mario [Fri, 5 Dec 2014 11:28:02 +0000 (22:28 +1100)]
Merge branch 'master' into terencehill/ca_fixes_and_more
Mario [Fri, 5 Dec 2014 11:15:50 +0000 (22:15 +1100)]
Add a few quick checks to ensure dead/frozen players don't enter vehicles
Mario [Fri, 5 Dec 2014 11:02:53 +0000 (22:02 +1100)]
Merge branch 'Mario/ctf_fixes'
Mario [Fri, 5 Dec 2014 10:48:49 +0000 (21:48 +1100)]
Fix flags passing through clips and becoming unreachable, partially fix picking up flags while driving a vehicle, fix stalemate message not disappearing sometimes, fix console warning when non-player entity touches a shielded flag, fix passing flags to teammates already carrying flags deleting the carrier's first flag
Mario [Thu, 4 Dec 2014 23:42:45 +0000 (10:42 +1100)]
Remove arc from machinegun weaponreplace
Mario [Thu, 4 Dec 2014 23:05:25 +0000 (10:05 +1100)]
Fix a typo
terencehill [Thu, 4 Dec 2014 22:09:33 +0000 (23:09 +0100)]
Rename some notifications: MINSTA -> INSTAGIB
Mario [Thu, 4 Dec 2014 03:44:05 +0000 (14:44 +1100)]
Update credits
Mario [Thu, 4 Dec 2014 01:23:38 +0000 (12:23 +1100)]
Merge branch 'terencehill/scoreboard_fixes'
Mario [Wed, 3 Dec 2014 03:08:30 +0000 (14:08 +1100)]
Make balances match
terencehill [Tue, 2 Dec 2014 17:15:39 +0000 (18:15 +0100)]
In the first frame set up a temporary scoreboard layout just to get rid of some console warnings in certain gamemodes (e.g. dm). This is because initially no layout can be properly set up until score_info data haven't been received.
terencehill [Tue, 2 Dec 2014 11:52:45 +0000 (12:52 +0100)]
score labels must be strunzoned as the server sends them twice on purpose (who knows why)
terencehill [Mon, 1 Dec 2014 20:04:14 +0000 (21:04 +0100)]
Fix gametype names in default scoreboard column layout
Mario [Mon, 1 Dec 2014 05:53:57 +0000 (16:53 +1100)]
Make arc burst last a bit longer
Mario [Sun, 30 Nov 2014 16:44:19 +0000 (03:44 +1100)]
Use reversion gravity/jumpvelocity
Mario [Sun, 30 Nov 2014 16:36:03 +0000 (03:36 +1100)]
Add new balance changes from testing cup
Mario [Sun, 30 Nov 2014 15:36:00 +0000 (02:36 +1100)]
Slow down rot speed a little more while carrying medic buff
Mario [Sun, 30 Nov 2014 04:46:36 +0000 (15:46 +1100)]
Show weapon location marker above the weapon, rather than pointing under it
Mario [Sun, 30 Nov 2014 02:53:29 +0000 (13:53 +1100)]
g_weaponspeedfactor isn't g_balance_damagepush_speedfactor
Mario [Sun, 30 Nov 2014 00:42:56 +0000 (11:42 +1100)]
Disable g_balance_damagepush_speedfactor in Nexuiz balance (Nexuiz had exact force at any speed)