911 Commits

Author	SHA1	Message	Date
summetdev	a3abadd8c2	Revert "Newlines" ... This reverts commit a78faa57	2020-10-27 21:55:40 +03:00
summetdev	a78faa57f3	Newlines	2020-10-27 21:36:02 +03:00
Anuken	5582a8bf1b	Fixed #3153 / Fixed #3152	2020-10-27 13:13:54 -04:00
Anuken	59b5d809db	Balance	2020-10-25 15:55:23 -04:00
Anuken	41d388aa7f	Item sprite cleanup	2020-10-24 19:06:05 -04:00
Anuken	42bfab6e40	Fixed #3079	2020-10-23 16:12:36 -04:00
Anuken	bf1268bb6e	Shooting -> Function category / Dialog cleanup	2020-10-23 10:39:01 -04:00
Anuken	d66cf13ac6	Added buttons to clear campaign saves & research	2020-10-23 09:08:17 -04:00
Anuken	a2e75df096	Map editor tweaks & fixes / New map	2020-10-22 15:27:30 -04:00
Anuken	c2ff5a69ef	Buffered map-load filter support / Spawn path filter	2020-10-22 12:27:22 -04:00
Anuken	46b2f4cccb	Minor bugfixes & wave tweaks	2020-10-22 11:54:27 -04:00
Anuken	a80d0cc457	Fixed #3053	2020-10-21 14:10:28 -04:00
Leonwang4234	54fd2e03b4	resolve conflicts	2020-10-20 15:57:48 -07:00
Leonwang4234	df37ce3cef	Merge remote-tracking branch 'upstream/master' into wall-stats	2020-10-20 15:49:46 -07:00
Anuken	c27251cfb0	Fog	2020-10-19 18:28:37 -04:00
Anuken	6e8732387b	Better weather classes	2020-10-19 16:25:59 -04:00
Anuken	2ff749bd17	Unified stat system	2020-10-19 11:34:52 -04:00
Leonwang4234	cff2799c72	remove changes in description	2020-10-18 14:29:15 -07:00
Leonwang4234	db3db47ca1	Add wall stats + other changes	2020-10-18 13:35:20 -07:00
Anuken	46ec457819	Cleanup	2020-10-17 10:37:28 -04:00
Anuken	e00daffe6d	Bugfixes	2020-10-16 15:27:30 -04:00
Anuken	2f54edf34f	Sector refactoring, invasions and cleanup	2020-10-16 11:02:24 -04:00
Anuken	86c2fe8805	too many things to list	2020-10-15 13:44:20 -04:00
Anuken	1554fd0394	Planet selection for mods	2020-10-13 18:50:18 -04:00
Anuken	a8b55c27e8	x	2020-10-13 18:09:46 -04:00
Anuken	4bf2b3b43e	Now in beta	2020-10-13 16:18:11 -04:00
Anuken	d4c72b2a9c	Merge pull request #2915 from genNAowl/pierce-cap-info ... Add `pierceCap` Info	2020-10-13 10:53:17 -04:00
Leonwang4234	24d295a924	add infinitepierce + bugfixes	2020-10-12 17:57:00 -07:00
Anuken	f10c5c1ca8	Merge remote-tracking branch 'origin/master'	2020-10-12 10:06:41 -04:00
Anuken	378e81cd90	Fixed #2917	2020-10-12 10:06:34 -04:00
Wiki Updater	08629bb7f7	add bundle entry for dacit boulder	2020-10-12 10:49:41 +02:00
Leonwang4234	7f5561f037	add...	2020-10-11 17:03:48 -07:00
Anuken	3fe79531a6	Added message for last accessed player of block	2020-10-11 11:47:22 -04:00
Anuken	e11a8565d0	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/src/mindustry/ui/dialogs/PausedDialog.java	2020-10-11 10:51:46 -04:00
Anuken	3d99e38f10	Sector simplification	2020-10-11 10:51:33 -04:00
Patrick 'Quezler' Mounier	6d632fc532	Update bundle.properties	2020-10-11 14:59:44 +02:00
Anuken	3f74c61c0a	Map center button	2020-10-10 12:05:11 -04:00
Patrick 'Quezler' Mounier	d776744905	Update leak behaviour in plated conduit description	2020-10-09 19:11:56 +02:00
Anuken	c7f1204119	space	2020-10-08 15:14:28 -04:00
Anuken	7088ae89b3	Logic unit control	2020-10-05 15:42:37 -04: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
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	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	68e708cf9a	d	2020-09-24 09:23:38 -04: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