xonotic/xonotic-data.pk3dir.git
5 years agoMerge branch 'master' into Mario/weapons_new
Mario [Thu, 27 Nov 2014 03:27:46 +0000 (14:27 +1100)]
Merge branch 'master' into Mario/weapons_new

Conflicts:
qcsrc/client/scoreboard.qc
qcsrc/server/w_minstanex.qc

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 agoApply the increased burst damage to regular weapon config
Mario [Thu, 27 Nov 2014 03:16:06 +0000 (14:16 +1100)]
Apply the increased burst damage to regular weapon config

5 years agoFix arc overheat fire sound playing after switching to another weapon
Mario [Thu, 27 Nov 2014 03:12:02 +0000 (14:12 +1100)]
Fix arc overheat fire sound playing after switching to another weapon

5 years agoMerge remote-tracking branch 'origin/master' into Mario/weapons_new
Mario [Thu, 27 Nov 2014 02:44:00 +0000 (13:44 +1100)]
Merge remote-tracking branch 'origin/master' into Mario/weapons_new

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 remote-tracking branch 'origin/master' into Mario/weapons_new
Mario [Thu, 27 Nov 2014 02:37:42 +0000 (13:37 +1100)]
Merge remote-tracking branch 'origin/master' into Mario/weapons_new

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 agoIncrease arc burst damage per second to 250 (150 felt weak)
Mario [Wed, 26 Nov 2014 23:24:09 +0000 (10:24 +1100)]
Increase arc burst damage per second to 250 (150 felt weak)

5 years agoMerge branch 'master' into Mario/weapons_new
Mario [Wed, 26 Nov 2014 21:55:02 +0000 (08:55 +1100)]
Merge branch 'master' into Mario/weapons_new

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

5 years agoMore Nexuiz stuff
Mario [Wed, 26 Nov 2014 11:15:43 +0000 (22:15 +1100)]
More Nexuiz stuff

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 agoRestore some old settings
Mario [Wed, 26 Nov 2014 10:24:10 +0000 (21:24 +1100)]
Restore some old settings

5 years agoDisable machinegun reload
Mario [Wed, 26 Nov 2014 10:07:06 +0000 (21:07 +1100)]
Disable machinegun reload

5 years agoFix switch delays
Mario [Wed, 26 Nov 2014 09:59:27 +0000 (20:59 +1100)]
Fix switch delays

5 years agoExecute the right weapon config
Mario [Wed, 26 Nov 2014 09:57:46 +0000 (20:57 +1100)]
Execute the right weapon config

5 years agoEnable vortex charge...
Mario [Wed, 26 Nov 2014 09:55:18 +0000 (20:55 +1100)]
Enable vortex charge...

5 years agoDisable vortex charge
Mario [Wed, 26 Nov 2014 09:54:51 +0000 (20:54 +1100)]
Disable vortex charge

5 years agoAdd Nexuiz 2.5.2 balance configs
Mario [Wed, 26 Nov 2014 09:43:18 +0000 (20:43 +1100)]
Add Nexuiz 2.5.2 balance configs

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 agoWeapons branch reloaded
Mario [Wed, 26 Nov 2014 00:04:18 +0000 (11:04 +1100)]
Weapons branch reloaded

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 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 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 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 '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

5 years agoAdd an event log print to replace player place message in console
Mario [Thu, 13 Nov 2014 14:35:30 +0000 (01:35 +1100)]
Add an event log print to replace player place message in console

5 years agoFix cloaked mode not getting forced enabled in CTS
Mario [Thu, 13 Nov 2014 14:28:33 +0000 (01:28 +1100)]
Fix cloaked mode not getting forced enabled in CTS

5 years agoMerge patch 1356 by It'sMe
Mario [Thu, 13 Nov 2014 14:16:19 +0000 (01:16 +1100)]
Merge patch 1356 by It'sMe

5 years agoMerge branch 'Mario/mutators2'
Mario [Thu, 13 Nov 2014 14:09:32 +0000 (01:09 +1100)]
Merge branch 'Mario/mutators2'

