Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,997 Commits 4 Branches 180 Tags
79ea2480cb82dce4fa7869968e6b4dc79d338eaf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anuken fd911539ee Merge remote-tracking branch 'origin/master' 2022-11-11 09:53:08 -05:00
Anuken 93fcd3ad21 Fixed fire rate % 2022-11-11 09:53:04 -05:00
Anuken edfc16c7b0 Fixed about dialog on mobile 2022-11-10 23:36:45 -05:00
Anuken fbadbb1d98 Fixed #7863 2022-11-10 23:07:57 -05:00
Anuken b021198893 Merge remote-tracking branch 'origin/master' 2022-11-10 22:45:13 -05:00
Anuken 619f2c86a4 Fixed iOS menu 2022-11-10 22:45:08 -05:00
Anuken 09f96b1477 Merge remote-tracking branch 'origin/master' 2022-11-10 19:00:39 -05:00
Anuken c0da3e6e9f fabric 2022-11-10 19:00:35 -05:00
Anuken 479cf85a3b Merge remote-tracking branch 'origin/master' 2022-11-10 18:56:39 -05:00
Anuken c3906ebae1 Merge remote-tracking branch 'origin/master' 2022-11-10 18:56:36 -05:00
Anuken 463afaafe8 wording 2022-11-10 18:56:26 -05:00
Anuken bc96077d73 Merge remote-tracking branch 'origin/master' 2022-11-10 17:16:55 -05:00
Anuken 255e15d14c Added some missing block descriptions 2022-11-10 17:16:50 -05:00
Anuken 2642ed358a Merge remote-tracking branch 'origin/master' 2022-11-10 16:37:54 -05:00
Anuken 642d27c163 Fixed missing block name 2022-11-10 16:37:50 -05:00
Anuken 05e4175a16 Merge remote-tracking branch 'origin/master' 2022-11-10 12:43:33 -05:00
Anuken f98c4cd820 No longer in beta 2022-11-10 12:43:29 -05:00
Anuken e198da53e4 Merge remote-tracking branch 'origin/master' 2022-11-10 12:15:55 -05:00
Anuken c1e783ba71 PayloadSource UnitCreateEvent 2022-11-10 12:15:51 -05:00
Anuken 5440ffcaf9 Merge remote-tracking branch 'origin/master' 2022-11-10 08:22:59 -05:00
Anuken 3fe38e8925 Better fix for #7854 2022-11-10 08:22:53 -05:00
Anuken 2e9026936e Less floating menu buttons 2022-11-09 14:05:22 -05:00
Anuken 1651dc520c Better inset borders for phones 2022-11-09 13:56:53 -05:00
Anuken ef526a6d83 Merge remote-tracking branch 'origin/master' 2022-11-09 13:29:17 -05:00
Anuken be72da71de map name 2022-11-09 13:29:13 -05:00
Anuken 37f1760a59 Renamed 'erekir waves map' 2022-11-09 08:45:11 -05:00
Anuken 8d255b3ccd Fixed #7852 2022-11-09 08:31:19 -05:00
Anuken 1842e9d139 Merge remote-tracking branch 'origin/master' 2022-11-09 08:30:01 -05:00
Anuken 8f7419db71 Fixed #7851 2022-11-09 08:29:53 -05:00
Anuken 56eb1a084c Revert "Fixing a mistake I made (#7788)" 
This reverts commit 3c7ddc8375.
 2022-11-09 08:29:32 -05:00
Anuken 52d2d25790 Merge remote-tracking branch 'origin/master' 2022-11-08 21:44:53 -05:00
Anuken c3d9a501c6 Campaign completion text in bundle 2022-11-08 21:44:47 -05:00
Anuken 464feaa80e Merge remote-tracking branch 'origin/master' 2022-11-08 16:52:18 -05:00
Anuken ddadbab74d Canvas block blending 2022-11-08 16:52:12 -05:00
Anuken 381197d58f Merge remote-tracking branch 'origin/master' 2022-11-07 15:07:36 -05:00
Anuken 09b65fddb8 Fixed #7841 2022-11-07 15:07:32 -05:00
Anuken 927566e038 Merge remote-tracking branch 'origin/master' 2022-11-07 11:27:11 -05:00
Anuken a329c4944b Fixed #7839 2022-11-07 11:27:07 -05:00