]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Lyberta [Mon, 11 Jun 2018 13:34:14 +0000 (16:34 +0300)]
Merge branch 'Lyberta/GunGame' into Lyberta/master
Lyberta [Mon, 11 Jun 2018 13:30:46 +0000 (16:30 +0300)]
GunGame: Polish.
Lyberta [Mon, 11 Jun 2018 10:20:40 +0000 (13:20 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Mon, 11 Jun 2018 10:18:30 +0000 (13:18 +0300)]
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
Lyberta [Mon, 11 Jun 2018 10:15:27 +0000 (13:15 +0300)]
Merge branch 'master' into Lyberta/TeamplayOverhaul
Lyberta [Mon, 11 Jun 2018 10:10:19 +0000 (13:10 +0300)]
Merge branch 'master' into Lyberta/GunGame
Mario [Mon, 11 Jun 2018 08:55:19 +0000 (08:55 +0000)]
Merge branch 'martin-t/defaults' into 'master'
Changes to defaults
See merge request xonotic/xonotic-data.pk3dir!530
Mario [Mon, 11 Jun 2018 08:52:58 +0000 (08:52 +0000)]
Merge branch 'Lyberta/PrintMove' into 'master'
Moved print functions to client.q[ch].
See merge request xonotic/xonotic-data.pk3dir!555
Mario [Mon, 11 Jun 2018 08:11:49 +0000 (18:11 +1000)]
Disable sv_vote_gametype (to be decided by a poll)
Mario [Mon, 11 Jun 2018 08:06:38 +0000 (18:06 +1000)]
Merge branch 'master' into martin-t/defaults
Mario [Mon, 11 Jun 2018 07:50:04 +0000 (17:50 +1000)]
Move dedicated_print to miscfunctions (not a client-specific function)
Mario [Mon, 11 Jun 2018 07:48:10 +0000 (17:48 +1000)]
Merge branch 'master' into Lyberta/PrintMove
Mario [Mon, 11 Jun 2018 04:45:51 +0000 (14:45 +1000)]
Purge direct includes of mutators/events.qh in favour of the _mod files
Mario [Mon, 11 Jun 2018 04:33:30 +0000 (14:33 +1000)]
Fix compilation unit
Mario [Mon, 11 Jun 2018 02:45:15 +0000 (12:45 +1000)]
Another attempt to fix compilation unit
Mario [Mon, 11 Jun 2018 02:15:01 +0000 (12:15 +1000)]
Fix compilation unit
Mario [Mon, 11 Jun 2018 02:12:48 +0000 (02:12 +0000)]
Merge branch 'Lyberta/OverkillWeaponIcons' into 'master'
Overkill weapon icons code
See merge request xonotic/xonotic-data.pk3dir!563
Lyberta [Mon, 11 Jun 2018 00:29:24 +0000 (03:29 +0300)]
Use icon names from default HUD theme for OK weapons.
Mario [Sun, 10 Jun 2018 11:32:54 +0000 (21:32 +1000)]
Port the g_inventory global entity from the scoreboard items branch, for accessing the player's inventory locally
Mario [Sun, 10 Jun 2018 09:44:11 +0000 (19:44 +1000)]
Fix a couple more compilation unit failures
Mario [Sun, 10 Jun 2018 09:41:06 +0000 (19:41 +1000)]
Add the item definition as a paremter to m_iteminit so the correct field can be accessed later
Mario [Sun, 10 Jun 2018 09:24:43 +0000 (19:24 +1000)]
Replace some ammo field references with resources
Lyberta [Sun, 10 Jun 2018 08:35:27 +0000 (11:35 +0300)]
Merge branch 'master' into Lyberta/TeamplayOverhaul
Lyberta [Sun, 10 Jun 2018 08:13:53 +0000 (11:13 +0300)]
Merge branch 'master' into Lyberta/GunGame
Mario [Sun, 10 Jun 2018 08:12:06 +0000 (18:12 +1000)]
Move the client portion of client walls into the models file now that it's common
Mario [Sun, 10 Jun 2018 08:04:11 +0000 (08:04 +0000)]
Merge branch 'Lyberta/OverkillWeaponsMutator' into 'master'
Overkill weapons mutator
See merge request xonotic/xonotic-data.pk3dir!561
Mario [Sun, 10 Jun 2018 07:59:10 +0000 (17:59 +1000)]
Fix another random include error
Lyberta [Sun, 10 Jun 2018 07:47:41 +0000 (10:47 +0300)]
Added Overkill weapons mutator.
Mario [Sun, 10 Jun 2018 07:40:12 +0000 (17:40 +1000)]
Remove g_subs
Mario [Sun, 10 Jun 2018 06:59:33 +0000 (16:59 +1000)]
Clean up g_subs a bit more
Mario [Sun, 10 Jun 2018 06:22:14 +0000 (06:22 +0000)]
Merge branch 'Lyberta/RandomItems2' into 'master'
Better random items.
See merge request xonotic/xonotic-data.pk3dir!560
Mario [Sun, 10 Jun 2018 06:21:04 +0000 (16:21 +1000)]
Move all the remaining gamemodes to common
Lyberta [Sun, 10 Jun 2018 04:36:35 +0000 (07:36 +0300)]
Merge branch 'master' into Lyberta/RandomItems2
Mario [Sun, 10 Jun 2018 04:20:11 +0000 (14:20 +1000)]
Fix compilation unit
Mario [Sun, 10 Jun 2018 03:48:12 +0000 (13:48 +1000)]
Fix a missed use of SUB_UseTargets
Mario [Sun, 10 Jun 2018 03:24:27 +0000 (13:24 +1000)]
Possibly fix compilation unit
Lyberta [Sat, 9 Jun 2018 21:41:06 +0000 (00:41 +0300)]
Better random items.
Mario [Sat, 9 Jun 2018 16:48:10 +0000 (02:48 +1000)]
Remove a bit more dead code and put an include in the right place
Mario [Sat, 9 Jun 2018 16:35:21 +0000 (02:35 +1000)]
Remove some dead code from steerlib
Mario [Sat, 9 Jun 2018 16:29:39 +0000 (02:29 +1000)]
Move dynlight to mapobjects
Mario [Sat, 9 Jun 2018 16:23:57 +0000 (02:23 +1000)]
Clean up mapobjects' includes a little bit, move some subs around
Mario [Sat, 9 Jun 2018 15:52:03 +0000 (01:52 +1000)]
Rename triggers to mapobjects
Mario [Sat, 9 Jun 2018 15:27:39 +0000 (01:27 +1000)]
Move an assault constant into the assault file
Mario [Sat, 9 Jun 2018 15:18:49 +0000 (15:18 +0000)]
Merge branch 'morosophos/rankings_cnt' into 'master'
Morosophos/rankings cnt
See merge request xonotic/xonotic-data.pk3dir!558
Lyberta [Sat, 9 Jun 2018 14:01:26 +0000 (17:01 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 9 Jun 2018 14:00:13 +0000 (17:00 +0300)]
Survival: Fixed coop.
Mario [Sat, 9 Jun 2018 13:31:14 +0000 (23:31 +1000)]
Move another small piece of random weapons around
Mario [Sat, 9 Jun 2018 13:21:57 +0000 (23:21 +1000)]
Move more of weaponarena_random into its mutator file
Mario [Sat, 9 Jun 2018 12:15:07 +0000 (22:15 +1000)]
Fix dual wielding devastator and mortar, enable vortex and rifle in dual wielding now that aiming is offset
Mario [Sat, 9 Jun 2018 07:22:47 +0000 (17:22 +1000)]
Fix resetting of the rifle accumulator
Mario [Sat, 9 Jun 2018 06:44:04 +0000 (16:44 +1000)]
Optimize racer performance a tiny bit
Lyberta [Fri, 8 Jun 2018 15:50:08 +0000 (18:50 +0300)]
Updated game hash.
Lyberta [Fri, 8 Jun 2018 15:03:14 +0000 (18:03 +0300)]
Merge branch 'Lyberta/GunGame' into Lyberta/master
Lyberta [Fri, 8 Jun 2018 15:02:58 +0000 (18:02 +0300)]
Merge branch 'Lyberta/Sprint' into Lyberta/master
Lyberta [Fri, 8 Jun 2018 15:02:48 +0000 (18:02 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 8 Jun 2018 15:01:35 +0000 (18:01 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Fri, 8 Jun 2018 15:00:19 +0000 (18:00 +0300)]
Merge branch 'master' into Lyberta/PlayerTemplates
Lyberta [Fri, 8 Jun 2018 14:55:32 +0000 (17:55 +0300)]
Merge branch 'master' into Lyberta/Sprint
Lyberta [Fri, 8 Jun 2018 14:37:48 +0000 (17:37 +0300)]
Merge branch 'master' into Lyberta/TeamplayOverhaul
Lyberta [Fri, 8 Jun 2018 14:20:01 +0000 (17:20 +0300)]
Merge branch 'master' into Lyberta/PrintMove
Lyberta [Fri, 8 Jun 2018 13:54:16 +0000 (16:54 +0300)]
Merge branch 'master' into Lyberta/GunGame
Lyberta [Fri, 8 Jun 2018 13:44:56 +0000 (16:44 +0300)]
Merge branch 'master' into Lyberta/PrintMove
Lyberta [Fri, 8 Jun 2018 09:42:05 +0000 (12:42 +0300)]
Merge branch 'master' into Lyberta/GunGame
Morosophos [Thu, 7 Jun 2018 19:46:03 +0000 (22:46 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt
Mario [Thu, 7 Jun 2018 15:36:24 +0000 (01:36 +1000)]
Update hash
Mario [Wed, 6 Jun 2018 11:57:59 +0000 (21:57 +1000)]
Fix the unit test
Lyberta [Wed, 6 Jun 2018 11:52:03 +0000 (14:52 +0300)]
GunGame: Synced with master.
Lyberta [Wed, 6 Jun 2018 11:40:11 +0000 (14:40 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Wed, 6 Jun 2018 11:35:57 +0000 (14:35 +0300)]
Survival: Synced with master.
Lyberta [Wed, 6 Jun 2018 11:06:56 +0000 (14:06 +0300)]
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
Lyberta [Wed, 6 Jun 2018 11:05:25 +0000 (14:05 +0300)]
Player templates: Synced with master.
Lyberta [Wed, 6 Jun 2018 10:56:04 +0000 (13:56 +0300)]
Merge branch 'master' into Lyberta/PlayerTemplates
Lyberta [Wed, 6 Jun 2018 10:54:50 +0000 (13:54 +0300)]
Merge branch 'master' into Lyberta/TeamplayOverhaul
Lyberta [Wed, 6 Jun 2018 10:53:58 +0000 (13:53 +0300)]
Merge branch 'master' into Lyberta/PrintMove
Lyberta [Wed, 6 Jun 2018 10:52:58 +0000 (13:52 +0300)]
Merge branch 'master' into Lyberta/GunGame
Mario [Wed, 6 Jun 2018 08:39:02 +0000 (08:39 +0000)]
Merge branch 'Lyberta/mutator_is_enabled' into 'master'
Added MUTATOR_IS_ENABLED macro.
See merge request xonotic/xonotic-data.pk3dir!559
Lyberta [Wed, 6 Jun 2018 02:00:11 +0000 (05:00 +0300)]
Fixed random items check in new toys.
Lyberta [Wed, 6 Jun 2018 01:50:28 +0000 (04:50 +0300)]
Fixed compilation units.
Lyberta [Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)]
Merge branch 'master' into Lyberta/mutator_is_enabled
Lyberta [Wed, 6 Jun 2018 00:38:40 +0000 (03:38 +0300)]
Added MUTATOR_IS_ENABLED macro.
Mario [Tue, 5 Jun 2018 07:26:08 +0000 (17:26 +1000)]
Merge branch 'Mario/weapons_stat'
Mario [Tue, 5 Jun 2018 07:23:55 +0000 (17:23 +1000)]
Purge .weapons field
Mario [Tue, 5 Jun 2018 06:45:02 +0000 (16:45 +1000)]
Replace uses of the .weapons field with STAT(WEAPONS, player), doesn't replace the non-player uses yet
Morosophos [Tue, 5 Jun 2018 07:22:34 +0000 (10:22 +0300)]
Use separate variable to store number of records to arrive from the server
Nick Savchenko [Mon, 4 Jun 2018 20:57:17 +0000 (23:57 +0300)]
Merge remote-tracking branch 'origin/master' into morosophos/rankings_cnt
Nick Savchenko [Mon, 4 Jun 2018 20:51:42 +0000 (23:51 +0300)]
Store 99 time records in the server database. Send g_cts_send_rankings_cnt records to the client (default 15)
terencehill [Mon, 4 Jun 2018 16:31:17 +0000 (18:31 +0200)]
Spectate next player if the spectated player becomes observer (very useful in CA) or disconnects
Mario [Mon, 4 Jun 2018 15:40:50 +0000 (01:40 +1000)]
Add an armor piercing option to vortex
terencehill [Mon, 4 Jun 2018 14:59:12 +0000 (16:59 +0200)]
Clan Arena: fix team selection dialog displayed once more after a player dies for the first time
Mario [Mon, 4 Jun 2018 05:18:03 +0000 (15:18 +1000)]
Always force re-spawn in CA, fixes sitting as observer forever
Mario [Mon, 4 Jun 2018 05:05:28 +0000 (15:05 +1000)]
Lower threshold for invisible alpha checks in bot code
Mario [Sun, 3 Jun 2018 11:40:58 +0000 (21:40 +1000)]
Some minor tweaks to jetpack navigation
Rudolf Polzer [Sun, 3 Jun 2018 05:24:29 +0000 (07:24 +0200)]
Transifex autosync
Rudolf Polzer [Sat, 2 Jun 2018 05:24:33 +0000 (07:24 +0200)]
Transifex autosync
Mario [Thu, 31 May 2018 06:22:48 +0000 (16:22 +1000)]
Add a note for later
Mario [Thu, 31 May 2018 06:18:25 +0000 (06:18 +0000)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into 'master'
Standalone Overkill weapons
See merge request xonotic/xonotic-data.pk3dir!461
Mario [Thu, 31 May 2018 06:08:18 +0000 (16:08 +1000)]
Undo the icon change (will redo when we have new icons)
Mario [Thu, 31 May 2018 06:04:00 +0000 (16:04 +1000)]
Sanity check
Lyberta [Thu, 31 May 2018 05:59:30 +0000 (08:59 +0300)]
Updated hash.
Mario [Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
# Conflicts:
# .gitlab-ci.yml
projects / xonotic / xonotic-data.pk3dir.git / log