]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
TimePath [Fri, 23 Oct 2015 03:57:11 +0000 (14:57 +1100)]
Merge branch 'master' into TimePath/gamemode_composition
# Conflicts:
# qcsrc/common/mapinfo.qh
# qcsrc/server/mutators/events.qh
# qcsrc/server/mutators/mutator/sandbox.qc
Mario [Wed, 21 Oct 2015 21:33:31 +0000 (07:33 +1000)]
Don't mark sandbox as a mod
Mario [Wed, 21 Oct 2015 09:39:00 +0000 (09:39 +0000)]
Merge branch 'terencehill/menu_gametype_tooltips_2' into 'master'
Gametype tooltips
Display gametype description as tooltip when the cursor is over the gametype list
Allow to display tooltips in XonoticRegisteredSettingsList, add tooltip for "Models"
See merge request !243
terencehill [Wed, 21 Oct 2015 08:22:02 +0000 (10:22 +0200)]
Merge branch 'master' into terencehill/menu_gametype_tooltips_2
Mario [Sun, 18 Oct 2015 07:31:13 +0000 (17:31 +1000)]
Add a spawnflag to trigger_multiple to not trigger if a non-player entity touched it
Mario [Sun, 18 Oct 2015 07:10:49 +0000 (17:10 +1000)]
Increase the maximum number of monsters
TimePath [Sun, 18 Oct 2015 06:41:04 +0000 (17:41 +1100)]
Gametypes: mutator dependence capability
TimePath [Sun, 18 Oct 2015 06:14:13 +0000 (17:14 +1100)]
Bots: fix fix count
TimePath [Sun, 18 Oct 2015 05:28:48 +0000 (16:28 +1100)]
Gametypes: invert control
TimePath [Sun, 18 Oct 2015 04:21:03 +0000 (15:21 +1100)]
Mutators: combine headers
Mario [Sun, 18 Oct 2015 01:39:01 +0000 (11:39 +1000)]
Add some extra mutator hooks to change the persistently saved floats
TimePath [Thu, 15 Oct 2015 22:19:06 +0000 (22:19 +0000)]
Merge branch 'terencehill/slider_drag_fix' into 'master'
Fix sliders not setting cvars when dragged
Closes #1562
See merge request !239
TimePath [Thu, 15 Oct 2015 22:10:48 +0000 (09:10 +1100)]
lib: add LinkedList
Mario [Thu, 15 Oct 2015 18:34:31 +0000 (04:34 +1000)]
Add map options to disable item animation and the pickup_anyway flag
TimePath [Thu, 15 Oct 2015 06:06:53 +0000 (17:06 +1100)]
Net_LinkEntity: check against empty strings too
Mario [Thu, 15 Oct 2015 02:56:47 +0000 (12:56 +1000)]
Hack: mute all target_music entities when the match ends (fixes overlapping with sv_intermission_cdtrack)
Mario [Wed, 14 Oct 2015 22:58:32 +0000 (08:58 +1000)]
Little bit more cleanup
Mario [Wed, 14 Oct 2015 22:55:14 +0000 (08:55 +1000)]
Clean up shotorg code a bit
Mario [Wed, 14 Oct 2015 22:44:47 +0000 (08:44 +1000)]
Disable the server's ability to adjust the client's view model alignment
TimePath [Wed, 14 Oct 2015 22:33:38 +0000 (09:33 +1100)]
Mapinfo: decentralise mapinfo parsing
Mario [Wed, 14 Oct 2015 22:23:21 +0000 (08:23 +1000)]
Clean up the bounds a little bit
Mario [Wed, 14 Oct 2015 22:20:49 +0000 (08:20 +1000)]
Make a common function for getting the player's gun alignment
TimePath [Wed, 14 Oct 2015 21:18:32 +0000 (08:18 +1100)]
ForbidDropCurrentWeapon: better location
TimePath [Wed, 14 Oct 2015 21:11:05 +0000 (08:11 +1100)]
mapinfo: remove some IS_GAMETYPE macros
Mario [Wed, 14 Oct 2015 16:27:25 +0000 (02:27 +1000)]
Move some race related stuff out of the main physics function
Mario [Wed, 14 Oct 2015 15:46:53 +0000 (01:46 +1000)]
Remove debug print
Mario [Wed, 14 Oct 2015 15:42:05 +0000 (01:42 +1000)]
Little off topic (fix spawnpoints attached to moving objects)
Mario [Wed, 14 Oct 2015 15:32:22 +0000 (01:32 +1000)]
Move an existing mutator hook to support the killing of another gamemode specific check
Mario [Wed, 14 Oct 2015 15:29:29 +0000 (01:29 +1000)]
Another 2 gamemode specific checks killed
Mario [Wed, 14 Oct 2015 15:23:12 +0000 (01:23 +1000)]
Butcher another hidden gamemode specific block
Mario [Wed, 14 Oct 2015 15:17:33 +0000 (01:17 +1000)]
Abuse a sneaky mutator hook to kill yet another gamemode specific check
Mario [Wed, 14 Oct 2015 15:14:02 +0000 (01:14 +1000)]
Destroy another gamemode specific check
Mario [Wed, 14 Oct 2015 15:09:01 +0000 (01:09 +1000)]
Minor comment fix
Mario [Wed, 14 Oct 2015 15:07:14 +0000 (01:07 +1000)]
Fix another gamemode specific check
Mario [Wed, 14 Oct 2015 15:02:42 +0000 (01:02 +1000)]
Minor comment fix
Mario [Wed, 14 Oct 2015 15:01:25 +0000 (01:01 +1000)]
Move some more cvars and kill a keyhunt specific call
Mario [Wed, 14 Oct 2015 14:58:02 +0000 (00:58 +1000)]
Clean up even more
Mario [Wed, 14 Oct 2015 14:56:31 +0000 (00:56 +1000)]
Clean up a bunch of gamemode specific code
Mario [Wed, 14 Oct 2015 14:48:04 +0000 (00:48 +1000)]
Another gamemode specific file and check
Mario [Wed, 14 Oct 2015 14:44:16 +0000 (00:44 +1000)]
Shoot down another gamemode specific check
Mario [Wed, 14 Oct 2015 14:40:16 +0000 (00:40 +1000)]
Return true on MakePlayerObserver to not reset team, fixes another gamemode specific check
Mario [Wed, 14 Oct 2015 14:36:59 +0000 (00:36 +1000)]
Merge 3 hooks into 1 and kill another gamemode specific check
Mario [Wed, 14 Oct 2015 14:31:30 +0000 (00:31 +1000)]
Mario scored against another gamemode specific check
Mario [Wed, 14 Oct 2015 14:26:18 +0000 (00:26 +1000)]
Kill another gamemode specific check
Mario [Wed, 14 Oct 2015 14:10:14 +0000 (00:10 +1000)]
More gamemode specific checks gone boom
Mario [Wed, 14 Oct 2015 13:56:26 +0000 (23:56 +1000)]
Kill another bunch of gamemode specific checks
Mario [Wed, 14 Oct 2015 13:48:38 +0000 (23:48 +1000)]
Kill another gamemode specific check
Mario [Wed, 14 Oct 2015 13:34:38 +0000 (23:34 +1000)]
Fix another gamemode specific check
Mario [Wed, 14 Oct 2015 13:20:44 +0000 (23:20 +1000)]
Clean up GetTeamCount
Mario [Wed, 14 Oct 2015 12:59:36 +0000 (22:59 +1000)]
Fix gametype loading
Mario [Wed, 14 Oct 2015 12:47:22 +0000 (22:47 +1000)]
Move the superspec followfc command into the CTF mutator file
Mario [Wed, 14 Oct 2015 12:36:56 +0000 (22:36 +1000)]
Move all gamemode cvars into their files, also renamed a couple of freezetag frozen cvars
TimePath [Wed, 14 Oct 2015 11:43:10 +0000 (22:43 +1100)]
Static init: static_init_late()
TimePath [Wed, 14 Oct 2015 11:33:32 +0000 (22:33 +1100)]
Mutators: increase limit
TimePath [Wed, 14 Oct 2015 11:18:36 +0000 (22:18 +1100)]
Mutators: remove MUTATOR_(DECLARATION|DEFINITION)
Mario [Wed, 14 Oct 2015 11:18:59 +0000 (21:18 +1000)]
Merge branch 'TimePath/gamemode_composition' of https://gitlab.com/xonotic/xonotic-data.pk3dir into TimePath/gamemode_composition
TimePath [Wed, 14 Oct 2015 11:17:45 +0000 (22:17 +1100)]
Mutators: remove MUTATOR_HOOKFUNCTION_1
Mario [Wed, 14 Oct 2015 11:17:44 +0000 (21:17 +1000)]
Fix another function full of gamemode specific blocks
TimePath [Wed, 14 Oct 2015 11:07:19 +0000 (22:07 +1100)]
Mutators: port to new syntax
Mario [Wed, 14 Oct 2015 11:02:39 +0000 (21:02 +1000)]
One small hook for a plumber, one giant mutator file for Xonokind
Mario [Wed, 14 Oct 2015 02:05:07 +0000 (12:05 +1000)]
Add an argument to SetMovedir
Mario [Wed, 14 Oct 2015 00:01:16 +0000 (10:01 +1000)]
Clean up door key handling
Rudolf Polzer [Tue, 13 Oct 2015 23:48:25 +0000 (23:48 +0000)]
Merge branch 'terencehill/tooltips_cleanup' into 'master'
Tooltips cleanup
Remove a few superfluous tooltips
Fix a few tooltips
Reduce spam of "x minutes" and "x fps" strings of a few sliders
See merge request !230
TimePath [Tue, 13 Oct 2015 23:36:45 +0000 (10:36 +1100)]
Items: actually make no sound if the waypoint isn't visible for the player
Closes #1572
terencehill [Tue, 13 Oct 2015 22:41:50 +0000 (00:41 +0200)]
Merge branch 'master' into terencehill/tooltips_cleanup
Mario [Tue, 13 Oct 2015 22:23:49 +0000 (08:23 +1000)]
Fix barrel death message and assault objectives
Rudolf Polzer [Tue, 13 Oct 2015 19:19:48 +0000 (21:19 +0200)]
Transifex sync.
Rudolf Polzer [Tue, 13 Oct 2015 19:14:37 +0000 (21:14 +0200)]
Fix a format string bug.
Rudolf Polzer [Tue, 13 Oct 2015 19:14:11 +0000 (21:14 +0200)]
Download changes from transifex.
Rudolf Polzer [Tue, 13 Oct 2015 19:10:01 +0000 (21:10 +0200)]
Dummy transifex sync.
Rudolf Polzer [Tue, 13 Oct 2015 19:02:25 +0000 (21:02 +0200)]
Revert "Port the existing tooltips and keybinds translations to the main translation files"
This reverts commit
cd21b34eb6ea3331dbfc959e226d2884491d0c2d .
TimePath [Tue, 13 Oct 2015 07:52:46 +0000 (07:52 +0000)]
Merge branch 'TimePath/deathtypes' into 'master'
Deathtypes: port to registry
Yet another merge request
See merge request !234
TimePath [Tue, 13 Oct 2015 07:52:58 +0000 (18:52 +1100)]
Nades: don't forget to think
Closes #1571
Mario [Mon, 12 Oct 2015 20:30:58 +0000 (06:30 +1000)]
Minor whitespace cleanup
Mario [Mon, 12 Oct 2015 20:30:34 +0000 (06:30 +1000)]
Trigger targeted entities when key is picked up, mimics original Quake 1 behaviour
Mario [Mon, 12 Oct 2015 20:29:11 +0000 (06:29 +1000)]
Fix arguments for the door locked notifications
Mario [Mon, 12 Oct 2015 20:28:25 +0000 (06:28 +1000)]
Add an extra spawnflag to func_train to replicate original (Quake 1) behaviour (only starting moves when triggered)
Mario [Mon, 12 Oct 2015 11:50:43 +0000 (21:50 +1000)]
Fix multi model support with sv_defaultplayermodel cvars
TimePath [Sun, 11 Oct 2015 22:38:36 +0000 (09:38 +1100)]
Merge branch 'master' into TimePath/deathtypes
# Conflicts:
# qcsrc/client/damage.qc
# qcsrc/client/hud.qc
# qcsrc/client/main.qc
# qcsrc/client/progs.inc
# qcsrc/common/vehicles/vehicle/raptor_weapons.qc
# qcsrc/common/weapons/all.qc
# qcsrc/server/cheats.qc
# qcsrc/server/g_world.qc
# qcsrc/server/teamplay.qc
TimePath [Sun, 11 Oct 2015 08:40:25 +0000 (19:40 +1100)]
Merge branch 'TimePath/cleanup'
TimePath [Sun, 11 Oct 2015 07:10:16 +0000 (18:10 +1100)]
common: move instagib and nexball as they add custom items and weapons
TimePath [Sun, 11 Oct 2015 01:08:03 +0000 (12:08 +1100)]
lib: move csqcmodellib and warpzonelib
terencehill [Sat, 10 Oct 2015 11:32:08 +0000 (13:32 +0200)]
Merge branch 'master' into terencehill/menu_gametype_tooltips_2
Conflicts:
qcsrc/menu/xonotic/dialog_settings_game.qc
TimePath [Sat, 10 Oct 2015 08:35:02 +0000 (19:35 +1100)]
#includes: cleanup server
TimePath [Sat, 10 Oct 2015 03:28:18 +0000 (14:28 +1100)]
String: use strhasword
TimePath [Sat, 10 Oct 2015 03:24:19 +0000 (14:24 +1100)]
#includes: cleanup menu
TimePath [Sat, 10 Oct 2015 02:06:58 +0000 (13:06 +1100)]
#includes: cleanup client
terencehill [Fri, 9 Oct 2015 16:23:26 +0000 (18:23 +0200)]
Fix sliders not setting cvars when dragged
Mario [Fri, 9 Oct 2015 12:14:17 +0000 (22:14 +1000)]
Add a server side option to disable bunnyhopping
TimePath [Fri, 9 Oct 2015 11:33:48 +0000 (22:33 +1100)]
Commands: move dump commands to their respective systems
TimePath [Fri, 9 Oct 2015 11:03:03 +0000 (22:03 +1100)]
Commands: use registry
TimePath [Fri, 9 Oct 2015 09:32:33 +0000 (20:32 +1100)]
#includes: cleanup
Mario [Fri, 9 Oct 2015 09:22:16 +0000 (09:22 +0000)]
Merge branch 'Mario/multiplayer_snake' into 'master'
Merge branch Mario/multiplayer_snake (M merge request)
Adds support for multiple players in the Snake minigame.
See merge request !238
Mario [Fri, 9 Oct 2015 08:58:38 +0000 (18:58 +1000)]
Fix a minor issue with snake tail
Mario [Fri, 9 Oct 2015 08:47:38 +0000 (18:47 +1000)]
Merge branch 'master' into Mario/multiplayer_snake
TimePath [Fri, 9 Oct 2015 06:19:31 +0000 (17:19 +1100)]
Doxygen config
TimePath [Thu, 8 Oct 2015 21:24:21 +0000 (08:24 +1100)]
Raptor: fix primary friendly fire
Mario [Thu, 8 Oct 2015 13:22:16 +0000 (23:22 +1000)]
Fix compile
Mario [Thu, 8 Oct 2015 12:08:25 +0000 (22:08 +1000)]
Make an unused function used
TimePath [Thu, 8 Oct 2015 11:35:21 +0000 (22:35 +1100)]
Revert "Merge branch 'TimePath/bot_api' into 'master'
\r "
This reverts commit
a39af09cb4b15ec94461af2c1f314098ffe7ce0c , reversing
changes made to
81b0f2bc5760bb652515453ac450f2822a98b725 .