Commit Graph
100 Commits
Author SHA1 Message Date
Anuken a5b6c2a03a Fixed sector base shift + impossible requirements 2022-05-08 00:43:38 -04:00
Anuken f055e35729 Crash fix 2022-05-08 00:03:06 -04:00
Anuken c8f81bd9b0 shadowElevationScl 2022-05-07 22:57:12 -04:00
Anuken 7b47a5cc30 Fixed auto-unlock for campaign sectors 2022-05-07 22:08:49 -04:00
Anuken a9d4e56e66 Crash fix 2022-05-07 21:20:12 -04:00
Anuken 471504090a Misc bugfixes 2022-05-07 20:44:28 -04:00
Anuken b3d064b1f7 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-07 14:09:49 -04:00
Anuken 0d61d98c70 Bugfixes 2022-05-07 14:09:47 -04:00
Anuken dfac73d81c Do not make cores derelict 2022-05-07 11:56:42 -04:00
Anuken 5c9ad34322 Map AI rebalancing 2022-05-07 11:47:41 -04:00
Anuken 792a7b5755 Laser crash fix 2022-05-07 11:44:36 -04:00
Anuken f99a523002 Fixed beam node replacement update 2022-05-07 11:21:35 -04:00
Anuken 7885a46cd5 Renamed TeamData blocks -> plans 2022-05-07 10:57:21 -04:00
Anuken 8f2e1163dd Fixed wave simulation estimation 2022-05-07 10:45:43 -04:00
Anuken 8fae99e780 Fixed JSON part support 2022-05-07 10:22:33 -04:00
Anuken 17d8d5875e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-07 10:09:05 -04:00
Anuken 7c8cbd41a4 Added DrawPart to ClassMap 2022-05-07 10:08:59 -04:00
Anuken dfb01ebdf1 Fixed mod crash 2022-05-07 01:12:20 -04:00
Anuken 9c86433047 Unit command tweaks 2022-05-07 00:41:27 -04:00
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
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
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
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
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
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
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
Anuken 771c2270df Phase tech tree fix 2022-05-04 00:57:00 -04:00
Anuken 7640fa0bf0 Misc cleanup & target/hit movements 2022-05-03 20:39:54 -04:00
Anuken 8b9eb0b466 Cleanup 2022-05-03 15:27:30 -04:00
Anuken a784d184aa Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-03 14:42:15 -04:00
Anuken 210481703f Lots of balancing/tweaks 2022-05-03 14:42:11 -04:00
Anuken 459428ef25 Crash fix, begin rebalancing 2022-05-03 11:23:24 -04:00
Anuken 6c3eb3fe1e Delta fix 2022-05-02 22:41:37 -04:00
Anuken 4dcfdbe82f Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 22:24:48 -04:00
Anuken 78f3e23f0b WIP bullet shotgun for T4 tank 2022-05-02 22:24:45 -04:00
Anuken de9a41159f Discord link in desktop menu 2022-05-02 19:41:43 -04:00
Anuken 61d145e233 Advanced reconstructor in tech tree 2022-05-02 19:26:21 -04:00
Anuken 6553ff9e56 diffuse in tech tree 2022-05-02 18:54:39 -04:00
Anuken 02eec0e43c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 18:53:15 -04:00
Anuken 98b01953a4 Diffuse turret 2022-05-02 18:53:12 -04:00
Anuken 068c0dbe4d Walker in tech tree 2022-05-02 17:51:40 -04:00
Anuken 4d54b8251d Map rename 2022-05-02 16:33:41 -04:00
Anuken 3542bd9e90 T3 tank done 2022-05-02 15:37:43 -04:00
Anuken 5f0ef9b27e WIP T3 tank 2022-05-02 14:29:32 -04:00
Anuken 07c24d7164 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-01 23:50:52 -04:00
Anuken 1d249f233f UnitType docs 2022-05-01 23:50:49 -04:00
Anuken 5e7428f034 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-05-01 17:45:40 -04:00
Anuken f85fba264a Fixed crawler targeting 2022-05-01 17:45:36 -04:00
Anuken 3914f45c2c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-01 14:49:32 -04:00
Anuken 865a5d56ed Two units complete 2022-05-01 14:49:30 -04:00
Anuken 41a8be1b29 Hover unit thingy done 2022-05-01 10:14:55 -04:00
Anuken 8ea9c094ab Unit repair tower sprite/effects 2022-04-30 23:24:28 -04:00
Anuken 1c84e6d7ea Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-30 23:00:38 -04:00
Anuken 25208d0797 Hover unit stuff 2022-04-30 23:00:35 -04:00
Anuken f833a4e1bb Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-30 21:11:20 -04:00
Anuken 512fbe0199 T1 walker thing done 2022-04-30 21:11:17 -04:00
Anuken 59be28b5eb Time to begin adding the new units 2022-04-30 18:08:40 -04:00
Anuken fe62e1b6e3 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-30 09:02:51 -04:00
Anuken 79ffe22b7f Build consistency tweaks 2022-04-30 09:02:45 -04:00
Anuken 2dd8cb01ec fixed router update 2022-04-29 22:10:40 -04:00
Anuken 76ec6591a5 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-29 21:44:49 -04:00
Anuken c61e058231 fine 2022-04-29 21:44:46 -04:00
Anuken b696e1c89a Radar only on Erekir 2022-04-29 18:38:58 -04:00
Anuken 712fa95e88 File chooser bracket escape 2022-04-29 16:48:01 -04:00
Anuken 30685e2865 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-29 15:00:00 -04:00
Anuken dcb51ca73f Misc balance/bugfixing 2022-04-29 14:59:57 -04:00