]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Lyberta [Thu, 31 Aug 2017 13:17:53 +0000 (16:17 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 31 Aug 2017 13:14:58 +0000 (16:14 +0300)]
Survival: Moved from server to common.
Lyberta [Thu, 31 Aug 2017 12:27:37 +0000 (15:27 +0300)]
Merged Lyberta/GunGame into Lyberta/master
Lyberta [Thu, 31 Aug 2017 09:58:43 +0000 (12:58 +0300)]
GunGame: Use STAT instead of _STAT.
Lyberta [Thu, 31 Aug 2017 09:52:12 +0000 (12:52 +0300)]
GunGame: Moved from server to common.
Lyberta [Thu, 31 Aug 2017 09:03:28 +0000 (12:03 +0300)]
Started GunGame.
Lyberta [Thu, 31 Aug 2017 02:45:24 +0000 (05:45 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 31 Aug 2017 02:45:05 +0000 (05:45 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Thu, 31 Aug 2017 02:44:43 +0000 (05:44 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Wed, 30 Aug 2017 05:07:32 +0000 (08:07 +0300)]
Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
Lyberta [Wed, 30 Aug 2017 05:05:00 +0000 (08:05 +0300)]
URS: Improved vampire buff.
Lyberta [Wed, 30 Aug 2017 04:34:31 +0000 (07:34 +0300)]
URS: Added GiveResourceWithLimit.
Lyberta [Wed, 30 Aug 2017 03:55:07 +0000 (06:55 +0300)]
Merge branch 'master' into Lyberta/URS2
Lyberta [Tue, 29 Aug 2017 23:42:35 +0000 (02:42 +0300)]
Merged Lyberta/URS2 into Lyberta/RandomStartWeapons.
Lyberta [Tue, 29 Aug 2017 23:38:32 +0000 (02:38 +0300)]
URS: Better hard limit description.
Lyberta [Tue, 29 Aug 2017 22:06:45 +0000 (01:06 +0300)]
URS: Added file info.
Mario [Tue, 29 Aug 2017 01:41:39 +0000 (01:41 +0000)]
Merge branch 'martin-t/dmgtext' into 'master'
Lyberta [Tue, 29 Aug 2017 01:38:48 +0000 (04:38 +0300)]
URS: Refactored Item_GiveAmmoTo.
Lyberta [Tue, 29 Aug 2017 01:07:06 +0000 (04:07 +0300)]
URS: Fixed compilation unit.
Lyberta [Tue, 29 Aug 2017 00:24:11 +0000 (03:24 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Tue, 29 Aug 2017 00:23:57 +0000 (03:23 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Tue, 29 Aug 2017 00:23:37 +0000 (03:23 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Tue, 29 Aug 2017 00:21:57 +0000 (03:21 +0300)]
Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
Lyberta [Tue, 29 Aug 2017 00:19:16 +0000 (03:19 +0300)]
URS: Ported g_damage.qc to URS.
Lyberta [Mon, 28 Aug 2017 23:55:38 +0000 (02:55 +0300)]
URS: Ported Nades mutator to URS.
Lyberta [Mon, 28 Aug 2017 23:34:01 +0000 (02:34 +0300)]
URS: Ported NIX mutator to URS.
Martin Taibr [Mon, 28 Aug 2017 23:26:00 +0000 (01:26 +0200)]
document spectatee_status, disable 2d dmgtext for observers
Lyberta [Mon, 28 Aug 2017 23:09:39 +0000 (02:09 +0300)]
URS: Ported Instagib mutator to URS.
Lyberta [Mon, 28 Aug 2017 22:27:11 +0000 (01:27 +0300)]
URS: Ported Campcheck mutator to URS.
Lyberta [Mon, 28 Aug 2017 22:22:43 +0000 (01:22 +0300)]
URS: Ported Buffs mutator to URS.
Lyberta [Mon, 28 Aug 2017 22:05:31 +0000 (01:05 +0300)]
URS: Ported Blood loss mutator to URS.
Lyberta [Mon, 28 Aug 2017 21:47:35 +0000 (00:47 +0300)]
URS: Added SetResourceAmount hook.
Lyberta [Mon, 28 Aug 2017 20:52:34 +0000 (23:52 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Mon, 28 Aug 2017 20:51:55 +0000 (23:51 +0300)]
Survival: Use GetResourceAmount.
Lyberta [Mon, 28 Aug 2017 20:44:18 +0000 (23:44 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Mon, 28 Aug 2017 20:43:26 +0000 (23:43 +0300)]
Player templates: Use SetResourceAmount.
Lyberta [Mon, 28 Aug 2017 20:35:40 +0000 (23:35 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Mon, 28 Aug 2017 20:32:49 +0000 (23:32 +0300)]
Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
Lyberta [Mon, 28 Aug 2017 20:27:27 +0000 (23:27 +0300)]
URS: Fixed compilation unit.
Lyberta [Mon, 28 Aug 2017 19:58:34 +0000 (22:58 +0300)]
URS: Added SetResourceAmount.
Lyberta [Mon, 28 Aug 2017 19:30:54 +0000 (22:30 +0300)]
Random start weapons: Use GetResourceAmount.
Lyberta [Mon, 28 Aug 2017 19:14:49 +0000 (22:14 +0300)]
Random start weapons: Merged URS2.
Lyberta [Mon, 28 Aug 2017 19:06:24 +0000 (22:06 +0300)]
URS: Renamed GetResourceProperty to GetResourceField, added GetResourceAmount.
Lyberta [Mon, 28 Aug 2017 18:50:02 +0000 (21:50 +0300)]
URS: Start RESOURCE_* constants from 1.
Lyberta [Mon, 28 Aug 2017 18:44:19 +0000 (21:44 +0300)]
Moved USR into separate file.
terencehill [Mon, 28 Aug 2017 12:36:29 +0000 (14:36 +0200)]
Suppress error output of "which"
Lyberta [Mon, 28 Aug 2017 11:05:44 +0000 (14:05 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Mon, 28 Aug 2017 11:05:18 +0000 (14:05 +0300)]
Survival: New waypoint sprites.
Lyberta [Mon, 28 Aug 2017 06:51:35 +0000 (09:51 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Mon, 28 Aug 2017 06:51:03 +0000 (09:51 +0300)]
Survival: Added plasma and fuel rewards.
Lyberta [Mon, 28 Aug 2017 06:45:14 +0000 (09:45 +0300)]
Survival: Updated to URS2.
Lyberta [Mon, 28 Aug 2017 06:41:13 +0000 (09:41 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Mon, 28 Aug 2017 06:40:07 +0000 (09:40 +0300)]
Player templates: Updated to URS2.
Lyberta [Mon, 28 Aug 2017 06:35:17 +0000 (09:35 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Mon, 28 Aug 2017 06:11:53 +0000 (09:11 +0300)]
Only only players can get random weapons.
Lyberta [Mon, 28 Aug 2017 06:06:45 +0000 (09:06 +0300)]
Merged Lyberta/URS2 into Lyberta/RandomStartWeapons.
Lyberta [Mon, 28 Aug 2017 05:25:39 +0000 (08:25 +0300)]
URS: Not only players have resources.
Lyberta [Mon, 28 Aug 2017 05:10:18 +0000 (08:10 +0300)]
URS: Added player argument to GetResourceLimit.
Lyberta [Mon, 28 Aug 2017 04:47:49 +0000 (07:47 +0300)]
Randon start weapons: Use GivePlayerResource instead of GivePlayerAmmo.
Lyberta [Mon, 28 Aug 2017 04:45:39 +0000 (07:45 +0300)]
Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
Lyberta [Mon, 28 Aug 2017 04:22:49 +0000 (07:22 +0300)]
Use GetResourceLimit in player_regen.
Lyberta [Mon, 28 Aug 2017 03:41:49 +0000 (06:41 +0300)]
Fixed typo.
Lyberta [Mon, 28 Aug 2017 03:39:49 +0000 (06:39 +0300)]
Started unified resource system - step 2.
Lyberta [Mon, 28 Aug 2017 03:30:12 +0000 (06:30 +0300)]
Player templates: Use GivePlayerResource instead of GivePlayerAmmo.
Lyberta [Mon, 28 Aug 2017 03:28:27 +0000 (06:28 +0300)]
Survival: Use GivePlayerResource instead of GivePlayerAmmo.
Mario [Mon, 28 Aug 2017 02:42:04 +0000 (02:42 +0000)]
Merge branch 'martin-t/okmodelsfix' into 'master'
Martin Taibr [Mon, 28 Aug 2017 02:04:55 +0000 (04:04 +0200)]
overkill: set sv_defaultplayermodel_* for pink and yellow teams
Lyberta [Mon, 28 Aug 2017 00:35:14 +0000 (03:35 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Mon, 28 Aug 2017 00:34:19 +0000 (03:34 +0300)]
Survival: Use GameRules_scoring_add.
Mario [Mon, 28 Aug 2017 00:13:47 +0000 (10:13 +1000)]
Add a spawnflag to start func_rotating off, and add a basic reset function to func_rotating
Lyberta [Mon, 28 Aug 2017 00:05:02 +0000 (03:05 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Mon, 28 Aug 2017 00:04:38 +0000 (03:04 +0300)]
Survival: Updated to new game rules.
Lyberta [Sun, 27 Aug 2017 23:47:20 +0000 (02:47 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sun, 27 Aug 2017 23:46:11 +0000 (02:46 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Sun, 27 Aug 2017 23:45:39 +0000 (02:45 +0300)]
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
Lyberta [Sun, 27 Aug 2017 23:44:07 +0000 (02:44 +0300)]
Merged master into Lyberta/TeamplayFixes_.
Lyberta [Sun, 27 Aug 2017 22:55:02 +0000 (01:55 +0300)]
Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
Lyberta [Sun, 27 Aug 2017 22:54:21 +0000 (01:54 +0300)]
Merge branch 'master' into Lyberta/RandomStartWeapons
terencehill [Sun, 27 Aug 2017 22:33:02 +0000 (00:33 +0200)]
Fix bots appearing on the scoreboard as spectators when switching map with the gotomap command (it doesn't remove bots of the previous match) and with minplayers > 1
Mario [Sun, 27 Aug 2017 22:21:29 +0000 (08:21 +1000)]
Fix button not resetting, and allow wait time < 0 to mean never return
Mario [Sun, 27 Aug 2017 19:43:51 +0000 (05:43 +1000)]
Move _cl_playermodel back into defaultXonotic.cfg (currently used on both server and client as an emergency fallback)
Mario [Sun, 27 Aug 2017 19:20:22 +0000 (19:20 +0000)]
Merge branch 'martin-t/okc' into 'master'
Martin Taibr [Sun, 27 Aug 2017 15:31:17 +0000 (17:31 +0200)]
optimize player based respawn time
Martin Taibr [Sun, 27 Aug 2017 15:04:58 +0000 (17:04 +0200)]
Merge branch 'master' into martin-t/okc
Mario [Sun, 27 Aug 2017 13:23:12 +0000 (23:23 +1000)]
Set the health/armor limit to 200 and fuel limit 100 in all balance configurations (the 999 limit is now hardcoded)
Mario [Sun, 27 Aug 2017 13:18:13 +0000 (13:18 +0000)]
Merge branch 'Lyberta/GivePlayerAmmo' into 'master'
Mario [Sun, 27 Aug 2017 12:46:31 +0000 (22:46 +1000)]
Fix a typo
Mario [Sun, 27 Aug 2017 12:41:08 +0000 (22:41 +1000)]
Merge branch 'master' into Lyberta/GivePlayerAmmo
terencehill [Sun, 27 Aug 2017 12:41:05 +0000 (14:41 +0200)]
Don's set allowed_timeouts for bots
TimePath [Sun, 27 Aug 2017 12:00:52 +0000 (12:00 +0000)]
Merge branch 'TimePath/gamerules' into 'master'
TimePath [Sun, 27 Aug 2017 10:11:26 +0000 (20:11 +1000)]
GameRules: initialize as early as possible
TimePath [Sun, 27 Aug 2017 09:25:26 +0000 (19:25 +1000)]
Nexball: move weapon code to weapon file
TimePath [Sun, 27 Aug 2017 09:07:38 +0000 (19:07 +1000)]
gamemodes: prevent addition and removal at runtime with a single macro
TimePath [Sun, 27 Aug 2017 08:34:53 +0000 (18:34 +1000)]
GameRules: simplify assigning teams bitmask
TimePath [Sun, 27 Aug 2017 08:01:07 +0000 (18:01 +1000)]
GameRules: encapsulate scoring
TimePath [Sun, 27 Aug 2017 06:59:25 +0000 (16:59 +1000)]
GameRules: encapsulate player 'VIP' status
Lyberta [Sun, 27 Aug 2017 06:33:25 +0000 (09:33 +0300)]
Renamed ITEM_COUNT_HARD_LIMIT to RESOURCE_AMOUNT_HARD_LIMIT.
TimePath [Sun, 27 Aug 2017 05:53:28 +0000 (15:53 +1000)]
GameRules: make `GameRules_teams(true)` imply `have_team_spawns = -1`
TimePath [Sun, 27 Aug 2017 05:26:41 +0000 (15:26 +1000)]
Refactor game rules
TimePath [Sun, 27 Aug 2017 03:24:58 +0000 (13:24 +1000)]
LOG_INFO: remove 'extra' newlines
projects / xonotic / xonotic-data.pk3dir.git / log