5 years agoMerge branch 'Mario/config_updates'
Mario [Thu, 13 Nov 2014 14:08:26 +0000 (01:08 +1100)]
Merge branch 'Mario/config_updates'

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

5 years agoMerge branch 'master' into Mario/mutators2
Mario [Thu, 13 Nov 2014 13:55:46 +0000 (00:55 +1100)]
Merge branch 'master' into Mario/mutators2

Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

5 years agoMerge branch 'Mario/gametype_votes'
Mario [Thu, 13 Nov 2014 13:41:03 +0000 (00:41 +1100)]
Merge branch 'Mario/gametype_votes'

5 years agoFix a double if check for gametypevote
Mario [Thu, 13 Nov 2014 11:20:33 +0000 (22:20 +1100)]
Fix a double if check for gametypevote

5 years agoMerge branch 'master' into Mario/gametype_votes
Mario [Thu, 13 Nov 2014 11:19:00 +0000 (22:19 +1100)]
Merge branch 'master' into Mario/gametype_votes

5 years agoUse spaces
Mario [Thu, 13 Nov 2014 11:11:08 +0000 (22:11 +1100)]
Use spaces

5 years agoMerge remote-tracking branch 'origin/master' into Mario/buffs
Mario [Thu, 13 Nov 2014 11:10:16 +0000 (22:10 +1100)]
Merge remote-tracking branch 'origin/master' into Mario/buffs

5 years agoMerge branch 'Mario/buffs'
Mario [Thu, 13 Nov 2014 11:07:45 +0000 (22:07 +1100)]
Merge branch 'Mario/buffs'

5 years agoMerge remote-tracking branch 'origin/master' into Mario/buffs
Mario [Thu, 13 Nov 2014 11:06:07 +0000 (22:06 +1100)]
Merge remote-tracking branch 'origin/master' into Mario/buffs

5 years agoUse spaces
Mario [Thu, 13 Nov 2014 11:01:21 +0000 (22:01 +1100)]
Use spaces

5 years agoUse old flight (jetpack) if buffs are disabled
Mario [Thu, 13 Nov 2014 11:00:01 +0000 (22:00 +1100)]
Use old flight (jetpack) if buffs are disabled

5 years agoUpdate stat for jumpheight in the jumpheight mutator hook (perhaps this should be...
Mario [Thu, 13 Nov 2014 10:51:23 +0000 (21:51 +1100)]
Update stat for jumpheight in the jumpheight mutator hook (perhaps this should be a global thing...)

5 years agoFix some cases of division by 0
Mario [Thu, 13 Nov 2014 10:40:03 +0000 (21:40 +1100)]
Fix some cases of division by 0

5 years agoRemove a duplicate stat definition
Mario [Thu, 13 Nov 2014 10:08:05 +0000 (21:08 +1100)]
Remove a duplicate stat definition

5 years agoMove all stats definitions into a single file, for easy reference
Mario [Thu, 13 Nov 2014 09:55:52 +0000 (20:55 +1100)]
Move all stats definitions into a single file, for easy reference

5 years agoMerge branch 'Mario/menu_modelupdate'
Mario [Thu, 13 Nov 2014 09:32:59 +0000 (20:32 +1100)]
Merge branch 'Mario/menu_modelupdate'

5 years agoMerge remote-tracking branch 'origin/sev/menu_skinlist_titles'
Mario [Thu, 13 Nov 2014 09:11:32 +0000 (20:11 +1100)]
Merge remote-tracking branch 'origin/sev/menu_skinlist_titles'

5 years agoUpdate player model list when menu is opened (no noticeable performance difference...
Mario [Thu, 13 Nov 2014 08:47:36 +0000 (19:47 +1100)]
Update player model list when menu is opened (no noticeable performance difference, fixes clients needing to menu_restart to load custom server's models)

5 years agoFix some minor issues
Mario [Thu, 13 Nov 2014 03:32:01 +0000 (14:32 +1100)]
Fix some minor issues