Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,974 Commits 4 Branches 180 Tags
901d0106c04b60a717e00ee1bcc19c303dc5fdbe
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Epowerj 901d0106c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-08 17:45:06 -04:00
Epowerj f4798f5adc hid a bunch of stuff from the tech tree for now 2022-08-08 15:54:33 -04:00
Epowerj 4b9b4f3c0b Progress on marsh 2022-08-06 15:03:36 -04:00
Epowerj 33ef30923b Progress on marsh 2022-08-05 19:13:51 -04:00
Epowerj a127302aae Progress on marsh 2022-08-05 18:26:09 -04:00
Epowerj 605f727f22 Progress on marsh 2022-08-05 18:11:19 -04:00
Epowerj b1ad070f80 Progress on marsh 2022-08-05 17:34:56 -04:00
Epowerj dc92222d98 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-05 17:06:47 -04:00
Epowerj 4f652852ec Progress on marsh 2022-08-05 17:04:40 -04:00
Epowerj aa7576758a Tweaks on basin 2022-08-05 15:52:16 -04:00
Epowerj d882dcf395 Marsh is probably testable now once Anuke is done with ground beryllium rebalancing 2022-08-04 19:28:31 -04:00
Epowerj f728bd643a Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-04 19:02:22 -04:00
Epowerj 1fa34518d6 Progress on marsh 2022-08-04 19:02:11 -04:00
Epowerj 1245ff006f Progress on marsh 2022-08-04 18:45:26 -04:00
Epowerj f6b5962997 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2022-08-04 14:55:14 -04:00
Epowerj e3566bda28 Progress on marsh 2022-08-04 14:32:05 -04:00
Epowerj d9312bc960 Progress on marsh 2022-08-04 13:51:41 -04:00
Epowerj d6a0ce0fce Progress on marsh 2022-08-03 21:09:37 -04:00
Epowerj 8a51ac0bdc More work on marsh 2022-08-03 16:33:21 -04:00
Epowerj 00d6a73c27 Tweaked tech tree and for marsh 2022-08-03 16:33:14 -04:00
Epowerj e2dea0f84e Begin rework of basin 2022-08-02 18:32:26 -04:00
Epowerj d77afbea06 Being work on marsh 2022-08-02 18:17:53 -04:00
Epowerj 2332d9bee1 Tweaked intersect 2022-07-18 13:41:04 -04:00
Epowerj a36a87fa83 Added an extra island to lake 2022-07-18 13:37:18 -04:00
Epowerj 1529d4ecc9 Tweaked aegis 2022-07-18 11:22:26 -04:00
Epowerj fceec59a61 Added more resources to onset 2022-07-18 11:21:13 -04:00
Epowerj 6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -04:00
Epowerj b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00
Epowerj 9d3bf2d489 Tweaked split 2022-07-14 15:06:57 -04:00
Epowerj 251404f29e Rearranged some transport tech on the tree 2022-07-14 14:54:47 -04:00
Epowerj 43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj a68b2fad11 Fixed research tree issue that prevented unlocking split 2022-07-14 14:49:41 -04:00
Epowerj 3a3eb2c63d Progress on split 2022-07-13 15:05:52 -04:00
Epowerj 24e70faf02 Start reworking split 2022-07-12 20:37:17 -04:00
Epowerj e79763d139 Changed payload build requirements 2022-07-12 20:36:57 -04:00
Epowerj ecc9dd7a7f Made reinforced container cheaper and smaller 2022-07-12 19:03:23 -04:00
Epowerj 352fa4e18f Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 23:08:33 -04:00
Epowerj b29b6b38e7 rearranged tech tree 2022-07-11 21:36:31 -04:00
Epowerj 458ab9d639 tweaked atlas 2022-07-11 21:36:15 -04:00
Epowerj ca18b851a1 Tweaked atlas, set max squad size 2022-07-11 18:44:28 -04:00
Epowerj 4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Epowerj 7aea85668b forgot period lol 2022-07-11 17:15:11 -04:00
Epowerj 9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Epowerj 735d81e42b Typo 2022-07-11 17:03:55 -04:00
Epowerj 4746cdbb6b Added description to atlas 2022-07-11 17:02:22 -04:00
Epowerj 1124f5f369 Fixed issue with level four unlocking early 2022-07-10 17:05:23 -04:00
Epowerj 5d852085c2 Tweaked three 2022-07-08 18:35:56 -04:00
Epowerj e6502dad75 Changed requirements for split 2022-07-08 18:35:47 -04:00
Epowerj 32d586617d tweaked sector three 2022-07-07 17:03:30 -04:00
Epowerj c2a9c77510 Added a sector description for three 2022-07-07 16:57:12 -04:00
Epowerj 624960e1c2 Tweaked lake yellow tiles 2022-07-06 21:28:46 -04:00
Epowerj 92e45559cc Added objectives to lake 2022-07-06 21:14:20 -04:00
Epowerj e0658fdd2d Added accents to lake description 2022-07-06 21:14:07 -04:00
Epowerj 3ef2b2f27e Tweaked lake starter base 2022-07-06 20:33:52 -04:00
Epowerj 97a2f66fcb Added a description for lake 2022-07-06 20:33:37 -04:00
Epowerj 7bc943a862 Tweaked Two's enemy base 2022-07-06 20:13:15 -04:00
Epowerj 6ed64e6504 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-06 18:01:05 -04:00
Epowerj 25d92c680b Fixed small issue with wall placement in two 2022-07-06 17:08:40 -04:00
Epowerj daffc73d0c Fixed issue with missing objectives on two 2022-07-06 16:52:08 -04:00
Epowerj c6c2b85c29 Changed split's waves to not be infinite for now 2022-07-06 14:52:14 -04:00
Epowerj 3e393b80d6 Added some maps and moved tech tree around. 
Not tested yet.
 2022-07-05 18:46:59 -04:00
