xonotic/xonotic-data.pk3dir.git
5 years agoadding a 'factory reset' button to the menu to reset all settings
Debugger [Wed, 14 Aug 2013 16:32:38 +0000 (02:32 +1000)]
adding a 'factory reset' button to the menu to reset all settings
(cherry picked from commit f999683)

5 years agoImplement reset button in input dialog. Fixes #1170
TimePath [Sat, 6 Dec 2014 03:19:46 +0000 (14:19 +1100)]
Implement reset button in input dialog. Fixes #1170

5 years agoTemporary fix for missing alternate flag textures (in the future, we should get prope...
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)

5 years agoMerge branch 'terencehill/ca_fixes_and_more'
Mario [Fri, 5 Dec 2014 11:29:07 +0000 (22:29 +1100)]
Merge branch 'terencehill/ca_fixes_and_more'

5 years agoMerge branch 'master' into 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

5 years agoAdd a few quick checks to ensure dead/frozen players don't enter vehicles
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

5 years agoMerge branch 'Mario/ctf_fixes'
Mario [Fri, 5 Dec 2014 11:02:53 +0000 (22:02 +1100)]
Merge branch 'Mario/ctf_fixes'

5 years agoFix flags passing through clips and becoming unreachable, partially fix picking up...
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

5 years agoUpdate credits
Mario [Thu, 4 Dec 2014 03:44:05 +0000 (14:44 +1100)]
Update credits

5 years agoMerge branch 'terencehill/scoreboard_fixes'
Mario [Thu, 4 Dec 2014 01:23:38 +0000 (12:23 +1100)]
Merge branch 'terencehill/scoreboard_fixes'

5 years agoIn the first frame set up a temporary scoreboard layout just to get rid of some conso...
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.

5 years agoscore labels must be strunzoned as the server sends them twice on purpose (who knows...
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)

5 years agoFix gametype names in default scoreboard column layout
terencehill [Mon, 1 Dec 2014 20:04:14 +0000 (21:04 +0100)]
Fix gametype names in default scoreboard column layout

5 years agoMake HUD_DefaultColumnLayout into a macro to avoid future issues with strcat
terencehill [Fri, 28 Nov 2014 17:39:44 +0000 (18:39 +0100)]
Make HUD_DefaultColumnLayout into a macro to avoid future issues with strcat

5 years agoFix broken defaut layout caused by recently added tdm columns: strcat accepts max...
terencehill [Fri, 28 Nov 2014 17:31:28 +0000 (18:31 +0100)]
Fix broken defaut layout caused by recently added tdm columns: strcat accepts max 8 arguments and simply ignores the next ones with no warning!

5 years agoMerge branch 'Mario/random_spawns'
Mario [Fri, 28 Nov 2014 03:21:38 +0000 (14:21 +1100)]
Merge branch 'Mario/random_spawns'

