Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,186 Commits 4 Branches 180 Tags
e699e199ea78955ce51eaf9caa8fac34d219e58a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken e699e199ea Merge remote-tracking branch 'origin/master' 2022-09-02 08:35:00 -04:00
Anuken ceb5c832bd Fixed armored duct blending 2022-09-02 08:34:53 -04:00
Anuken b854b0ca22 Better item selection UI 2022-09-01 17:49:29 -04:00
Anuken 61295bc89c Slightly longer data timeout 2022-09-01 16:49:17 -04:00
Anuken bc1ff011af parens 2022-09-01 10:49:41 -04:00
Anuken d216f3920d Merge remote-tracking branch 'origin/master' 2022-09-01 08:57:51 -04:00
Anuken 2d47ff893b Misc fixes 2022-09-01 08:57:43 -04:00
Anuken 56856c8166 Merge remote-tracking branch 'origin/master' 2022-09-01 08:46:36 -04:00
Anuken 5ecd73bdb0 Fixed #7495 2022-09-01 08:46:31 -04:00
Anuken 920cedb334 Merge remote-tracking branch 'origin/master' 2022-08-31 08:08:13 -04:00
Anuken fb24953dc2 Added support for non-reactive liquids 2022-08-31 08:08:07 -04:00
Anuken 8f4251db3a Merge remote-tracking branch 'origin/master' 2022-08-30 21:17:44 -04:00
Anuken 4cd78aad91 Fixed #7484 2022-08-30 21:17:39 -04:00
Anuken 2f6ef4cefe Merge remote-tracking branch 'origin/master' 2022-08-29 18:57:27 -04:00
Anuken 55c54b34f9 Fixed #7477 2022-08-29 18:57:20 -04:00
Anuken 0d3c27dd59 Minor bundle tweaks 2022-08-29 14:26:29 -04:00
Anuken e4fe73b332 Minor balance tweak 2022-08-29 13:40:15 -04:00
Anuken d7abd35c97 Merge remote-tracking branch 'origin/master' 2022-08-29 13:37:54 -04:00
Anuken 07781f685d Heat wording changing 2022-08-29 13:37:49 -04:00
Anuken 74697a389c Updated bundles with new descriptions 2022-08-29 12:23:44 -04:00
Anuken d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Anuken cef63bae3a Merge remote-tracking branch 'origin/master' 2022-08-28 16:08:15 -04:00
Anuken d5b34f0b73 Fixed #7469 2022-08-28 16:08:09 -04:00
Anuken 2f45bb596b Merge remote-tracking branch 'origin/master' 2022-08-27 19:46:00 -04:00
Anuken ff3a1c23c2 Removed unmerged PR leftovers for now 2022-08-27 19:45:56 -04:00
Anuken 8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken 2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
Anuken 82bb4607db Fixed basin spawn timer 2022-08-25 19:47:55 -04:00
Anuken 3f8d4c5459 Merge remote-tracking branch 'origin/master' 2022-08-25 15:09:26 -04:00
Anuken 8dca512b37 Minor sound tweaks 2022-08-25 15:09:21 -04:00
Anuken 276a59b874 Fixed #7441 2022-08-25 00:49:11 -04:00
Anuken 7a8155965a Merge remote-tracking branch 'origin/master' 2022-08-24 22:08:15 -04:00
Anuken 550d76e372 Minor shockwave tower buff 2022-08-24 22:08:10 -04:00
Anuken 3f4ae7fed3 Merge remote-tracking branch 'origin/master' 2022-08-24 13:47:48 -04:00
Anuken 69a7354468 Names for hidden Neoplasm units 2022-08-24 13:47:42 -04:00
Anuken eb01f0ed4a Unit descriptions + Cleanup (Based on #7066) 2022-08-24 10:38:15 -04:00
Anuken e284be8be4 Fixed #7438 2022-08-24 10:27:49 -04:00
Anuken 1dc910afe9 Merge remote-tracking branch 'origin/master' 2022-08-23 09:10:20 -04:00
Anuken ebf2094950 LaserTurret sound fix 2022-08-23 09:10:15 -04:00
AnukenandGitHub d2894a14a0 Update servers_v7.json 2022-08-23 08:09:29 -04:00
Anuken b3e94c8425 Merge remote-tracking branch 'origin/master' 2022-08-22 22:06:45 -04:00
Anuken 976f9f43f6 Slightly better titan shoot SFX 2022-08-22 22:06:40 -04:00
Anuken a2798ae53c Robovm upgrade 2022-08-22 15:36:24 -04:00
Anuken 400a6a28c1 Fixed #7417 2022-08-22 14:39:08 -04:00
Anuken 4f8add37fd Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-22 13:45:37 -04:00
Anuken fcb99103dd Erekir unit SFX 2022-08-22 13:45:35 -04:00
Anuken 39d215e148 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-22 10:27:52 -04:00
Anuken 450dd90862 Drill/factory/generator noises 2022-08-22 10:27:49 -04:00
Anuken 57c07b7ebb More turret SFX 2022-08-21 23:53:07 -04:00
Anuken f88ff59d49 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-21 20:44:12 -04:00
Anuken 2c28b206b8 Erekir turret SFX (of varying quality) 2022-08-21 20:44:07 -04:00
Anuken ae83779253 Merge remote-tracking branch 'origin/master' 2022-08-20 11:54:54 -04:00
Anuken c97a6b2f39 Fixed #7403 2022-08-20 11:54:49 -04:00
Anuken b9e633a10e Merge remote-tracking branch 'origin/master' 2022-08-19 20:08:12 -04:00
Anuken a8900d28f9 Fixed #7401 2022-08-19 20:08:08 -04:00
Anuken 34674f2297 Merge remote-tracking branch 'origin/master' 2022-08-18 12:25:57 -04:00
Anuken 153b00fe40 Fixed #7390 2022-08-18 12:25:52 -04:00
Anuken ddc637eee6 Merge remote-tracking branch 'origin/master' 2022-08-17 10:34:39 -04:00
Anuken 43fae3b9e3 Fixed #7382 2022-08-17 10:34:34 -04:00
Anuken b29b1bbda6 Merge remote-tracking branch 'origin/master' 2022-08-16 09:13:27 -04:00
Anuken a7f939de4c Misc balance 2022-08-16 09:13:22 -04:00
Anuken f9ba1c3e04 Merge remote-tracking branch 'origin/master' 2022-08-16 07:24:00 -04:00
Anuken a8b8028835 Hide Erekir resources on Serpulo loadout 2022-08-16 07:23:55 -04:00
Anuken ec8e48f3f5 Metaglass cyclone buff 2022-08-15 17:14:14 -04:00
Anuken b88b5fa32a Merge remote-tracking branch 'origin/master' 2022-08-14 15:40:01 -04:00
Anuken f15a620c45 Allow neoplasm on water/arkycite/etc 2022-08-14 15:39:56 -04:00
Anuken 1f318306a7 Merge remote-tracking branch 'origin/master' 2022-08-13 10:56:24 -04:00
Anuken dbabb07528 Gradle 7.5.1 2022-08-13 10:56:19 -04:00
Anuken 8cac2939b3 Merge remote-tracking branch 'origin/master' 2022-08-11 12:06:18 -04:00
Anuken 06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Anuken 1a85c85a22 Fixed assembler module input edge sprite 2022-08-11 10:44:11 -04:00
Anuken e4c6822cca JSON payload stack support 2022-08-11 08:43:58 -04:00
Anuken 5f3439d38c Merge remote-tracking branch 'origin/master' 2022-08-09 09:11:16 -04:00
Anuken 6e11418fa4 Fixed #7331 2022-08-09 09:11:11 -04:00
Anuken bae64cb98a Median error fix 2022-08-08 17:34:46 -04:00
Anuken 469a49b3d6 Cleanup 2022-08-08 14:27:10 -04:00
Anuken fae3360dfc Fixed #7327 2022-08-08 14:05:01 -04:00
Anuken 94d13267e8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-07 22:54:30 -04:00
Anuken 01c3738275 Misc cleanup 2022-08-07 22:54:05 -04:00
Anuken a28601d91c Interplanetary accelerator beta info text 2022-08-06 17:31:21 -04:00
Anuken 39ebc046ad Fixed objectives dialog scaling 2022-08-06 14:06:24 -04:00
Anuken ecdedf383a Merge remote-tracking branch 'origin/master' 2022-08-06 13:38:35 -04:00
Anuken 32f3190762 Less stacking in objectives dialog 2022-08-06 13:38:31 -04:00
AnukenandGitHub 0c4d9d89bf Update bug_report.md 2022-08-06 13:31:45 -04:00
Anuken 9d1c03ccd9 Merge remote-tracking branch 'origin/master' 2022-08-06 13:30:52 -04:00
Anuken 45e5ab8ecc Fixed #7310 2022-08-06 13:30:47 -04:00
Anuken e9eb713a39 Fixed #7309 2022-08-06 00:12:34 -04:00
Anuken a833bb09fe Merge remote-tracking branch 'origin/master' 2022-08-05 16:27:28 -04:00
Anuken 36ce1ea2af Faster beryllium drilling with burst drills 2022-08-05 16:27:23 -04:00
Anuken 6a5d7da4ae Fixed #7303 / Fixed #7302 2022-08-05 14:25:37 -04:00
Anuken 8b6d3a67f3 Fixed #7299 2022-08-05 09:39:45 -04:00
Anuken 0f831d598d Fixed #7296 2022-08-05 09:35:04 -04:00
Anuken 11d3b1d973 Fixed #7292 2022-08-04 20:20:46 -04:00
Anuken 62d0d62d22 Fixed squished pump liquid icon 2022-08-04 18:45:51 -04:00
Anuken f9c73c2fdc Merge remote-tracking branch 'origin/master' 2022-08-04 18:43:42 -04:00
Anuken bf926d139d Fixed akrycite output 2022-08-04 18:43:38 -04:00
Anuken 12b255d443 Merge remote-tracking branch 'origin/master' 2022-08-04 13:49:26 -04:00
Anuken 1bb45fe91c Minor bugfixes/cleanup 2022-08-04 13:49:22 -04:00
Anuken 46f8838d1a Fixed #7284 2022-08-04 10:23:49 -04:00
Anuken 1d8166669b Fixed #7283 2022-08-04 10:14:13 -04:00