]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Lyberta [Tue, 28 Mar 2017 08:53:39 +0000 (11:53 +0300)]
Merge branch 'master' into Lyberta/master
terencehill [Mon, 27 Mar 2017 22:22:52 +0000 (00:22 +0200)]
On waypoint removal, directly remove all links to it instead of relinking all linked waypoints as it's lightning fast
terencehill [Mon, 27 Mar 2017 22:10:52 +0000 (00:10 +0200)]
Fix some small issues
terencehill [Mon, 27 Mar 2017 22:08:44 +0000 (00:08 +0200)]
Don't autodetect map symmetry on maps with no flag
Mirio [Mon, 27 Mar 2017 16:12:39 +0000 (18:12 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Mirio [Mon, 27 Mar 2017 16:12:23 +0000 (18:12 +0200)]
Fix chinese (taiwan) saying zh_TW
Mario [Mon, 27 Mar 2017 15:54:48 +0000 (01:54 +1000)]
Increment gameversion
terencehill [Sun, 26 Mar 2017 15:18:00 +0000 (17:18 +0200)]
Fix typo and improve g_waypointeditor_symmetrical_order description
terencehill [Sun, 26 Mar 2017 14:27:53 +0000 (16:27 +0200)]
Implement symmetrical editing of waypoints for ctf maps with rotational symmetry (gasoline_3teams) and with reflectional symmetry (runningmanctf)
Mirio [Sat, 25 Mar 2017 16:47:30 +0000 (17:47 +0100)]
Add TheAudioMonkey to credits
Mario [Sat, 25 Mar 2017 15:30:10 +0000 (01:30 +1000)]
Fix effectinfo parser
Mario [Sat, 25 Mar 2017 15:16:58 +0000 (01:16 +1000)]
Add a new respawn flag which denies respawning
Lyberta [Sat, 25 Mar 2017 11:51:09 +0000 (14:51 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 25 Mar 2017 11:50:46 +0000 (14:50 +0300)]
Survival: Switched to notification system + sprite fix.
Lyberta [Sat, 25 Mar 2017 09:31:19 +0000 (12:31 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 25 Mar 2017 09:31:11 +0000 (12:31 +0300)]
Survival: Defenders no longer can throw weapons.
Lyberta [Sat, 25 Mar 2017 09:14:30 +0000 (12:14 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 25 Mar 2017 09:14:07 +0000 (12:14 +0300)]
Survival: Defenders no longer drop weapons by default.
Lyberta [Fri, 24 Mar 2017 10:35:45 +0000 (13:35 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 10:35:36 +0000 (13:35 +0300)]
Survival: Proper random start weapons.
Lyberta [Fri, 24 Mar 2017 09:42:23 +0000 (12:42 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 09:42:12 +0000 (12:42 +0300)]
Survival: Correct handling of new toys.
Lyberta [Fri, 24 Mar 2017 08:42:02 +0000 (11:42 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 08:41:35 +0000 (11:41 +0300)]
Survival: Merge attacker and defender roles into player role.
Lyberta [Fri, 24 Mar 2017 05:40:12 +0000 (08:40 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 05:40:02 +0000 (08:40 +0300)]
Survival: Added optional overkill models to all roles.
Mario [Fri, 24 Mar 2017 05:07:03 +0000 (15:07 +1000)]
Merge branch 'Mario/mutator_array_fix'
Lyberta [Fri, 24 Mar 2017 04:41:55 +0000 (07:41 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 04:41:27 +0000 (07:41 +0300)]
Survival: Better invariants and fixed superweapons.
Lyberta [Fri, 24 Mar 2017 03:06:23 +0000 (06:06 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 03:06:12 +0000 (06:06 +0300)]
Survival: Overkill models are now optional.
Lyberta [Fri, 24 Mar 2017 02:48:40 +0000 (05:48 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 02:48:18 +0000 (05:48 +0300)]
Using Assault notifications.
Lyberta [Fri, 24 Mar 2017 00:58:19 +0000 (03:58 +0300)]
Merge branch 'Lyberta/KillSound' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 00:48:58 +0000 (03:48 +0300)]
New kill sound.
Mirio [Thu, 23 Mar 2017 11:50:32 +0000 (11:50 +0000)]
Merge branch 'packer/fix-typo' into 'master'
fix typo
See merge request !429
Lyberta [Thu, 23 Mar 2017 10:56:04 +0000 (13:56 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 10:55:34 +0000 (13:55 +0300)]
Started work on coop survival.
Lyberta [Thu, 23 Mar 2017 07:44:08 +0000 (10:44 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 07:43:58 +0000 (10:43 +0300)]
Better condition for messages.
Lyberta [Thu, 23 Mar 2017 07:34:35 +0000 (10:34 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 07:34:09 +0000 (10:34 +0300)]
Fixed PlayerRegen bug.
Lyberta [Thu, 23 Mar 2017 07:19:44 +0000 (10:19 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 07:19:12 +0000 (10:19 +0300)]
Better survival messages.
Lyberta [Thu, 23 Mar 2017 05:48:30 +0000 (08:48 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 05:47:39 +0000 (08:47 +0300)]
Switched to better debug functions.
Lyberta [Thu, 23 Mar 2017 05:19:36 +0000 (08:19 +0300)]
Merge branch 'Lyberta/DebugPrintToChat' into Lyberta/Survival
Lyberta [Thu, 23 Mar 2017 05:19:05 +0000 (08:19 +0300)]
Merge branch 'Lyberta/DebugPrintToChat' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 05:18:18 +0000 (08:18 +0300)]
Using bprint instead of sprint
Lyberta [Thu, 23 Mar 2017 05:04:38 +0000 (08:04 +0300)]
Added more useful PrintToChat functions.
Lyberta [Thu, 23 Mar 2017 04:32:07 +0000 (07:32 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:28:42 +0000 (07:28 +0300)]
Merge branch 'Lyberta/DebugPrintToChat' into Lyberta/Survival
Lyberta [Thu, 23 Mar 2017 04:27:51 +0000 (07:27 +0300)]
Added DebugPrintToChat.
Lyberta [Thu, 23 Mar 2017 04:22:56 +0000 (07:22 +0300)]
Merge branch 'master' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:21:54 +0000 (07:21 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:21:12 +0000 (07:21 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:20:24 +0000 (07:20 +0300)]
Survival bugfixes.
packer- [Wed, 22 Mar 2017 19:00:10 +0000 (19:00 +0000)]
fix typo
Mario [Mon, 20 Mar 2017 11:21:19 +0000 (21:21 +1000)]
If player is dead, reset dodging fields
terencehill [Sun, 19 Mar 2017 16:04:52 +0000 (17:04 +0100)]
Symmetrical waypoint editing: center is automatically determined based on CTF flag positions
terencehill [Sun, 19 Mar 2017 16:00:12 +0000 (17:00 +0100)]
Use waypoint origin, not player origin
terencehill [Sun, 19 Mar 2017 15:43:56 +0000 (16:43 +0100)]
Calculate middle point on CTF initialization
Lyberta [Sun, 19 Mar 2017 02:21:18 +0000 (05:21 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sun, 19 Mar 2017 02:20:53 +0000 (05:20 +0300)]
Survival bugfixes.
Lyberta [Sun, 19 Mar 2017 01:03:28 +0000 (04:03 +0300)]
Fixed weapon priorities.
Lyberta [Sat, 18 Mar 2017 23:43:37 +0000 (02:43 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 23:43:09 +0000 (02:43 +0300)]
Fixed weapon pickup.
terencehill [Sat, 18 Mar 2017 23:32:08 +0000 (00:32 +0100)]
Reintroduce periodic recalculation of nearest waypoint of static items but only while editing waypoints so that bots behave correctly after a waypoint creation / addition
terencehill [Sat, 18 Mar 2017 23:20:23 +0000 (00:20 +0100)]
Fix waypoint_remove relinking waypoints linked from the waypoint going to be removed instead of relinking the ones linked to it. This bug sometimes caused bots to follow invalid links and bump into walls. Until now it could be avoided only by executing g_waypointeditor_relinkall before saving waypoints.
Lyberta [Sat, 18 Mar 2017 23:16:09 +0000 (02:16 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 23:15:38 +0000 (02:15 +0300)]
Better HUD.
Lyberta [Sat, 18 Mar 2017 19:33:30 +0000 (22:33 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 19:32:54 +0000 (22:32 +0300)]
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 19:31:53 +0000 (22:31 +0300)]
MoveToTeam kills, we don't need that - reverting.
Lyberta [Sat, 18 Mar 2017 19:17:07 +0000 (22:17 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 19:15:56 +0000 (22:15 +0300)]
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 19:15:42 +0000 (22:15 +0300)]
Team change bugfix.
Lyberta [Sat, 18 Mar 2017 19:12:15 +0000 (22:12 +0300)]
Typo
Lyberta [Sat, 18 Mar 2017 18:55:09 +0000 (21:55 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 18:54:47 +0000 (21:54 +0300)]
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 18:53:51 +0000 (21:53 +0300)]
Using MoveToTeam instead.
Lyberta [Sat, 18 Mar 2017 18:50:08 +0000 (21:50 +0300)]
Better messages.
Lyberta [Sat, 18 Mar 2017 18:07:12 +0000 (21:07 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 18:06:19 +0000 (21:06 +0300)]
Merge branch 'Lyberta/PlayerDied' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 18:03:56 +0000 (21:03 +0300)]
Added PlayerDied event.
Lyberta [Sat, 18 Mar 2017 18:02:27 +0000 (21:02 +0300)]
Switch to PlayerDied.
Lyberta [Sat, 18 Mar 2017 17:28:32 +0000 (20:28 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 17:28:02 +0000 (20:28 +0300)]
Fixed autobalance bug.
terencehill [Sat, 18 Mar 2017 16:57:27 +0000 (17:57 +0100)]
Improve readability and documentation of the notification list a little bit
Lyberta [Sat, 18 Mar 2017 16:14:24 +0000 (19:14 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 16:13:33 +0000 (19:13 +0300)]
Fixed OK Vortex reload.
Lyberta [Sat, 18 Mar 2017 15:53:31 +0000 (18:53 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 15:53:08 +0000 (18:53 +0300)]
Better messages.
Lyberta [Sat, 18 Mar 2017 15:03:12 +0000 (18:03 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 13:49:07 +0000 (16:49 +0300)]
Merge branch 'master' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 13:48:54 +0000 (16:48 +0300)]
Merge branch 'master' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 13:48:42 +0000 (16:48 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Sat, 18 Mar 2017 13:48:23 +0000 (16:48 +0300)]
Merge branch 'master' into Lyberta/TeamplayFixes_
Mario [Sat, 18 Mar 2017 13:39:12 +0000 (13:39 +0000)]
Merge branch 'Lyberta/PrintToChat' into 'master'
Added PrintToChat function.
See merge request !426
Mario [Sat, 18 Mar 2017 12:16:59 +0000 (22:16 +1000)]
Update hash