497 Commits

Author	SHA1	Message	Date
Anuken	b9841f9cfa	a mess	2020-02-07 10:47:58 -05:00
Anuken	be50997f94	Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/Vars.java # core/src/mindustry/entities/traits/SaveTrait.java # core/src/mindustry/maps/generators/MapGenerator.java # core/src/mindustry/ui/dialogs/DeployDialog.java # core/src/mindustry/world/blocks/Floor.java # desktop/src/mindustry/desktop/DesktopLauncher.java # gradle.properties	2020-02-04 12:25:18 -05:00
Anuken	d7ea0bc21e	why	2020-01-26 13:16:42 -05:00
Anuken	aefc4ed83c	Better annotation processing	2020-01-24 18:31:54 -05:00
Anuken	63c277f78e	Implemented mod name display in content desc	2020-01-24 10:26:10 -05:00
Anuken	eb8479f7f7	Switched from gdx-packer to arc-packer	2020-01-22 19:16:56 -05:00
Anuken	5e977312a7	Annotation processor cleanup	2020-01-22 12:24:00 -05:00
Anuken	f044f30829	Merge	2020-01-18 11:16:03 -05:00
Anuken	c3d2351b2d	Various icon changes	2020-01-17 13:57:04 -05:00
Anuken	4f29c80814	Single-texture font+UI packing	2020-01-16 22:25:57 -05:00
Anuken	ce18e32826	Added font icon generate+merge pipeline	2020-01-16 17:05:20 -05:00
Anuken	1e7c83f0c9	Partial merge	2019-12-25 13:22:36 -05:00
Anuken	fad94cb56e	Updated Arc	2019-12-25 12:57:00 -05:00
Anuken	03342dc2f5	Android fixes	2019-12-25 12:06:19 -05:00
Anuken	475794640d	More cleanup	2019-12-25 11:16:54 -05:00
Anuken	48daf12810	three dee	2019-12-24 21:45:53 -05:00
Anuken	f3a5798a7f	Various fixes	2019-12-06 22:24:32 -05:00
Anuken	2b49c300f8	Security / Android compat / Functional extension	2019-12-06 21:57:47 -05:00
Anuken	5788c27aaa	hmmm	2019-12-03 01:01:18 -05:00
Anuken	9cb55b9745	a mess	2019-12-01 14:21:47 -05:00
Anuken	0e7c403bd8	Tweaks	2019-12-01 12:32:35 -05:00
Anuken	b21c25bccf	Added features that don't work	2019-11-30 22:15:30 -05:00
Anuken	ceae04aa5b	Desktop-specific scripting	2019-11-30 18:30:39 -05:00
Anuken	57f9aeee86	Public block fields / Better scripting	2019-11-27 13:51:07 -05:00
Anuken	d9aa9b6278	Desktop scripting support	2019-11-26 23:32:30 -05:00
Anuken	496677725e	Use the sane maven plugin	2019-11-19 22:32:59 -05:00
Anuken	9461d7a360	Hjson unit tests	2019-11-19 19:08:41 -05:00
Anuken	ec7379cc86	Updated to gradle 6.0	2019-11-15 19:48:26 -05:00
Anuken	1e7c21c1ae	Bugfixes	2019-11-06 13:59:35 -05:00
Anuken	cf6d2c7593	Added schematics dialog to desktop menu	2019-11-03 08:59:51 -05:00
Anuken	6746732e49	Steamworks4J updates	2019-10-30 19:31:06 -04:00
Anuken	08eb683e8a	Fixed #958	2019-10-30 18:29:36 -04:00
Anuken	06e7b94b60	Steam fixes	2019-10-30 16:29:01 -04:00
Anuken	f971061ef4	Bugfixes	2019-10-24 18:52:42 -04:00
Anuken	17e219f142	Fixed #859	2019-10-22 18:45:05 -04:00
Anuken	d2fda57f2c	Revert merge	2019-10-21 19:32:46 -04:00
Anuken	ec59396035	Fixed sharing crash	2019-10-20 21:31:34 -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	982483f178	Merged #812	2019-10-20 17:05:23 -04:00
Lionel Bergen	bd03e666da	fixed issue (#816)	2019-10-11 23:54:48 -05:00
Anuken	d062d8081a	Bugfixes	2019-09-21 16:44:47 -04:00
Anuken	0d25d83651	Better Android keyboard support	2019-09-21 15:35:59 -04:00
Anuken	0e9296913c	Fixed iOS build issues	2019-09-19 22:59:44 -04:00
Anuken	b1edaa1408	Testing arc hash script 4	2019-09-13 13:12:34 -04:00
Anuken	d8d9762998	Testing arc hash script 3	2019-09-13 13:08:21 -04:00
Anuken	19c76fc741	Testing arc hash script	2019-09-13 13:03:02 -04:00
Anuken	2cc627e7d0	Merged net module	2019-09-07 16:55:09 -04:00
Anuken	8653e7bbb1	Cleanup	2019-09-07 16:03:20 -04:00
Anuken	ff54629550	Merge	2019-09-06 13:58:32 -04:00