Commit Graph
677 Commits
Author SHA1 Message Date
Anuken 378e81cd90 Fixed #2917 2020-10-12 10:06:34 -04:00
AnukenandGitHub 66ecf96be2 Merge pull request #2904 from Quezler/patch-52
Make deconstructing scrap walls return scrap
2020-10-11 19:11:52 -04:00
Anuken af54de894c Balancing / LogicAI sync 2020-10-11 14:05:16 -04:00
Anuken 3fe79531a6 Added message for last accessed player of block 2020-10-11 11:47:22 -04:00
Anuken 3d99e38f10 Sector simplification 2020-10-11 10:51:33 -04:00
Anuken 65d9978fa1 Fixed #2901 / Fixed #2903 2020-10-11 09:02:20 -04:00
Patrick 'Quezler' MounierandGitHub eaf7a86bce Make deconstructing scrap walls return scrap 2020-10-11 13:54:28 +02:00
Anuken 4d889cd8d1 Weather fixes 2020-10-10 17:09:19 -04:00
Anuken c2202a0173 Bugfixes 2020-10-10 15:50:03 -04:00
Anuken 2079a91ac6 Merge remote-tracking branch 'origin/master' 2020-10-10 13:16:03 -04:00
Anuken d61ad8d2ef Fixed #2895 2020-10-10 13:15:59 -04:00
Patrick 'Quezler' MounierandGitHub f2bd4bf38c Who needs two pairs of legs? 2020-10-10 18:35:00 +02:00
DeltaNedas fd71e159d3 make storageblock instantiable 2020-10-10 11:16:04 +01:00
Anuken 7da400608c Bugfixes 2020-10-09 15:18:13 -04:00
Anuken c78088ab5f Harder default waves 2020-10-09 13:52:07 -04:00
Anuken d06449f311 space 2020-10-08 14:06:07 -04:00
Anuken 3ec243a49b Fixed #2866 2020-10-08 09:15:33 -04:00
Anuken 773e4c7053 Unified command 2020-10-07 16:37:48 -04:00
Anuken be66a15287 Extra mod field parsing (untested) 2020-10-07 11:00:02 -04:00
Anuken 79bd9f1f81 More logic commands 2020-10-06 16:27:02 -04:00
Anuken 2d539565c3 More logic commands 2020-10-06 14:03:21 -04:00
Anuken 9182b48b85 Various unit logic additions 2020-10-06 11:26:25 -04:00
genNAowlandGitHub cba2fd4351 Merge branch 'master' into healbullets-bullets 2020-10-05 16:04:29 -07:00
Anuken 5cc6ac0216 Small tweaks 2020-10-05 17:44:06 -04:00
Anuken 7088ae89b3 Logic unit control 2020-10-05 15:42:37 -04:00
Leonwang4234 f9d6ef8e91 Sublime Text is messing with whitespace 2020-10-05 11:58:35 -07:00
Leonwang4234 28ea336966 whitespace 2020-10-05 11:57:19 -07:00
Leonwang4234 e17f28b636 merge healbullets with bullettype 2020-10-05 11:49:12 -07:00
Anuken 605a370679 Fixed turrets firing without power as players 2020-10-04 09:58:53 -04:00
Anuken b561b38b56 Fixed #2824 2020-10-03 19:07:16 -04:00
Anuken 06f9aa5f84 things 2020-10-03 15:35:26 -04:00
Anuken 35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
Anuken 5861fe61b2 Cleanup 2020-10-02 19:51:30 -04:00
Anuken a3224b7082 Improved replacement system 2020-10-02 11:14:18 -04:00
Anuken 215cfaa42f Fixed #2793 2020-10-01 16:03:13 -04:00
Anuken 4074a241d2 Cleanup 2020-10-01 14:07:33 -04:00
Anuken 085bc2ee9c campaign progress 2020-10-01 11:19:42 -04:00
Leonwang4234 14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken f3c642d0d7 Fixed #2779 2020-09-30 19:55:22 -04:00
Anuken a0394e4382 Balance 2020-09-30 18:56:37 -04:00
Anuken 326640d32a Cleanup 2020-09-30 17:21:05 -04:00
Anuken 1697fec311 Tsunami balancing 2020-09-30 16:40:45 -04:00
slava0135 65607ba6bf better stats 2020-09-30 21:13:14 +03:00
slava0135 a806d7c019 Fun fact: 1.0 is smaller than 10 2020-09-30 20:41:56 +03:00
slava0135 aa5b3aa756 balancing 2020-09-30 20:30:04 +03:00
Anuken d2728c2bf0 Fixed #2774 2020-09-30 12:45:01 -04:00
slava0135 48da4933fc comma 2020-09-30 18:52:59 +03:00
Anuken 0963de4022 Cleanup 2020-09-30 11:19:38 -04:00
slava0135 d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
	core/src/mindustry/content/Blocks.java
2020-09-30 09:48:18 +03:00
Anuken 2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00