Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,862 Commits 4 Branches 180 Tags
b422e041f48b3003f2a42ef2201c2bf9d03f4b81
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anuken ce36b750e3 Merge remote-tracking branch 'origin/master' 2022-11-07 08:43:26 -05:00
Anuken e0021f3714 Fixed #7837 2022-11-07 08:43:22 -05:00
Anuken 83be0116c6 Merge remote-tracking branch 'origin/master' 2022-11-06 13:38:44 -05:00
Anuken 3a0b1a6cf5 Fixed missile unit DPS calculation 2022-11-06 13:38:38 -05:00
Anuken dc2a68573b Fixed #7829 2022-11-05 15:03:57 -04:00
Anuken 8bba2459f2 Fixed #7826 2022-11-05 08:56:44 -04:00
Anuken 3390c08d44 Merge remote-tracking branch 'origin/master' 2022-11-05 08:36:10 -04:00
Anuken 0b7156ce13 Fixed #7827 2022-11-05 08:36:06 -04:00
Anuken bd0085a701 Merge remote-tracking branch 'origin/master' 2022-11-04 17:28:32 -04:00
Anuken a3afb7c726 Fixed #7821 2022-11-04 17:28:28 -04:00
Anuken f9d7c172c4 Possible minimap fog update fix for servers 2022-11-04 15:14:06 -04:00
Anuken 13d726108b Fixed #7818 2022-11-04 11:23:02 -04:00
Anuken 07a1c6c2c4 Merge remote-tracking branch 'origin/master' 2022-11-04 08:59:29 -04:00
Anuken 9f0a1d863e Fixed #7815 2022-11-04 08:59:24 -04:00
Anuken 4e5bc8fc94 Rebuild select hint 2022-11-03 12:11:35 -04:00
Anuken 4a6791ab43 Merge remote-tracking branch 'origin/master' 2022-11-03 11:39:16 -04:00
Anuken 3a142507d1 redundant log 2022-11-03 11:39:11 -04:00
Anuken b8e245f945 Tested and fixed Steam achievements 2022-11-03 11:37:37 -04:00
Anuken b1be360180 Merge remote-tracking branch 'origin/master' 2022-11-03 09:08:53 -04:00
Anuken 679e6bd27b Removed screenshots from game data export 2022-11-03 09:08:49 -04:00
Anuken 7e0a6b985c Fixed #7804 / Fixed #7803 2022-11-03 08:57:15 -04:00
Anuken d1f7fce7f9 Merge remote-tracking branch 'origin/master' 2022-11-03 08:45:13 -04:00
Anuken cef2778d43 Fixed #7803 2022-11-03 08:45:07 -04:00
Anuken ebb37f4abe Fixed ability descriptions 2022-11-02 10:01:43 -04:00
Anuken 696d5e77ca Merge remote-tracking branch 'origin/master' 2022-11-02 08:37:16 -04:00
Anuken 74839a7f8d Fixed #7801 2022-11-02 08:37:11 -04:00
Anuken 3e6c54069d Merge remote-tracking branch 'origin/master' 2022-11-01 16:28:30 -04:00
Anuken 34a83de3cf Misc fixes 2022-11-01 16:28:24 -04:00
Anuken ff115ee376 Heat icon 2022-11-01 10:57:41 -04:00
Anuken 5a44bf6023 Merge remote-tracking branch 'origin/master' 2022-11-01 08:47:05 -04:00
Anuken 7f37b97861 Removed serverPaused 2022-11-01 08:47:00 -04:00
Anuken bc2664994e Fixed #7793 2022-11-01 07:53:47 -04:00
Anuken aef18b8696 Fixed #7795 2022-11-01 07:52:24 -04:00
Anuken 4aae1d7c9e Merge remote-tracking branch 'origin/master' 2022-11-01 02:00:11 -04:00
Anuken 8b13298468 Desc typo fix 2022-11-01 02:00:07 -04:00
Anuken 9d343057c6 Fixed #7790 2022-11-01 01:59:00 -04:00
Anuken 68bde6f900 Don't show 'waiting for players' when not paused 2022-11-01 01:49:20 -04:00
Anuken 240c234e88 Fixed #7791 2022-11-01 01:45:05 -04:00
Anuken ac5cec5cf2 Fixed menus pausing in multiplayer 2022-11-01 01:43:42 -04:00
Anuken b75b04fcf6 Minor bugfixes 2022-11-01 01:39:27 -04:00
Anuken 9afcc6fd32 Minor bugfixes 2022-11-01 01:19:56 -04:00
Anuken d9624d274f Fixed client pausing when not being able to 2022-11-01 00:10:07 -04:00
Anuken 1dfd0f7e18 Pausing on client fix 2022-10-31 22:54:48 -04:00
Anuken b8619292d1 Multiplayer pausing as host works now 2022-10-31 20:24:38 -04:00
Anuken 6aeeb23d7c Experimental multiplayer pausing variable 2022-10-31 20:19:39 -04:00
Anuken e3d7acc556 Show world processors in darkness in editor mode 2022-10-31 17:51:34 -04:00
Anuken 2e42071c92 Faster constructors 2022-10-31 08:57:32 -04:00
Anuken e23245940a Merge remote-tracking branch 'origin/master' 2022-10-31 00:09:51 -04:00
Anuken 8ddf0bbd02 WIP campaign complete dialog 2022-10-31 00:09:46 -04:00
Anuken b11344e59e Merge remote-tracking branch 'origin/master' 2022-10-30 17:17:38 -04:00
Anuken c1021af132 Fixed key conflict 2022-10-30 17:17:35 -04:00
Anuken 8459e68cfa Added rebuild region key on desktop 2022-10-30 16:46:36 -04:00
Anuken 65f1780dcc Merge remote-tracking branch 'origin/master' 2022-10-30 15:10:27 -04:00
Anuken 8c0f50acb6 Support for selecting multiple buildings to command 2022-10-30 15:10:23 -04:00
Anuken 6e3332823e Merge remote-tracking branch 'origin/master' 2022-10-30 14:52:16 -04:00