Epowerj 6c39249899 Fixed waves on level three not working right with new map changes 2022-05-10 18:14:56 -04:00
Epowerj b7eeec243e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-10 17:37:25 -04:00
Epowerj 15fa120eeb Fixed an issue with three 2022-05-10 17:37:19 -04:00
Epowerj 1eba814e68 adjusted levels three and four for new tech changes 2022-05-10 16:44:19 -04:00
Epowerj 6e23fffe41 More level 2 tweaks to make it easier 2022-05-09 13:28:27 -04:00
Epowerj 5c6b8df764 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 12:54:28 -04:00
Epowerj 1668035759 Tweaked clipping issues in onset 2022-05-09 12:45:48 -04:00
Epowerj 79240a45d0 More tweaks to level two - show players they can water cool breach turret 2022-05-09 11:46:11 -04:00
Epowerj c5cafd5573 Adjustments to level two to make it easier 2022-05-09 11:39:16 -04:00
Epowerj d4acf3c9a5 Fixed level four requirements 2022-05-07 01:35:56 -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
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
Epowerj efbc0c96be Updated a bunch of maps for correct names and changes to unit production 2022-05-05 19:58:08 -04:00
Epowerj bc1de34296 Tweaked objectives for level 1 2022-05-03 14:41:49 -04:00
Epowerj 9f255f8178 Tweaked level three 2022-05-02 20:28:17 -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
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
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
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
Epowerj 0540017ef2 Map 4 tweaks 2022-05-01 13:44:40 -04:00
Epowerj eab9b7eb48 Map 4 tweaks 2022-04-30 21:19:19 -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
Epowerj 045d59fedf Start working on fourth map's objectives 2022-04-30 02:45:20 -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
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
Epowerj 875d40a34b tweaked map three 2022-04-28 17:46:22 -04:00
Epowerj 6d615bf641 Bundled nuclear launch text 2022-04-28 14:56:39 -04:00