3516 Commits

Author	SHA1	Message	Date
Anuken	7088ae89b3	Logic unit control	2020-10-05 15:42:37 -04:00
Anuken	5861fe61b2	Cleanup	2020-10-02 19:51:30 -04:00
Anuken	138434d029	Fixed #2799 / Fixed #2797	2020-10-02 09:54:08 -04:00
Anuken	68c41774e4	More contrast for specific colors	2020-10-01 14:22:48 -04:00
Patrick 'Quezler' Mounier	8e4d00d594	Move cryofluid mixer emoji back to the old number	2020-10-01 11:03:59 +02:00
Anuken	b15cdfef46	sprites repacked	2020-09-30 22:37:32 -04:00
Leonwang4234	9601c81045	change sprite name	2020-09-30 18:05:43 -07:00
Leonwang4234	14156c1ce7	"cryofluidmixer" to "cryofluid-mixer"fl	2020-09-30 17:54:50 -07:00
Anuken	7eb0da82de	Added enemy lights setting	2020-09-30 17:44:13 -04:00
Anuken	1697fec311	Tsunami balancing	2020-09-30 16:40:45 -04:00
Anuken	d07c74b60f	Re-added tap event for servers	2020-09-30 15:01:46 -04:00
Anuken	03d676403f	Cleanup	2020-09-30 14:50:05 -04:00
slava0135	feb8202b73	better stats...	2020-09-30 21:17:44 +03:00
slava0135	a806d7c019	Fun fact: 1.0 is smaller than 10	2020-09-30 20:41:56 +03:00
LeoDog896	fbb317aa11	Update contributors	2020-09-30 09:30:12 -04:00
slava0135	d4402ee3bb	Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami ... Conflicts: core/assets/icons/icons.properties core/assets/sprites/block_colors.png core/assets/sprites/fallback/sprites.atlas core/assets/sprites/fallback/sprites3.png core/assets/sprites/fallback/sprites4.png core/assets/sprites/fallback/sprites5.png core/assets/sprites/fallback/sprites7.png core/assets/sprites/fallback/sprites8.png core/assets/sprites/sprites.atlas core/assets/sprites/sprites.png core/assets/sprites/sprites2.png core/assets/sprites/sprites4.png core/assets/sprites/sprites5.png core/src/mindustry/content/Blocks.java	2020-09-30 09:48:18 +03:00
Anuken	2b2a12267a	Long-range 4x4 turret (wip) / Java 14 language upgrade	2020-09-29 23:55:55 -04:00
slava0135	fb53abe593	Final? design	2020-09-29 21:27:41 +03:00
slava0135	cbc2205347	Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami ... Conflicts: core/assets/sprites/block_colors.png core/assets/sprites/fallback/sprites.atlas core/assets/sprites/fallback/sprites.png core/assets/sprites/fallback/sprites2.png core/assets/sprites/fallback/sprites3.png core/assets/sprites/fallback/sprites4.png core/assets/sprites/fallback/sprites5.png core/assets/sprites/fallback/sprites7.png core/assets/sprites/fallback/sprites8.png core/assets/sprites/sprites.atlas core/assets/sprites/sprites.png core/assets/sprites/sprites2.png core/assets/sprites/sprites4.png core/assets/sprites/sprites5.png	2020-09-29 18:31:42 +03:00
Anuken	c89d6f6b74	Re-packed sprites from PR	2020-09-28 18:42:09 -04:00
Anuken	ff84d72e20	Cleaner wall sprites	2020-09-27 00:43:00 -04:00
Anuken	ae46535365	Sprite cleanup	2020-09-26 22:31:49 -04:00
Anuken	0c7ce94b13	Sprite cleanup	2020-09-26 22:29:15 -04:00
Anuken	7b98628084	Unbroke wave sprite	2020-09-26 22:20:02 -04:00
Anuken	d4d3b71d7d	Fixed #2735	2020-09-26 09:46:16 -04:00
slava0135	3e81d194cb	New liquid turret - Tsunami	2020-09-25 11:49:04 +03:00
Anuken	9e0b29b3dd	Cleanup	2020-09-24 18:11:10 -04:00
Anuken	504334999d	Campaign multiplayer note	2020-09-24 16:49:04 -04:00
Anuken	0a07458186	Power-based ammo / Refactoring / IP kicks / Fixes	2020-09-24 13:05:39 -04:00
Anuken	db94acdb83	Merge remote-tracking branch 'origin/master'	2020-09-24 09:23:42 -04:00
Anuken	68e708cf9a	d	2020-09-24 09:23:38 -04:00
Anuken	35460f0b5f	Merge pull request #2692 from Prosta4okua/master ... immediate RU L10n update	2020-09-23 23:03:54 -04:00
Felix Corvus	90fe7d7e59	immediate RU L10n update	2020-09-24 05:34:37 +03:00
Anuken	75ebaab3a3	Merge pull request #2660 from J-VdS/schematic ... Server disable schematic option (fix #2382)	2020-09-23 22:01:06 -04:00
Anuken	ada664a2ca	Fixed #2690	2020-09-23 21:46:40 -04:00
Anuken	764b93154e	Turret sprite tweaks	2020-09-23 19:16:33 -04:00
Anuken	28b7ef53bb	Updated bundle contents	2020-09-23 18:28:25 -04:00
Anuken	8efba6ada7	Merge pull request #2564 from Prosta4okua/master ... [Bundle][RU] actual L10n	2020-09-23 18:25:36 -04:00
Anuken	fcff922370	Merge branch 'master' into patch-2	2020-09-23 18:25:12 -04:00
Anuken	14627dbbf7	Merge pull request #2639 from PetrGasparik/6.0-aplha-2 ... Czech translation track for 6.0 aplha 2	2020-09-23 18:24:48 -04:00
Anuken	5df5a6e39f	tweak	2020-09-23 18:01:12 -04:00
Anuken	3db2ffb843	Launch pad destination selection	2020-09-23 18:00:24 -04:00
Anuken	1cc8d7e3f4	Balance	2020-09-23 15:21:06 -04:00
J-VdS	d0c6f3274b	Merge branch 'master' into schematic	2020-09-23 16:29:41 +02:00
YellOw139	fb42302720	Update bundle_ro.properties	2020-09-23 12:40:27 +03:00
YellOw139	7701368d1b	Main menu adjustments for mobile	2020-09-23 12:39:13 +03:00
Felix Corvus	fe9a44d876	Update bundle_ru.properties	2020-09-23 08:35:28 +03:00
Anuken	f3e08f9cb6	Internal refactoring & cleanup	2020-09-22 15:50:33 -04:00
J-VdS	ba4612ed96	indent	2020-09-22 19:00:25 +02:00
J-VdS	4608697d0d	capitals	2020-09-22 18:59:35 +02:00