3537 Commits

Author	SHA1	Message	Date
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
Anuken	fb831e8fef	Better cliff sprites	2020-10-10 11:37:58 -04:00
Anuken	81633dace4	Merge remote-tracking branch 'origin/master'	2020-10-09 13:52:15 -04:00
Anuken	c78088ab5f	Harder default waves	2020-10-09 13:52:07 -04:00
Patrick 'Quezler' Mounier	d776744905	Update leak behaviour in plated conduit description	2020-10-09 19:11:56 +02:00
Anuken	22f1c3b2d1	Bugfixes	2020-10-09 10:02:08 -04:00
Anuken	0a0af9c291	Random derelicts in sectors	2020-10-08 19:11:20 -04:00
Anuken	c7f1204119	space	2020-10-08 15:14:28 -04:00
Anuken	d06449f311	space	2020-10-08 14:06:07 -04:00
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