14203 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anuken	8b2d4d8f3e	Merge remote-tracking branch 'origin/erekir' into erekir	2022-05-07 00:34:31 -04:00
Anuken	c9b9cf6cc4	Fixed potential divide-by-zero in bloom shader	2022-05-07 00:34:28 -04:00
Github Actions	043cd7f5be	Automatic bundle update	2022-05-07 04:31:11 +00:00
Anuken	aa0e254f0e	Mobile unit command support	2022-05-07 00:30:25 -04:00
Anuken	6740b60af2	Misc bugfixes, AI hit retaliation	2022-05-06 23:33:22 -04:00
Anuken	f6e68e91d0	Temporary sprite packing fix	2022-05-06 22:13:52 -04:00
Anuken	2c07b9cdb1	Removed unused class	2022-05-06 21:12:57 -04:00
Anuken	3367fa37be	Merge remote-tracking branch 'origin/erekir' into erekir	2022-05-06 21:05:43 -04:00
Anuken	7fbd196919	Five is inaccessible	2022-05-06 21:05:38 -04:00
Github Actions	88821befe6	Automatic bundle update	2022-05-07 00:35:16 +00:00
Anuken	5e6158feff	Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir	2022-05-06 20:33:46 -04:00
Anuken	59674dfcf2	Maps updated, ready to go	2022-05-06 20:26:33 -04:00
Anuken	fb389c9984	Bugfixes	2022-05-06 20:20:09 -04:00
Anuken	62b632758b	Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features	2022-05-06 20:07:44 -04:00
Anuken	9c0fd7c4c1	Bugfixes	2022-05-06 20:07:41 -04:00
Epowerj	768fac38c6	Update map three to now allow walkers to get through to the enemy base area from the north	2022-05-06 20:06:06 -04:00
Valeriy	40c7e89db3	Update servers_v7.json (#6756)	2022-05-06 19:13:55 -04:00
Anuken	bb6b8b020d	more	2022-05-06 19:13:39 -04:00
Anuken	688e02c04a	Fixed reserach cost of certain units	2022-05-06 19:12:48 -04:00
Anuken	ed774a6aa2	actually	2022-05-06 18:46:00 -04:00
Anuken	a2af906f1a	Fab cost fix	2022-05-06 18:43:59 -04:00
Anuken	46f43a3456	Bugfixes	2022-05-06 18:28:51 -04:00
Anuken	a86f62cbe8	Balancing	2022-05-06 16:00:47 -04:00
Anuken	f8789244d6	Balancing	2022-05-06 15:43:50 -04:00
Anuken	d4411fd234	Tech tree things	2022-05-06 14:53:44 -04:00
Epowerj	c73e364b55	Merge remote-tracking branch 'origin/7.0-features' into 7.0-features	2022-05-06 14:47:16 -04:00
Epowerj	63da9c40f7	Fixed issues with map four	2022-05-06 14:47:11 -04:00
Anuken	0c1926ade6	Block renaming done	2022-05-06 14:35:06 -04:00
Anuken	7540b1c10a	Fixed load map limit	2022-05-06 14:14:10 -04:00
Anuken	5ef423c185	ClassMap updae	2022-05-06 14:03:30 -04:00
Anuken	55f729565b	Modding API-related tweaks	2022-05-06 13:45:43 -04:00
Ilya246	8000e22e14	Rename .pl category (#6746)	2022-05-06 08:58:36 -04:00
Anuken	9da97c4d3c	Better erekir wave map	2022-05-06 00:43:49 -04:00
Anuken	a7f84e8690	Better json mod warning logging	2022-05-05 22:31:27 -04:00
Anuken	f7175540f8	Disable world processor rule	2022-05-05 20:36:11 -04:00
Anuken	60fb2e537f	Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features	2022-05-05 20:30:41 -04:00
Anuken	4d680ec91d	Docs	2022-05-05 20:30:37 -04:00
Epowerj	efbc0c96be	Updated a bunch of maps for correct names and changes to unit production	2022-05-05 19:58:08 -04:00
SachaTending	d66112a0f1	Remove inactive server (#6751)	2022-05-05 17:28:02 -04:00
Anuken	429e07adec	More units renamed	2022-05-05 13:39:14 -04:00
Anuken	7782331dbc	Unit renamings	2022-05-05 12:26:23 -04:00
Anuken	05d5a160fe	Block tweaks	2022-05-05 10:46:58 -04:00
Anuken	6a026f7286	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/assets/bundles/bundle_ko.properties	2022-05-05 00:31:49 -04:00
Anuken	7508e1e0e3	Quell buff	2022-05-05 00:31:30 -04:00
Anuken	d8cf443cd9	Docs	2022-05-04 23:10:42 -04:00
Anuken	e81438a7a9	Styles documented	2022-05-04 22:31:53 -04:00
Anuken	93d299716c	WIP style refactoring	2022-05-04 20:24:59 -04:00
Anuken	705b419799	Removed some unused content	2022-05-04 17:02:05 -04:00
Anuken	c28db45c4b	Assembler module block stuff	2022-05-04 16:55:27 -04:00
Anuken	22905de094	Cleanup of some GL stuff	2022-05-04 15:25:39 -04:00