2316 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anuken	b6c0fe8bf7	Build fix / Improved map contour	2018-09-24 23:12:13 -04:00
Anuken	d5bb1b72b9	Merge branch 'continuous-sectors' of https://github.com/Anuken/Mindustry ... # Conflicts: # core/assets/bundles/bundle.properties	2018-09-24 22:57:49 -04:00
Anuken	af86564adc	Final tutorial fixes	2018-09-24 22:56:48 -04:00
Anuken	5354e02b6f	Finally a somewhat functional tutorial / Many bugfixes	2018-09-24 20:24:51 -04:00
Prosta4okua	4ee17a656f	Update bundle.properties (#226)	2018-09-24 14:14:23 -04:00
Anuken	32c59b66f6	Changed tutorial ore gen	2018-09-24 10:19:27 -04:00
Anuken	20732f04ff	Block position starting missions	2018-09-23 23:45:35 -04:00
Anuken	06763b34c3	Bugfixes / Better topological map	2018-09-23 18:41:08 -04:00
Anuken	6bab6c57f2	Fixed waves not appearing / Fixed ore tile blending	2018-09-23 12:45:22 -04:00
Anuken	4eab89d73e	Per-sector ore gen	2018-09-23 10:10:05 -04:00
Anuken	8d20c46228	Basic tutorial text	2018-09-22 16:41:55 -04:00
Anuken	f5c4586bb7	Merge remote-tracking branch 'origin/master'	2018-09-22 12:29:30 -04:00
Anuken	bc6bbdbbe0	Fixed not being able to move units on conveyors	2018-09-22 12:29:27 -04:00
Anuken	b77caed0ba	Added sample tutorial text / Refactoring	2018-09-22 12:20:04 -04:00
Baramos666	df976f1212	Update bundle_fr.properties (#225)	2018-09-22 11:17:07 -04:00
Anuken	999dd5eb6f	Better mission display / Improved tutorial item amounts	2018-09-21 23:29:17 -04:00
Anuken	a1a6a3ab81	Tutorial sector prototype / New mission display	2018-09-21 23:14:26 -04:00
Anuken	d067bbfa65	New mission classes	2018-09-21 19:36:19 -04:00
Anuken	3bd40eeb27	Merge remote-tracking branch 'origin/continuous-sectors' into continuous-sectors ... # Conflicts: # core/src/io/anuke/mindustry/maps/Sectors.java	2018-09-21 16:33:00 -04:00
Anuken	b124d54055	Merge	2018-09-21 16:32:38 -04:00
Anuken	90691de457	Fog persistence in sector expansion	2018-09-21 16:11:40 -04:00
Anuken	bee83a3a3e	Sector expansion functional	2018-09-21 14:01:00 -04:00
Anuken	fd8f2438fa	New world generation methods	2018-09-21 13:50:39 -04:00
Anuken	7937d99a73	Fixed buggy mobile zoom	2018-09-21 09:02:25 -04:00
Anuken	569afb5535	expandSector implementation	2018-09-21 08:49:35 -04:00
Anuken	fc5a45e113	Merge remote-tracking branch 'origin/continuous-sectors' into continuous-sectors	2018-09-21 08:47:41 -04:00
Anuken	950f4a9f1a	Added expandSector method	2018-09-21 08:47:37 -04:00
Anuken	6a6e80b6d8	Fixed multiblock erase bug	2018-09-20 18:25:55 -04:00
Anuken	083c9792a6	Fixes to conveyor transmission visuals	2018-09-20 18:22:29 -04:00
Anuken	893bfce767	Incorrect conveyor movement transitions	2018-09-20 17:14:03 -04:00
Anuken	f61f3df732	Build fix	2018-09-20 12:32:12 -04:00
Anuken	a3be5e332e	Fill.polyTri replaced	2018-09-20 12:31:53 -04:00
Anuken	33d65a8593	Fixed unit drop crash	2018-09-20 11:18:57 -04:00
Anuken	ebbf01c6e5	Synchronization	2018-09-20 09:29:16 -04:00
Anuken	acb8496352	Fixed node connection bug	2018-09-20 09:24:31 -04:00
Anuken	ecad5772d2	Fixed power debug blocks not working / Moved debug recipes	2018-09-20 08:47:58 -04:00
Anuken	6e6f5714dd	Merge remote-tracking branch 'origin/master'	2018-09-20 08:34:07 -04:00
Anuken	50ae15aa4f	Power crash fix	2018-09-20 08:33:57 -04:00
iczero	4e2c3049a0	Don't add unit drops to core if the core is full (#222)	2018-09-19 22:47:32 -04:00
Anuken	3a785c166e	Removed NodeEntity	2018-09-19 22:39:43 -04:00
Anuken	5248a4eb9c	Name refactor / Fixed crash / Power transfer fix	2018-09-19 22:17:58 -04:00
Anuken	c9a53aed7b	Fixed crash, transmission bug	2018-09-19 17:36:58 -04:00
Anuken	bafe5dc784	Fixed block break crash	2018-09-19 12:41:33 -04:00
Anuken	5325488099	Changed enum to two booleans	2018-09-19 10:32:06 -04:00
Anuken	737ad5c8b7	Implemented node linking, graph reflow	2018-09-19 10:26:27 -04:00
Anuken	17cea4e274	Added PowerType enum	2018-09-19 10:07:33 -04:00
Anuken	af5b579a2f	Power graph loading / merging	2018-09-19 09:41:30 -04:00
Anuken	c87eaaa928	Graph removal	2018-09-18 20:48:48 -04:00
Anuken	33418397f8	Power graph removal	2018-09-18 17:04:43 -04:00
Anuken	8c7258e839	Merge	2018-09-18 17:04:24 -04:00