]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Tue, 28 Mar 2017 08:53:53 +0000 (11:53 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoMerge branch 'master' into Lyberta/master
Lyberta [Tue, 28 Mar 2017 08:53:39 +0000 (11:53 +0300)]
Merge branch 'master' into Lyberta/master

7 years agoMerge branch 'master' into Lyberta/Survival
Lyberta [Tue, 28 Mar 2017 08:53:27 +0000 (11:53 +0300)]
Merge branch 'master' into Lyberta/Survival

7 years agoSurvival: Zero out round time at the beginning of the first round.
Lyberta [Tue, 28 Mar 2017 08:52:37 +0000 (11:52 +0300)]
Survival: Zero out round time at the beginning of the first round.

7 years agoOn waypoint removal, directly remove all links to it instead of relinking all linked...
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

7 years agoFix some small issues
terencehill [Mon, 27 Mar 2017 22:10:52 +0000 (00:10 +0200)]
Fix some small issues

7 years agoDon't autodetect map symmetry on maps with no flag
terencehill [Mon, 27 Mar 2017 22:08:44 +0000 (00:08 +0200)]
Don't autodetect map symmetry on maps with no flag

7 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
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

7 years agoFix chinese (taiwan) saying zh_TW
Mirio [Mon, 27 Mar 2017 16:12:23 +0000 (18:12 +0200)]
Fix chinese (taiwan) saying zh_TW

7 years agoIncrement gameversion
Mario [Mon, 27 Mar 2017 15:54:48 +0000 (01:54 +1000)]
Increment gameversion

7 years agoFix typo and improve g_waypointeditor_symmetrical_order description
terencehill [Sun, 26 Mar 2017 15:18:00 +0000 (17:18 +0200)]
Fix typo and improve g_waypointeditor_symmetrical_order description

7 years agoImplement symmetrical editing of waypoints for ctf maps with rotational symmetry...
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)

7 years agoAdd TheAudioMonkey to credits
Mirio [Sat, 25 Mar 2017 16:47:30 +0000 (17:47 +0100)]
Add TheAudioMonkey to credits

7 years agoFix effectinfo parser
Mario [Sat, 25 Mar 2017 15:30:10 +0000 (01:30 +1000)]
Fix effectinfo parser

