3925 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anuken	54ad52edc2	Merging of map saves	2019-05-14 11:54:22 -04:00
Anuken	0e869f3cb5	Fixed rules not saving / Memory usage reduction	2019-05-14 11:48:14 -04:00
Anuken	4d40af6ac0	More helpful in-game edit button	2019-05-13 11:47:38 -04:00
Anuken	79a2f31056	Fixed unit tests	2019-05-13 11:32:57 -04:00
Anuken	b2341bf75c	Added map default rule editing	2019-05-13 11:31:25 -04:00
Anuken	c4c4b473e5	Server cleanup	2019-05-13 00:43:06 -04:00
Anuken	6e26ccf25d	Removed unnecessary inheritance	2019-05-12 23:50:33 -04:00
Anuken	83bfad3546	Fixed server compilation	2019-05-12 20:01:59 -04:00
Anuken	90f6fff1ae	Layout fixes	2019-05-12 19:55:26 -04:00
Anuken	52f2b52990	Somewhat functional rule selection	2019-05-12 19:43:23 -04:00
Anuken	48ed4b0e49	Fixed startup crash / Fixed editor rule issue	2019-05-12 12:51:25 -04:00
Anuken	c3c609e7b9	Fixed invisible enemies	2019-05-12 12:38:40 -04:00
Anuken	6cd8fa6b0c	Removed unused support library dependency	2019-05-12 12:16:46 -04:00
Anuken	ffb6d398d7	Layout fixes	2019-05-12 12:00:19 -04:00
Anuken	52674b4668	Mobile diagonal toggle / Cancel button moved	2019-05-12 11:19:31 -04:00
Anuken	4ae2370137	New WIP custom map selection	2019-05-12 10:32:08 -04:00
키에르	cee55afa5c	Update bundle_ko.properties	2019-05-12 15:46:03 +09:00
키에르	f998bbbe4c	Update bundle_ko.properties	2019-05-12 14:45:25 +09:00
Anuken	e5d19a9819	Entity placement/removal	2019-05-11 21:42:06 -04:00
Anuken	dd75d88d2f	Unit creation, team switch	2019-05-11 12:32:13 -04:00
Anuken	65ea01218a	Fixed core-less editor gameover, respawning	2019-05-11 00:58:13 -04:00
Anuken	7a2234cd25	Tweaks to improve in-game editing	2019-05-11 00:37:29 -04:00
Anuken	11ede2756e	Functional in-game map edits and loading	2019-05-10 20:25:09 -04:00
Anuken	3e51fab387	In-game editing (broken)	2019-05-10 19:13:55 -04:00
Anuken	962f413421	Cleanup	2019-05-10 16:16:21 -04:00
Anuken	ae6c938abb	Merge remote-tracking branch 'origin/master'	2019-05-10 16:02:15 -04:00
Anuken	68faae69c5	Fixed compilation errors / Re-added basic trace dialog	2019-05-10 16:02:05 -04:00
MrPickles14	08edce7906	Update core/assets/bundles/bundle_fr.properties ... Co-Authored-By: Math2128 <math2128@gmail.com>	2019-05-10 14:32:24 -04:00
MrPickles14	55eb493d1f	Update bundle_fr.properties ... J'ai changé 2 ou 3 trucs et ajouté des traductions qui n'étaient pas faites	2019-05-10 14:30:38 -04:00
Anuken	d6be07f1b8	Fixed crash	2019-05-10 13:42:04 -04:00
Anuken	064a012b25	Map previews functional	2019-05-10 12:57:45 -04:00
MrPickles14	df26148e7c	Update bundle_fr.properties	2019-05-10 12:23:21 -04:00
Anuken	d26f533111	Basic non-in-game editor functionality	2019-05-10 00:01:48 -04:00
Anuken	69575dbab3	Fixed multiblocks not drawing	2019-05-09 18:10:12 -04:00
Anuken	9f4a430412	Fixed tests	2019-05-09 14:39:52 -04:00
Anuken	23843be981	More bugfix stuff	2019-05-09 12:57:00 -04:00
Anuken	486e3ffc0a	Actual map conversion, loading of saves	2019-05-09 10:53:52 -04:00
Anuken	8127e5a66f	Made save format actually functional, many things still broken	2019-05-08 23:16:08 -04:00
Anuken	53167a3b52	Map conversion code	2019-05-07 17:30:37 -04:00
Anuken	1b77247c40	wow it builds	2019-05-07 11:56:17 -04:00
Leone25	24374cf7e3	Update bundle_it.properties (#490) ... please merge as soon as possible	2019-05-07 09:34:42 -04:00
Anuken	88de54ec90	Further unfinished map tweaks	2019-05-06 18:32:18 -04:00
Anuken	3035d569cc	Editor<->world data merging	2019-05-06 17:03:53 -04:00
Anuken	51f9ad5a2c	many things	2019-05-06 14:34:21 -04:00
키에르	bb322f1bff	Update bundle_ko.properties	2019-05-06 16:20:54 +09:00
키에르	72843e9c92	Update bundle_ko.properties	2019-05-06 16:19:20 +09:00
Anuken	20fbe2fbbe	even less broken	2019-05-05 22:09:02 -04:00
Anuken	bf073a84c8	a bit less broken but still broken	2019-05-05 19:05:46 -04:00
Anuken	35b158dba7	everything is borked	2019-05-05 14:16:34 -04:00
Anuken	465c0e7dc3	Merge branch 'master' of https://github.com/Anuken/Mindustry	2019-05-05 12:50:04 -04:00