4525 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anuken	5a3fbf33df	Made all color names lowercase for consistent style	2019-09-09 16:22:29 -04:00
Anuken	b867cdb8b9	Map fix	2019-09-08 23:33:21 -04:00
Anuken	3bac32e04a	Dialog fix	2019-09-08 23:30:15 -04:00
Anuken	c4c0f45228	cleaning up what remains	2019-09-08 22:55:36 -04:00
Anuken	d981bb95b9	it is gone	2019-09-08 22:32:47 -04:00
Anuken	c9f0a59339	time for a crusade against dialogs	2019-09-08 15:08:55 -04:00
Anuken	ec58e868fd	Update bundle.properties	2019-09-08 11:35:38 -04:00
Ulysses2	aa5152ac70	Update Router.java (#643)	2019-09-08 09:31:49 -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	4fb7430fb7	More cleanup, removed connection IDs	2019-09-07 15:23:13 -04:00
Anuken	e90c8c4d3e	Extensive network refactor	2019-09-07 14:11:50 -04:00
Anuken	06e6deae42	More cleanup	2019-09-07 12:10:26 -04:00
Anuken	38fe99f10e	Android cleanup	2019-09-07 12:04:28 -04:00
Anuken	05ab62f038	merge	2019-09-06 22:51:35 -04:00
Anuken	168011586b	More file chooser fixes	2019-09-06 22:09:54 -04:00
Anuken	b5f1e566b2	New Android file chooser implementation	2019-09-06 21:21:30 -04:00
Anuken	9b6fb2f382	cleanup	2019-09-06 15:20:30 -04:00
Anuken	24bb2428e7	Bugfixes	2019-09-06 14:05:13 -04:00
Anuken	75ba33abc0	Compile fix	2019-09-06 14:02:42 -04:00
Anuken	ff54629550	Merge	2019-09-06 13:58:32 -04:00
Anuken	b492c7ae27	Bugfixes	2019-09-05 21:44:49 -04:00
Anuken	5d04f93a88	Merge remote-tracking branch 'origin/master'	2019-09-05 19:23:25 -04:00
Anuken	5651d1b023	Support for built-in servers	2019-09-05 19:23:17 -04:00
Axel Soll	6822e3f5b8	Add French app description for the Play Store. (#635) ... * Add French app description for the Play Store. * Add "Features include" line * Update full_description.txt	2019-09-05 10:01:25 -04:00
Anuken	3cbb02f9fb	Merge remote-tracking branch 'origin/master'	2019-09-04 23:16:33 -04:00
Anuken	0f79298c28	Many various fixes	2019-09-04 23:16:26 -04:00
Anuken	8f4bd09635	Update Blocks.java	2019-09-04 10:00:16 -04:00
Anuken	0a9cad2ea6	net fix	2019-09-03 22:59:10 -04:00
Anuken	dc21adfda5	Better spawn animations	2019-09-03 22:55:46 -04:00
Anuken	a7bfe18f4a	Player limit / Server mode display / Crash fixes / More save info	2019-09-03 19:14:33 -04:00
Anuken	9cc76a148b	Utility methods	2019-09-03 08:36:59 -04:00
Anuken	1d95a255bc	Bugfixes	2019-09-03 08:21:23 -04:00
Anuken	3f8d412d1c	Merge remote-tracking branch 'origin/master'	2019-09-02 21:07:45 -04:00
Anuken	b2c35d45c3	merge 2	2019-09-02 21:07:40 -04:00
Anuken	35ab90e445	Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/src/io/anuke/mindustry/core/NetServer.java	2019-09-02 21:07:15 -04:00
Anuken	9bfb5216f9	Merge remote-tracking branch 'origin/master'	2019-09-02 20:59:44 -04:00
Anuken	b10656294e	Merge	2019-09-02 20:59:35 -04:00
Anuken	316f4d471f	Fixed iOS crash	2019-09-02 20:58:15 -04:00
J-VdS	ef0b56eb22	Extra events (#630) ... * eventype player join * playerjoin event * player leave * player leave event * typo * remove * leave fix	2019-09-02 19:37:38 -04:00
Anuken	e640042e5d	Update build.gradle	2019-09-02 12:40:52 -04:00
Anuken	2c0d2c5e22	Update NetServer.java	2019-09-02 12:37:25 -04:00
Anuken	9eed39c2ae	Update NetServer.java	2019-09-02 12:34:15 -04:00
Anuken	e8d89b6c43	Bugfixes	2019-09-01 15:52:07 -04:00
Anuken	494c3ffbc4	💥	2019-09-01 13:34:20 -04:00
Anuken	40d27c787c	Fixed drones not finding blocked ores	2019-09-01 13:21:20 -04:00
Anuken	2fe5b44698	Java 8+ plugin load fix	2019-09-01 11:01:04 -04:00
Anuken	5cc32b9001	Fixed map loading bugs	2019-09-01 10:46:44 -04:00
Anuken	d481af43c7	Fixed "disconnected" bug / Updated menu music	2019-09-01 10:19:13 -04:00
Anuken	1cd43f938f	Bugfixes	2019-09-01 00:45:54 -04:00