Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,054 Commits 4 Branches 180 Tags
d45cd7c15e6f75d53efcf1d72e7cd447b0d640e7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnukenandGitHub a84d52f5fe Removed Omnidustry sandbox due to moderation issues (#8203) 2023-01-22 09:26:09 -05:00
Anuken 330d37b7a5 Merge remote-tracking branch 'origin/master' 2023-01-22 08:59:36 -05:00
Anuken d2792a4e9d Fixed #8202 2023-01-22 08:59:32 -05:00
Anuken ee689d1597 Merge remote-tracking branch 'origin/master' 2023-01-20 09:37:33 -05:00
Anuken 6ef8d64d46 Efficiency fix 2023-01-20 09:37:28 -05:00
Anuken 85b8868d2b Fixed #8194 2023-01-18 10:41:39 -05:00
Anuken 65e92ab6fc Merge remote-tracking branch 'origin/master' 2023-01-17 18:50:49 -05:00
Anuken 478baf2532 Fixed #8192 2023-01-17 18:50:44 -05:00
Anuken b4359c0489 Merge remote-tracking branch 'origin/master' 2023-01-16 15:28:45 -05:00
Anuken 977192bc54 Fixed #8187 2023-01-16 15:28:40 -05:00
Anuken f6c97f4ff6 Fixed #8185 2023-01-16 11:06:34 -05:00
Anuken 66f4118896 Fixed #8184 2023-01-15 15:19:13 -05:00
Anuken 4a8f8c4ecf Merge remote-tracking branch 'origin/master' 2023-01-15 08:51:57 -05:00
Anuken 6d7c207b95 Fixed drawing of assembler payloads 2023-01-15 08:51:51 -05:00
Anuken 3159ce6707 Merge remote-tracking branch 'origin/master' 2023-01-13 19:34:52 -05:00
Anuken 9b033532c8 Fixed #8177 2023-01-13 19:34:48 -05:00
Anuken 00d6b0d483 Merge remote-tracking branch 'origin/master' 2023-01-13 09:59:05 -05:00
Anuken 598049265a Complete revert of #8019 2023-01-13 09:59:01 -05:00
Anuken b2b4602c91 Reverting #8037 2023-01-13 09:42:28 -05:00
Anuken b1e1fe4922 Merge remote-tracking branch 'origin/master' 2023-01-13 09:31:14 -05:00
Anuken edcf3c4223 Fixed #8170 2023-01-13 09:31:10 -05:00
Anuken ec9eadd660 encoding test 2023-01-12 22:52:32 -05:00
Anuken 7277892e33 Merge remote-tracking branch 'origin/master' 2023-01-12 17:01:52 -05:00
Anuken 54962a158d Fixed #8168 2023-01-12 17:01:47 -05:00
Anuken e92d5d2d2d Fixed #8165 2023-01-12 14:42:42 -05:00
Anuken 411367f294 Revert JSON rules change 2023-01-12 14:38:11 -05:00
Anuken f49e05a915 Fixed #8161 / Fixed #8162 2023-01-12 14:30:57 -05:00
Anuken 53e8eaae75 Further scathe uncover range nerf 2023-01-12 11:36:13 -05:00
Anuken 85077fbb9c Force canGameOver in campaign 2023-01-12 11:32:57 -05:00
Anuken f070d8c965 Merge remote-tracking branch 'origin/master' 2023-01-12 09:35:52 -05:00
Anuken 0dc2dc9b08 Fixed crash with modded unit classes 2023-01-12 09:35:48 -05:00
Anuken 3287479ee3 Damage object pooling 2023-01-12 08:50:19 -05:00
Anuken b308b3eaa4 Merge remote-tracking branch 'origin/master' 2023-01-12 08:36:52 -05:00
Anuken b734fb948d Fixed #8159 2023-01-12 08:36:47 -05:00
Anuken 9c63165ef5 Fixed #8156 2023-01-11 19:59:58 -05:00
Anuken 5e084be6f5 Merge remote-tracking branch 'origin/master' 2023-01-11 09:23:29 -05:00
Anuken 5a2c987ea6 Fixed #8153 2023-01-11 09:23:22 -05:00
Anuken a9175d3ffe + 2023-01-10 21:26:57 -05:00
Anuken 79ea2480cb unitCrashDamage rule 2023-01-10 21:25:23 -05:00
Anuken 2c3210afce Merge remote-tracking branch 'origin/master' 2023-01-10 11:59:36 -05:00
Anuken ea9ba60d66 Minor unit balance changes 2023-01-10 11:59:31 -05:00
Anuken 1417e94bcd Merge remote-tracking branch 'origin/master' 2023-01-09 22:17:27 -05:00
Anuken 3ec2ae797e Ship beryllium cost increase / Scathe discover range nerf 2023-01-09 22:17:20 -05:00
Anuken cba1e81f3d More consistent status flash 2023-01-08 14:40:47 -05:00
Anuken dcc6e9827d Status flash tweaks 2023-01-08 12:29:29 -05:00
Anuken e27f7c8332 Fixed #8131 2023-01-08 10:24:55 -05:00
Anuken 40aebf0e77 Merge remote-tracking branch 'origin/master' 2023-01-08 10:19:52 -05:00
Anuken dcf9aa9793 Fixed #8132 2023-01-08 10:19:47 -05:00
Anuken 658ebf4bc5 Merged #8053 2023-01-08 01:23:54 -05:00
Anuken d082963167 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_es.properties
 2023-01-08 00:17:52 -05:00
Anuken e2fa834079 Merge of #7987 2023-01-08 00:16:58 -05:00
Anuken 2c2d561ea6 Merge remote-tracking branch 'origin/master' 2023-01-07 19:34:40 -05:00
Anuken 62e33effd1 CargoAI target clearing 2023-01-07 19:34:36 -05:00
Anuken be8fec55e1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-01-07 16:22:06 -05:00
Anuken 76430c1e68 a 2023-01-07 16:21:03 -05:00
Anuken 56ed932716 Merge remote-tracking branch 'origin/master' 2023-01-07 15:07:57 -05:00
Anuken 4c09f6dd40 Fixed #8025 2023-01-07 15:07:54 -05:00
Anuken f1e1eb1015 Fixed #8015 2023-01-07 14:54:15 -05:00
Anuken 963b96a1fb Merge remote-tracking branch 'origin/master' 2023-01-07 14:47:14 -05:00
Anuken 87786441ff Fixed #8117 2023-01-07 14:47:10 -05:00
Anuken 05dec4df6a Fixed #8117 2023-01-07 14:46:31 -05:00
Anuken eb410af371 sandbox is now actually sandbox again 2023-01-07 14:41:12 -05:00
Anuken 542bf2b413 Fixed #8084 2023-01-07 14:26:25 -05:00
Anuken 723b10af57 Fixed #7944 2023-01-07 14:18:07 -05:00
Anuken 1394c49e48 Fixed #8008 2023-01-07 14:10:41 -05:00
Anuken d8ecdff698 Merge remote-tracking branch 'origin/master' 2023-01-07 14:01:33 -05:00
Anuken 2a71f4620e Fixed #7962 2023-01-07 14:01:28 -05:00
Anuken 0b00747f29 Merge remote-tracking branch 'origin/master' 2023-01-07 13:53:07 -05:00
Anuken ae4a41cd0b Fixed #8042 2023-01-07 13:53:03 -05:00
Anuken d7d5ba7510 Fixed #8060 2023-01-07 13:44:34 -05:00
Anuken e846084942 Merge remote-tracking branch 'origin/master' 2023-01-07 13:42:48 -05:00
Anuken a15b887e5c Fixed #8011 2023-01-07 13:42:43 -05:00
Anuken c37ad9210a Merge remote-tracking branch 'origin/master' 2023-01-07 13:15:59 -05:00
Anuken 246591eab4 Fixed #8119 2023-01-07 13:15:56 -05:00
Anuken 54a9955e30 #8126 2023-01-07 12:44:29 -05:00
Anuken 49bcbafdaa Fixed #7946 2023-01-07 12:39:12 -05:00
Anuken b4137dca6e Fixed #7978 2023-01-07 12:37:37 -05:00
Anuken 98f869ecea Fixed #8086 / Fixed #8065 2023-01-07 12:15:37 -05:00
Anuken 0c9f2b2687 Fixed #8092 2023-01-07 12:06:57 -05:00
Anuken 4ec4e83823 Fixed #7932 2023-01-07 12:04:36 -05:00
Anuken 96477f7ff5 Merge remote-tracking branch 'origin/master' 2023-01-07 12:03:58 -05:00
Anuken 1236e8d342 Fixed #7922 2023-01-07 12:03:54 -05:00
Anuken 4d77a6d475 Merge remote-tracking branch 'origin/master' 2023-01-07 11:36:52 -05:00
Anuken 64a9377006 #8040 but better 2023-01-07 11:36:48 -05:00
Anuken c0b819ec9b Fixed #7952 2023-01-07 11:27:15 -05:00
Anuken 30e36d5640 Merge remote-tracking branch 'origin/master' 2023-01-07 11:24:02 -05:00
Anuken 0582ba1c47 Oct now has an octagon shield 2023-01-07 11:23:55 -05:00
Anuken 243c50be02 Faster entity removal 2022-12-14 16:58:58 -05:00
Anuken 7f292b14a7 Merge remote-tracking branch 'origin/master' 2022-11-13 13:26:23 -05:00
Anuken f7f3d5bde3 Revert hold time 2022-11-13 13:26:19 -05:00
Anuken 3a4a37cf0c Fixed mod version requirement text missing 2022-11-13 11:14:04 -05:00
Anuken 42af4e6b7e Merge remote-tracking branch 'origin/master' 2022-11-13 10:26:45 -05:00
Anuken f4e90bfb6b Crash fix 2022-11-13 10:26:40 -05:00
Anuken b422e041f4 Fixed #7906 2022-11-13 09:57:09 -05:00
Anuken 80046ba505 Fixed #7884 2022-11-13 09:53:18 -05:00
Anuken 7e0a6798be Merge remote-tracking branch 'origin/master' 2022-11-13 09:49:47 -05:00
Anuken afcb187c53 Fixed #7887 2022-11-13 09:49:42 -05:00
Anuken 4c51b97667 Fixed #7893 / Fixed #7902 2022-11-13 09:35:48 -05:00
Anuken 7d695784d1 Merge remote-tracking branch 'origin/master' 2022-11-11 15:08:42 -05:00
Anuken 59ca257cca Fixed #7874 2022-11-11 15:08:38 -05:00