5 years agoDefault g_spawn_furthest to 0.5 (1 is too non-random for maps like stormkeep, where...
Mario [Fri, 28 Nov 2014 03:11:31 +0000 (14:11 +1100)]
Default g_spawn_furthest to 0.5 (1 is too non-random for maps like stormkeep, where you can easily spawncamp a player through the warpzone)

5 years agoMerge branch 'terencehill/notification_cvars'
Mario [Fri, 28 Nov 2014 00:33:53 +0000 (11:33 +1100)]
Merge branch 'terencehill/notification_cvars'

Conflicts:
notifications.cfg

5 years agoUpdate notifications.cfg
Mario [Fri, 28 Nov 2014 00:32:12 +0000 (11:32 +1100)]
Update notifications.cfg

5 years agoMerge branch 'terencehill/aim_shake_fix'
Mario [Fri, 28 Nov 2014 00:24:59 +0000 (11:24 +1100)]
Merge branch 'terencehill/aim_shake_fix'

5 years agoMerge branch 'Mario/hitsound_pitch'
Mario [Thu, 27 Nov 2014 08:51:13 +0000 (19:51 +1100)]
Merge branch 'Mario/hitsound_pitch'

5 years agoMerge branch 'master' into Mario/hitsound_pitch
Mario [Thu, 27 Nov 2014 08:50:43 +0000 (19:50 +1100)]
Merge branch 'master' into Mario/hitsound_pitch

5 years agoApply new pitch settings by TimePath
Mario [Thu, 27 Nov 2014 08:41:37 +0000 (19:41 +1100)]
Apply new pitch settings by TimePath

5 years agoFix crash with new compatibility aliases
Mario [Thu, 27 Nov 2014 08:38:19 +0000 (19:38 +1100)]
Fix crash with new compatibility aliases

5 years agoVariable hitsound pitch based on damage, disabled by default (modified by Melanosuchus)
Mario [Thu, 27 Nov 2014 07:51:15 +0000 (18:51 +1100)]
Variable hitsound pitch based on damage, disabled by default (modified by Melanosuchus)

5 years agoMerge branch 'nyov/instagib-rename'
Mario [Thu, 27 Nov 2014 03:25:31 +0000 (14:25 +1100)]
Merge branch 'nyov/instagib-rename'

5 years agoMerge branch 'master' into nyov/instagib-rename
Mario [Thu, 27 Nov 2014 03:24:29 +0000 (14:24 +1100)]
Merge branch 'master' into nyov/instagib-rename

5 years agoMerge branch 'TimePath/xonotic-data.pk3dir-TimePath/compat_weapons'
Mario [Thu, 27 Nov 2014 02:41:58 +0000 (13:41 +1100)]
Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/compat_weapons'

5 years agoMerge branch 'TimePath/xonotic-data.pk3dir-TimePath/simpleitems'
Mario [Thu, 27 Nov 2014 02:33:18 +0000 (13:33 +1100)]
Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/simpleitems'

5 years agoRename weapon aliases, retain backwards compatibility with aliases
TimePath [Thu, 27 Nov 2014 01:28:36 +0000 (12:28 +1100)]
Rename weapon aliases, retain backwards compatibility with aliases

5 years agoMerge branch 'nyov/combined_updates/effects'
Mario [Thu, 27 Nov 2014 01:35:05 +0000 (12:35 +1100)]
Merge branch 'nyov/combined_updates/effects'

5 years agoMerge branch 'master' into nyov/combined_updates/effects
Mario [Thu, 27 Nov 2014 01:34:08 +0000 (12:34 +1100)]
Merge branch 'master' into nyov/combined_updates/effects

5 years agoRegenerate simple items textures
TimePath [Thu, 27 Nov 2014 01:03:09 +0000 (12:03 +1100)]
Regenerate simple items textures
Add models for new toys and arc

5 years agoMore human readable cvar descriptions
terencehill [Wed, 26 Nov 2014 21:21:49 +0000 (22:21 +0100)]
More human readable cvar descriptions

5 years agoShorten descriptions for most notification cvars
terencehill [Wed, 26 Nov 2014 18:24:57 +0000 (19:24 +0100)]
Shorten descriptions for most notification cvars

5 years agoClearer description of notification_allow_chatboxprint
terencehill [Wed, 26 Nov 2014 18:22:42 +0000 (19:22 +0100)]
Clearer description of notification_allow_chatboxprint

5 years agoFix typo
terencehill [Wed, 26 Nov 2014 17:56:10 +0000 (18:56 +0100)]
Fix typo

5 years agoImprove deadflag handling.
Rudolf Polzer [Wed, 26 Nov 2014 12:53:11 +0000 (13:53 +0100)]
Improve deadflag handling.

5 years agoMerge remote-tracking branch 'origin/Mario/old_tutorial'
Rudolf Polzer [Wed, 26 Nov 2014 10:45:18 +0000 (11:45 +0100)]
Merge remote-tracking branch 'origin/Mario/old_tutorial'

5 years agoMerge branch 'nyov/samual/combined_updates' into nyov/combined_updates/effects
nyov [Wed, 26 Nov 2014 05:40:17 +0000 (05:40 +0000)]
Merge branch 'nyov/samual/combined_updates' into nyov/combined_updates/effects

5 years agoRenaming MinstaGib mode to InstaGib, as per xonvote (#31)
nyov [Sun, 16 Nov 2014 04:43:08 +0000 (04:43 +0000)]
Renaming MinstaGib mode to InstaGib, as per xonvote (#31)

5 years agoBound vertical view angle to sane values
terencehill [Tue, 25 Nov 2014 22:18:41 +0000 (23:18 +0100)]
Bound vertical view angle to sane values

5 years agoFix shake effect being applied only on the first damage of a multiple shot
terencehill [Tue, 25 Nov 2014 21:51:18 +0000 (22:51 +0100)]
Fix shake effect being applied only on the first damage of a multiple shot

5 years agoReset view angles whenever a bot respawns
terencehill [Tue, 25 Nov 2014 19:05:39 +0000 (20:05 +0100)]
Reset view angles whenever a bot respawns

5 years agoDon't apply aim shake effect whenever a bot dies
terencehill [Tue, 25 Nov 2014 17:58:03 +0000 (18:58 +0100)]
Don't apply aim shake effect whenever a bot dies

5 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

5 years agoMerge remote-tracking branch 'origin/nyov/remove-playermodeltokens'
Mario [Tue, 25 Nov 2014 06:34:47 +0000 (17:34 +1100)]
Merge remote-tracking branch 'origin/nyov/remove-playermodeltokens'

5 years agoMerge remote-tracking branch 'origin/terencehill/verbose_notification_fix'
Mario [Tue, 25 Nov 2014 06:06:15 +0000 (17:06 +1100)]
Merge remote-tracking branch 'origin/terencehill/verbose_notification_fix'

5 years agoDarken eliminated player's row instead of showing an icon
terencehill [Sun, 23 Nov 2014 19:46:43 +0000 (20:46 +0100)]
Darken eliminated player's row instead of showing an icon

5 years agoMerge branch 'master' into terencehill/verbose_notification_fix
Mario [Sat, 22 Nov 2014 06:48:42 +0000 (17:48 +1100)]
Merge branch 'master' into terencehill/verbose_notification_fix

5 years agoMark eliminated players on the scoreboard in freezetag too
terencehill [Fri, 21 Nov 2014 23:19:00 +0000 (00:19 +0100)]
Mark eliminated players on the scoreboard in freezetag too

5 years agoMake available networking mechanism for reporting eliminated players to other gamemod...
terencehill [Thu, 20 Nov 2014 19:12:24 +0000 (20:12 +0100)]
Make available networking mechanism for reporting eliminated players to other gamemodes too

5 years agoCA: mark eliminated players in the scoreboard
terencehill [Wed, 19 Nov 2014 13:16:22 +0000 (14:16 +0100)]
CA: mark eliminated players in the scoreboard

5 years agoremove playermodel descriptions
nyov [Tue, 18 Nov 2014 14:54:28 +0000 (14:54 +0000)]
remove playermodel descriptions

Model description has been moved to a keyword field, which limits
them to a single line but lets us keep the text around.
(Additional multiline descriptions at the end of the file are still
 possible, but won't look good with the model name moved to the bottom)

5 years agoMerge branch 'master' into samual/combined_updates
Mario [Mon, 17 Nov 2014 23:58:19 +0000 (10:58 +1100)]
Merge branch 'master' into samual/combined_updates

Conflicts:
defaultXonotic.cfg
effects-high.cfg
effects-low.cfg
effects-med.cfg
effects-normal.cfg
effects-omg.cfg
effects-ultimate.cfg
effects-ultra.cfg
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/demolist.c
qcsrc/menu/xonotic/dialog_settings_effects.c
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/xonotic/maplist.c
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/playerstats.qc
qcsrc/server/progs.src

5 years agoRemove old tutorial voice clips, so we can advertise 0.8 as being 7.6MB smaller
Mario [Sun, 16 Nov 2014 14:01:45 +0000 (01:01 +1100)]
Remove old tutorial voice clips, so we can advertise 0.8 as being 7.6MB smaller

5 years agoMerge branch 'Mario/legacy_gametypenames'
Mario [Sun, 16 Nov 2014 12:20:35 +0000 (23:20 +1100)]
Merge branch 'Mario/legacy_gametypenames'

5 years agoFix assault and race legacy gametype names
Mario [Sun, 16 Nov 2014 12:13:36 +0000 (23:13 +1100)]
Fix assault and race legacy gametype names

5 years agoMerge branch 'nyov/remove-playermodeltokens'
Mario [Sun, 16 Nov 2014 11:45:25 +0000 (22:45 +1100)]
Merge branch 'nyov/remove-playermodeltokens'

5 years agoremove playermodel display texts 'age' and 'weight'
nyov [Sun, 16 Nov 2014 09:43:28 +0000 (09:43 +0000)]
remove playermodel display texts 'age' and 'weight'

(but not description, to keep the change simple)
as per xonvote 186

closes xonotic/xonotic#37

5 years agoFix qcc version check to work with the same relative paths as the other
Rudolf Polzer [Sat, 15 Nov 2014 09:05:04 +0000 (10:05 +0100)]
Fix qcc version check to work with the same relative paths as the other
qcc calls.

5 years agoMerge remote-tracking branch 'origin/sev/menu_maplist_controls'
Mario [Sat, 15 Nov 2014 07:30:19 +0000 (18:30 +1100)]
Merge remote-tracking branch 'origin/sev/menu_maplist_controls'

5 years agoMerge remote-tracking branch 'origin/sev/menu_focus_fix'
Mario [Sat, 15 Nov 2014 06:51:24 +0000 (17:51 +1100)]
Merge remote-tracking branch 'origin/sev/menu_focus_fix'

5 years agoDon't execute bot code when bots are forced observer. In CA it allowed bots added...
terencehill [Sat, 15 Nov 2014 00:44:18 +0000 (01:44 +0100)]
Don't execute bot code when bots are forced observer. In CA it allowed bots added in the middle of a round to join the game at the first jump (!).

5 years agoFix g_balance_teams not working in CA (it wasn't taking into account players that...
terencehill [Fri, 14 Nov 2014 23:55:07 +0000 (00:55 +0100)]
Fix g_balance_teams not working in CA (it wasn't taking into account players that join in the middle of a round)

5 years agoPrevent the slider button from flickering when changing gametype
Severin Meyer [Fri, 14 Nov 2014 14:04:08 +0000 (15:04 +0100)]
Prevent the slider button from flickering when changing gametype

5 years agoCorrect the SUPER type
Severin Meyer [Fri, 14 Nov 2014 10:56:03 +0000 (11:56 +0100)]
Correct the SUPER type

5 years agoSwitch focus to the maplist when pressing ENTER in the gametypelist
Severin Meyer [Fri, 14 Nov 2014 10:47:53 +0000 (11:47 +0100)]
Switch focus to the maplist when pressing ENTER in the gametypelist

5 years agoMerge remote-tracking branch 'origin/Mario/misc_fixes'
Mario [Fri, 14 Nov 2014 09:18:08 +0000 (20:18 +1100)]
Merge remote-tracking branch 'origin/Mario/misc_fixes'

5 years agoMerge remote-tracking branch 'origin/Mario/despawn_effects'
Mario [Fri, 14 Nov 2014 09:16:46 +0000 (20:16 +1100)]
Merge remote-tracking branch 'origin/Mario/despawn_effects'

5 years agoRevert "Merge branch 'Mario/despawn_effects'"
Mario [Fri, 14 Nov 2014 09:09:39 +0000 (20:09 +1100)]
Revert "Merge branch 'Mario/despawn_effects'"

This reverts commit 28931c8069eb1d283f01a26f31ad91d921294d9c, reversing
changes made to d55940c3b65bffebfd3c571067398c65b29e9488.

5 years agoMerge branch 'Mario/despawn_effects'
Mario [Fri, 14 Nov 2014 08:37:29 +0000 (19:37 +1100)]
Merge branch 'Mario/despawn_effects'

5 years agoMerge branch 'master' into Mario/despawn_effects
Mario [Fri, 14 Nov 2014 08:37:11 +0000 (19:37 +1100)]
Merge branch 'master' into Mario/despawn_effects

5 years agoMerge branch 'Mario/tdm_mutator'
Mario [Fri, 14 Nov 2014 08:34:06 +0000 (19:34 +1100)]
Merge branch 'Mario/tdm_mutator'

5 years agoShow a "despawn" particle effect when a player disconnects/spectates
Mario [Fri, 14 Nov 2014 05:48:56 +0000 (16:48 +1100)]
Show a "despawn" particle effect when a player disconnects/spectates

5 years agoRemove old stat definitions
Mario [Fri, 14 Nov 2014 04:06:32 +0000 (15:06 +1100)]
Remove old stat definitions

5 years agoRemove some missed TDM junk
Mario [Fri, 14 Nov 2014 02:44:00 +0000 (13:44 +1100)]
Remove some missed TDM junk

5 years agoMove TDM to the mutator system, for peace of mind
Mario [Fri, 14 Nov 2014 02:41:08 +0000 (13:41 +1100)]
Move TDM to the mutator system, for peace of mind

5 years agoSome random fixes and stuff (centerprints converted to notifications, less spam when...
Mario [Fri, 14 Nov 2014 02:28:27 +0000 (13:28 +1100)]
Some random fixes and stuff (centerprints converted to notifications, less spam when using target_music with bots)

5 years agoMerge branch 'master' into Mario/weapons
Mario [Fri, 14 Nov 2014 02:05:18 +0000 (13:05 +1100)]
Merge branch 'master' into Mario/weapons

Conflicts:
mutators.cfg
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src
qcsrc/server/w_electro.qc
qcsrc/server/w_minelayer.qc

5 years agoEnable the Container class to save and restore the focus chain
Severin Meyer [Fri, 14 Nov 2014 01:05:46 +0000 (02:05 +0100)]
Enable the Container class to save and restore the focus chain

5 years agoMerge branch 'Mario/weaponarena_one'
Mario [Thu, 13 Nov 2014 18:46:59 +0000 (05:46 +1100)]
Merge branch 'Mario/weaponarena_one'

5 years agoAllow g_weaponarena 1 to do same function as g_weaponarena all
Mario [Thu, 13 Nov 2014 18:37:17 +0000 (05:37 +1100)]
Allow g_weaponarena 1 to do same function as g_weaponarena all

5 years agoFix another funny quote
Mario [Thu, 13 Nov 2014 18:20:43 +0000 (05:20 +1100)]
Fix another funny quote

5 years agoFix funny quotes
Mario [Thu, 13 Nov 2014 18:18:28 +0000 (05:18 +1100)]
Fix funny quotes

5 years agoAdd back chase toggle
Mario [Thu, 13 Nov 2014 18:02:33 +0000 (05:02 +1100)]
Add back chase toggle

5 years agoAdd French keybind translations by Spike29.
Mario [Thu, 13 Nov 2014 17:59:34 +0000 (04:59 +1100)]
Add French keybind translations by Spike29.

5 years agoMerge branch 'master' into terencehill/ca_fixes
Mario [Thu, 13 Nov 2014 17:47:08 +0000 (04:47 +1100)]
Merge branch 'master' into terencehill/ca_fixes

Conflicts:
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/server/mutators/gamemode_freezetag.qc

5 years agoMerge branch 'Mario/domination_roundbased'
Mario [Thu, 13 Nov 2014 17:09:11 +0000 (04:09 +1100)]
Merge branch 'Mario/domination_roundbased'

5 years agoAdd German keybind translations by XonFreddy
Mario [Thu, 13 Nov 2014 17:08:38 +0000 (04:08 +1100)]
Add German keybind translations by XonFreddy

5 years agoMerge branch 'Mario/nade_updates'
Mario [Thu, 13 Nov 2014 16:48:46 +0000 (03:48 +1100)]
Merge branch 'Mario/nade_updates'

5 years agoAdd some French keybind translations by Calinou
Mario [Thu, 13 Nov 2014 16:47:00 +0000 (03:47 +1100)]
Add some French keybind translations by Calinou

5 years agoFix nades and clips
Mario [Thu, 13 Nov 2014 16:28:55 +0000 (03:28 +1100)]
Fix nades and clips

5 years agoFix healing nade
Mario [Thu, 13 Nov 2014 16:17:13 +0000 (03:17 +1100)]
Fix healing nade

5 years agoAttempt to prevent nades from entering clips
Mario [Thu, 13 Nov 2014 15:50:48 +0000 (02:50 +1100)]
Attempt to prevent nades from entering clips

5 years agoIncrease pokenade lifetime and add an option for infinite lifetime
Mario [Thu, 13 Nov 2014 15:37:36 +0000 (02:37 +1100)]
Increase pokenade lifetime and add an option for infinite lifetime

5 years agoDo a trace before teleporting player, to make sure we're not putting them into a...
Mario [Thu, 13 Nov 2014 15:34:11 +0000 (02:34 +1100)]
Do a trace before teleporting player, to make sure we're not putting them into a wall

5 years agoMerge branch 'master' into Mario/domination_roundbased
Mario [Thu, 13 Nov 2014 15:02:50 +0000 (02:02 +1100)]
Merge branch 'master' into Mario/domination_roundbased

Conflicts:
qcsrc/common/constants.qh

5 years agoMerge branch 'master' into Mario/nade_updates
Mario [Thu, 13 Nov 2014 14:52:28 +0000 (01:52 +1100)]
Merge branch 'master' into Mario/nade_updates

Conflicts:
qcsrc/client/progs.src
qcsrc/common/constants.qh
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/cl_physics.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/progs.src

5 years agoMerge branch 'Mario/race_cts_mutators'
Mario [Thu, 13 Nov 2014 14:39:17 +0000 (01:39 +1100)]
Merge branch 'Mario/race_cts_mutators'

Conflicts:
qcsrc/server/progs.src