5007 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Charles Wu	486a45ad14	Update bundle_zh_CN.properties (#798) ... fix chinese translation grammatical mistakes	2019-10-21 12:14:49 -04:00
Anuken	ad5cb37ed5	Merge remote-tracking branch 'origin/master'	2019-10-21 00:02:40 -04:00
Anuken	eb1d3c27c5	Mods + crash message for iOS/Android	2019-10-21 00:02:36 -04:00
Anuken	ec59396035	Fixed sharing crash	2019-10-20 21:31:34 -04:00
Anuken	c5a550bf78	Merge branch 'master' of https://github.com/Anuken/Mindustry	2019-10-20 20:44:59 -04:00
Anuken	83b3bd9a2e	Fixed flip not taking into account offset	2019-10-20 20:39:58 -04:00
Anuken	a2ff516112	Merge branch 'master' of https://github.com/Anuken/Mindustry	2019-10-20 17:09:02 -04:00
Anuken	513e5b4019	iOS fix	2019-10-20 17:08:54 -04:00
Anuken	fe4783dc63	Merge pull request #814 from Maxattax97/minimap-players ... Add username labels to map/minimap	2019-10-20 17:06:48 -04:00
Anuken	ffa6894e56	Merge remote-tracking branch 'origin/master'	2019-10-20 17:05:56 -04:00
Anuken	982483f178	Merged #812	2019-10-20 17:05:23 -04:00
Max O'Cull	898956d833	Fix compact formatting	2019-10-20 17:03:54 -04:00
Anuken	b1d9be707d	Merge pull request #847 from clfer/feature/build-queue-improvement ... Allow to replace previous build request in queue	2019-10-20 16:57:25 -04:00
Anuken	907f1e7dfd	Merge remote-tracking branch 'origin/master'	2019-10-20 16:52:06 -04:00
Anuken	2e0e351228	Bugfixes	2019-10-20 16:50:04 -04:00
Anuken	e4b267d757	Merge pull request #838 from ado1928/master ... Added more rubble pngs	2019-10-20 16:32:07 -04:00
clfer	a238d7278f	Allow to replace previous build request in queue	2019-10-20 21:52:27 +02:00
Anuken	4b428c6636	Bugfixes	2019-10-20 14:06:43 -04:00
Anuken	b5e9f280e6	Schematic preview improvements	2019-10-20 12:48:39 -04:00
Anuken	3c65e366e8	Clear previous schematic when selecting new one	2019-10-20 10:56:17 -04:00
Anuken	e9efe4169c	Fixes of bug variety	2019-10-20 10:42:40 -04:00
Anuken	4be22822d4	Bugfixes	2019-10-20 10:06:13 -04:00
Anuken	00054e2c61	Bugfixes	2019-10-19 21:09:59 -04:00
Anuken	cc105e5029	Merge branches 'master' and 'schematics' of https://github.com/Anuken/Mindustry ... # Conflicts: # gradle.properties	2019-10-19 20:46:25 -04:00
Anuken	f6899cf3c3	Mobile bugfixes	2019-10-19 20:45:17 -04:00
Anuken	a2a4c8c43d	Bugfixes	2019-10-19 19:54:41 -04:00
Anuken	0faae5d5ca	Bugfix	2019-10-19 19:11:54 -04:00
Anuken	2586c53f0d	Complete refactoring of workshop / Schematic+mod support	2019-10-19 18:53:27 -04:00
ado1928	7fdbd27ebb	Add files via upload	2019-10-19 10:58:34 +02:00
Anuken	d0dc21a52c	Workshop refactoring	2019-10-19 02:00:43 -04:00
Anuken	f7be953bb5	Schematic import	2019-10-19 01:19:32 -04:00
Anuken	08a51d8f1b	Schematic export buttons, workshop support progress	2019-10-19 01:03:49 -04:00
Anuken	32edf58f75	Fixed zips	2019-10-18 20:11:02 -04:00
Anuken	88e1770f2e	Bugfixes	2019-10-18 19:31:01 -04:00
Anuken	142e93f3e9	Schematic search button	2019-10-18 17:18:29 -04:00
Anuken	db9eb36c8c	Updating arc	2019-10-18 15:07:13 -04:00
Anuken	6a12effd6a	Schematic flipping + rotation	2019-10-18 14:38:43 -04:00
Anuken	f7d98591c9	Schematic rotation	2019-10-18 11:38:00 -04:00
Anuken	30bcfb6d5e	Functional desktop schematic placement	2019-10-18 00:41:30 -04:00
Anuken	61d15782d0	More functionality, lots of bugfixes	2019-10-17 23:51:23 -04:00
Anuken	dec6a1296b	Better schematic previews, keep on game export	2019-10-17 22:57:37 -04:00
Anuken	44c8b07eb1	Things	2019-10-17 22:14:04 -04:00
Anuken	0095d89543	Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics	2019-10-17 21:58:55 -04:00
Anuken	4977f598fd	Config drawing	2019-10-17 21:58:49 -04:00
Anuken	25cacbb28d	Merge remote-tracking branch 'origin/master'	2019-10-17 17:00:49 -04:00
Anuken	a0c93ea7d3	Made incend bullets apply status instead of creating fire	2019-10-17 17:00:38 -04:00
Anuken	1921bc87a2	Dialog	2019-10-17 16:53:43 -04:00
Anuken	6437e6b878	Update ContentParser.java	2019-10-17 10:56:10 -04:00
Anuken	41284ac3bc	Bugfix	2019-10-17 09:01:59 -04:00
Anuken	8cf0df7ac5	Crash fix	2019-10-17 08:40:11 -04:00