7 years agoAdd a new respawn flag which denies respawning
Mario [Sat, 25 Mar 2017 15:16:58 +0000 (01:16 +1000)]
Add a new respawn flag which denies respawning

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 25 Mar 2017 11:51:09 +0000 (14:51 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Switched to notification system + sprite fix.
Lyberta [Sat, 25 Mar 2017 11:50:46 +0000 (14:50 +0300)]
Survival: Switched to notification system + sprite fix.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 25 Mar 2017 09:31:19 +0000 (12:31 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Defenders no longer can throw weapons.
Lyberta [Sat, 25 Mar 2017 09:31:11 +0000 (12:31 +0300)]
Survival: Defenders no longer can throw weapons.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 25 Mar 2017 09:14:30 +0000 (12:14 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Defenders no longer drop weapons by default.
Lyberta [Sat, 25 Mar 2017 09:14:07 +0000 (12:14 +0300)]
Survival: Defenders no longer drop weapons by default.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 10:35:45 +0000 (13:35 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Proper random start weapons.
Lyberta [Fri, 24 Mar 2017 10:35:36 +0000 (13:35 +0300)]
Survival: Proper random start weapons.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 09:42:23 +0000 (12:42 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Correct handling of new toys.
Lyberta [Fri, 24 Mar 2017 09:42:12 +0000 (12:42 +0300)]
Survival: Correct handling of new toys.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 08:42:02 +0000 (11:42 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Merge attacker and defender roles into player role.
Lyberta [Fri, 24 Mar 2017 08:41:35 +0000 (11:41 +0300)]
Survival: Merge attacker and defender roles into player role.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 05:40:12 +0000 (08:40 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Added optional overkill models to all roles.
Lyberta [Fri, 24 Mar 2017 05:40:02 +0000 (08:40 +0300)]
Survival: Added optional overkill models to all roles.

7 years agoMerge branch 'Mario/mutator_array_fix'
Mario [Fri, 24 Mar 2017 05:07:03 +0000 (15:07 +1000)]
Merge branch 'Mario/mutator_array_fix'

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 04:41:55 +0000 (07:41 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Better invariants and fixed superweapons.
Lyberta [Fri, 24 Mar 2017 04:41:27 +0000 (07:41 +0300)]
Survival: Better invariants and fixed superweapons.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 03:06:23 +0000 (06:06 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival: Overkill models are now optional.
Lyberta [Fri, 24 Mar 2017 03:06:12 +0000 (06:06 +0300)]
Survival: Overkill models are now optional.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 02:48:40 +0000 (05:48 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoUsing Assault notifications.
Lyberta [Fri, 24 Mar 2017 02:48:18 +0000 (05:48 +0300)]
Using Assault notifications.

7 years agoMerge branch 'Lyberta/KillSound' into Lyberta/master
Lyberta [Fri, 24 Mar 2017 00:58:19 +0000 (03:58 +0300)]
Merge branch 'Lyberta/KillSound' into Lyberta/master

7 years agoNew kill sound.
Lyberta [Fri, 24 Mar 2017 00:48:58 +0000 (03:48 +0300)]
New kill sound.

7 years agoMerge branch 'packer/fix-typo' into 'master'
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

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 10:56:04 +0000 (13:56 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoStarted work on coop survival.
Lyberta [Thu, 23 Mar 2017 10:55:34 +0000 (13:55 +0300)]
Started work on coop survival.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 07:44:08 +0000 (10:44 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoBetter condition for messages.
Lyberta [Thu, 23 Mar 2017 07:43:58 +0000 (10:43 +0300)]
Better condition for messages.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 07:34:35 +0000 (10:34 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoFixed PlayerRegen bug.
Lyberta [Thu, 23 Mar 2017 07:34:09 +0000 (10:34 +0300)]
Fixed PlayerRegen bug.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 07:19:44 +0000 (10:19 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoBetter survival messages.
Lyberta [Thu, 23 Mar 2017 07:19:12 +0000 (10:19 +0300)]
Better survival messages.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 05:48:30 +0000 (08:48 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSwitched to better debug functions.
Lyberta [Thu, 23 Mar 2017 05:47:39 +0000 (08:47 +0300)]
Switched to better debug functions.

7 years agoMerge branch 'Lyberta/DebugPrintToChat' into Lyberta/Survival
Lyberta [Thu, 23 Mar 2017 05:19:36 +0000 (08:19 +0300)]
Merge branch 'Lyberta/DebugPrintToChat' into Lyberta/Survival

7 years agoMerge branch 'Lyberta/DebugPrintToChat' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 05:19:05 +0000 (08:19 +0300)]
Merge branch 'Lyberta/DebugPrintToChat' into Lyberta/master

7 years agoUsing bprint instead of sprint
Lyberta [Thu, 23 Mar 2017 05:18:18 +0000 (08:18 +0300)]
Using bprint instead of sprint

7 years agoAdded more useful PrintToChat functions.
Lyberta [Thu, 23 Mar 2017 05:04:38 +0000 (08:04 +0300)]
Added more useful PrintToChat functions.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:32:07 +0000 (07:32 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoMerge branch 'Lyberta/DebugPrintToChat' into Lyberta/Survival
Lyberta [Thu, 23 Mar 2017 04:28:42 +0000 (07:28 +0300)]
Merge branch 'Lyberta/DebugPrintToChat' into Lyberta/Survival

7 years agoAdded DebugPrintToChat.
Lyberta [Thu, 23 Mar 2017 04:27:51 +0000 (07:27 +0300)]
Added DebugPrintToChat.

7 years agoMerge branch 'master' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:22:56 +0000 (07:22 +0300)]
Merge branch 'master' into Lyberta/master

7 years agoMerge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:21:54 +0000 (07:21 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Thu, 23 Mar 2017 04:21:12 +0000 (07:21 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival bugfixes.
Lyberta [Thu, 23 Mar 2017 04:20:24 +0000 (07:20 +0300)]
Survival bugfixes.

7 years agofix typo 429/head
packer- [Wed, 22 Mar 2017 19:00:10 +0000 (19:00 +0000)]
fix typo

7 years agoIf player is dead, reset dodging fields
Mario [Mon, 20 Mar 2017 11:21:19 +0000 (21:21 +1000)]
If player is dead, reset dodging fields

7 years agoSymmetrical waypoint editing: center is automatically determined based on CTF flag...
terencehill [Sun, 19 Mar 2017 16:04:52 +0000 (17:04 +0100)]
Symmetrical waypoint editing: center is automatically determined based on CTF flag positions

7 years agoUse waypoint origin, not player origin
terencehill [Sun, 19 Mar 2017 16:00:12 +0000 (17:00 +0100)]
Use waypoint origin, not player origin

7 years agoCalculate middle point on CTF initialization
terencehill [Sun, 19 Mar 2017 15:43:56 +0000 (16:43 +0100)]
Calculate middle point on CTF initialization

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sun, 19 Mar 2017 02:21:18 +0000 (05:21 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoSurvival bugfixes.
Lyberta [Sun, 19 Mar 2017 02:20:53 +0000 (05:20 +0300)]
Survival bugfixes.

7 years agoFixed weapon priorities.
Lyberta [Sun, 19 Mar 2017 01:03:28 +0000 (04:03 +0300)]
Fixed weapon priorities.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 23:43:37 +0000 (02:43 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoFixed weapon pickup.
Lyberta [Sat, 18 Mar 2017 23:43:09 +0000 (02:43 +0300)]
Fixed weapon pickup.

7 years agoReintroduce periodic recalculation of nearest waypoint of static items but only while...
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

7 years agoFix waypoint_remove relinking waypoints linked from the waypoint going to be removed...
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.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 23:16:09 +0000 (02:16 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoBetter HUD.
Lyberta [Sat, 18 Mar 2017 23:15:38 +0000 (02:15 +0300)]
Better HUD.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 19:33:30 +0000 (22:33 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoMerge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 19:32:54 +0000 (22:32 +0300)]
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival

7 years agoMoveToTeam kills, we don't need that - reverting.
Lyberta [Sat, 18 Mar 2017 19:31:53 +0000 (22:31 +0300)]
MoveToTeam kills, we don't need that - reverting.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 19:17:07 +0000 (22:17 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoMerge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 19:15:56 +0000 (22:15 +0300)]
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival

7 years agoTeam change bugfix.
Lyberta [Sat, 18 Mar 2017 19:15:42 +0000 (22:15 +0300)]
Team change bugfix.

7 years agoTypo
Lyberta [Sat, 18 Mar 2017 19:12:15 +0000 (22:12 +0300)]
Typo

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 18:55:09 +0000 (21:55 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoMerge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 18:54:47 +0000 (21:54 +0300)]
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival

7 years agoUsing MoveToTeam instead.
Lyberta [Sat, 18 Mar 2017 18:53:51 +0000 (21:53 +0300)]
Using MoveToTeam instead.

7 years agoBetter messages.
Lyberta [Sat, 18 Mar 2017 18:50:08 +0000 (21:50 +0300)]
Better messages.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 18:07:12 +0000 (21:07 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoMerge branch 'Lyberta/PlayerDied' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 18:06:19 +0000 (21:06 +0300)]
Merge branch 'Lyberta/PlayerDied' into Lyberta/Survival

7 years agoAdded PlayerDied event.
Lyberta [Sat, 18 Mar 2017 18:03:56 +0000 (21:03 +0300)]
Added PlayerDied event.

7 years agoSwitch to PlayerDied.
Lyberta [Sat, 18 Mar 2017 18:02:27 +0000 (21:02 +0300)]
Switch to PlayerDied.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 17:28:32 +0000 (20:28 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoFixed autobalance bug.
Lyberta [Sat, 18 Mar 2017 17:28:02 +0000 (20:28 +0300)]
Fixed autobalance bug.

7 years agoImprove readability and documentation of the notification list a little bit
terencehill [Sat, 18 Mar 2017 16:57:27 +0000 (17:57 +0100)]
Improve readability and documentation of the notification list a little bit

7 years agoMerge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 16:14:24 +0000 (19:14 +0300)]
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master

7 years agoFixed OK Vortex reload.
Lyberta [Sat, 18 Mar 2017 16:13:33 +0000 (19:13 +0300)]
Fixed OK Vortex reload.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 15:53:31 +0000 (18:53 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoBetter messages.
Lyberta [Sat, 18 Mar 2017 15:53:08 +0000 (18:53 +0300)]
Better messages.

7 years agoMerge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 15:03:12 +0000 (18:03 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master

7 years agoMerge branch 'master' into Lyberta/master
Lyberta [Sat, 18 Mar 2017 13:49:07 +0000 (16:49 +0300)]
Merge branch 'master' into Lyberta/master

7 years agoMerge branch 'master' into Lyberta/Survival
Lyberta [Sat, 18 Mar 2017 13:48:54 +0000 (16:48 +0300)]
Merge branch 'master' into Lyberta/Survival

7 years agoMerge branch 'master' into Lyberta/StandaloneOverkillWeapons
Lyberta [Sat, 18 Mar 2017 13:48:42 +0000 (16:48 +0300)]
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons