mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 01:37:13 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,232 Commits 4 Branches 160 Tags 2.3 GiB
f5ef01f01e
Commit Graph

11999 Commits

Author SHA1 Message Date
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
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
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
Epowerj
bc1de34296 Tweaked objectives for level 1 2022-05-03 14:41:49 -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
Epowerj
9f255f8178 Tweaked level three 2022-05-02 20:28:17 -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
Epowerj
e0062edc42 Tweaked level three 2022-05-02 18:42:07 -04:00
Epowerj
be13df6bd8 Tweaked level three 2022-05-02 17:54:30 -04:00
Epowerj
fce48cd92e Changed reinforcedLiquidRouter requirements to use graphite instead of tungsten 2022-05-02 17:54:20 -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
Epowerj
383beb3e8d Map 4 mostly done 2022-05-02 16:31:42 -04:00
Epowerj
85fb2bfa85 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-02 15:47:36 -04:00
Epowerj
c259a36922 Map 4 mostly done 2022-05-02 15:47:31 -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
Epowerj
0cb6f00ed2 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 20:19:29 -04:00
Epowerj
b982f987c8 Map 4 tweaks 2022-05-01 20:19:25 -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
Epowerj
51a6260798 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-05-01 16:57:18 -04:00
Epowerj
20a1094f42 Map 4 tweaks 2022-05-01 16:57:14 -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
Epowerj
0540017ef2 Map 4 tweaks 2022-05-01 13:44:40 -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
Epowerj
eab9b7eb48 Map 4 tweaks 2022-04-30 21:19:19 -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
Epowerj
bf1f621bbe Wave set up for map four 2022-04-30 21:07:18 -04:00
Epowerj
5e7bd82f39 Start working on fourth map's objectives 2022-04-30 20:15:29 -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
Epowerj
045d59fedf Start working on fourth map's objectives 2022-04-30 02:45:20 -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
Epowerj
7153797b5a Continue working on level four 2022-04-29 20:47:54 -04:00
Epowerj
58941ba2d7 Start reworking four 2022-04-29 18:54:36 -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
Epowerj
7db5e551f1 Added a couple vents back to three 2022-04-29 13:27:43 -04:00
Epowerj
22b4d11b36 Updated map three to have arkecyte earlier 2022-04-29 13:18:21 -04:00
Epowerj
ffdd04a278 Changed time before nuke to 8 minutes 2022-04-29 12:53:52 -04:00
Anuken
db7e567832 All stat stuff converted to non-enums 2022-04-29 12:10:49 -04:00
Anuken
a2d4363c9f Slower enemy build speed in map3 2022-04-29 11:33:05 -04:00
Anuken
e3c1b7ba30 Better objective indicators for 3rd map 2022-04-29 10:08:50 -04:00
Anuken
636f464f95 Logic cutscene fix 2022-04-28 22:30:43 -04:00
Anuken
a46cc17d38 Nuke cutscene 2022-04-28 22:05:46 -04:00
Anuken
6e04c70b16 Better nuke announcement 2022-04-28 19:57:21 -04:00
Anuken
9f501a33a3 Many misc bugfixes 2022-04-28 19:46:52 -04:00
Anuken
60c74ee65d Map tweaks, etc 2022-04-28 19:20:31 -04:00
Anuken
6c42dff884 Bugfixes 2022-04-28 18:25:39 -04:00
Anuken
969b70d512 cost tweaks 2022-04-28 18:07:19 -04:00
Anuken
7a6da35356 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-28 17:47:59 -04:00
Anuken
2d488e9614 Tech tree/balance tweaks 2022-04-28 17:47:56 -04:00
Epowerj
875d40a34b tweaked map three 2022-04-28 17:46:22 -04:00