mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-09 10:18:40 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,392 Commits 4 Branches 160 Tags 2.3 GiB
07ff2de2a2
Commit Graph

5445 Commits

Author SHA1 Message Date
Anuken
e81438a7a9 Styles documented 2022-05-04 22:31:53 -04:00
Anuken
93d299716c WIP style refactoring 2022-05-04 20:24:59 -04:00
Anuken
705b419799 Removed some unused content 2022-05-04 17:02:05 -04:00
Anuken
c28db45c4b Assembler module block stuff 2022-05-04 16:55:27 -04:00
Anuken
22905de094 Cleanup of some GL stuff 2022-05-04 15:25:39 -04:00
Anuken
771c2270df Phase tech tree fix 2022-05-04 00:57:00 -04:00
Anuken
7640fa0bf0 Misc cleanup & target/hit movements 2022-05-03 20:39:54 -04:00
Anuken
8b9eb0b466 Cleanup 2022-05-03 15:27:30 -04:00
Anuken
a784d184aa Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-03 14:42:15 -04:00
Anuken
210481703f Lots of balancing/tweaks 2022-05-03 14:42:11 -04:00
Epowerj
bc1de34296 Tweaked objectives for level 1 2022-05-03 14:41:49 -04:00
Anuken
459428ef25 Crash fix, begin rebalancing 2022-05-03 11:23:24 -04:00
Anuken
6c3eb3fe1e Delta fix 2022-05-02 22:41:37 -04:00
Anuken
78f3e23f0b WIP bullet shotgun for T4 tank 2022-05-02 22:24:45 -04:00
Anuken
de9a41159f Discord link in desktop menu 2022-05-02 19:41:43 -04:00
Anuken
61d145e233 Advanced reconstructor in tech tree 2022-05-02 19:26:21 -04:00
Anuken
6553ff9e56 diffuse in tech tree 2022-05-02 18:54:39 -04:00
Anuken
02eec0e43c Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-05-02 18:53:15 -04:00
Anuken
98b01953a4 Diffuse turret 2022-05-02 18:53:12 -04:00
Epowerj
fce48cd92e Changed reinforcedLiquidRouter requirements to use graphite instead of tungsten 2022-05-02 17:54:20 -04:00
Anuken
068c0dbe4d Walker in tech tree 2022-05-02 17:51:40 -04:00
Anuken
4d54b8251d Map rename 2022-05-02 16:33:41 -04:00
Anuken
3542bd9e90 T3 tank done 2022-05-02 15:37:43 -04:00
Anuken
5f0ef9b27e WIP T3 tank 2022-05-02 14:29:32 -04:00
Anuken
1d249f233f UnitType docs 2022-05-01 23:50:49 -04:00
Anuken
f85fba264a Fixed crawler targeting 2022-05-01 17:45:36 -04:00
Anuken
865a5d56ed Two units complete 2022-05-01 14:49:30 -04:00
Anuken
41a8be1b29 Hover unit thingy done 2022-05-01 10:14:55 -04:00
Anuken
8ea9c094ab Unit repair tower sprite/effects 2022-04-30 23:24:28 -04:00
Anuken
25208d0797 Hover unit stuff 2022-04-30 23:00:35 -04:00
Anuken
f833a4e1bb Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-30 21:11:20 -04:00
Anuken
512fbe0199 T1 walker thing done 2022-04-30 21:11:17 -04:00
Epowerj
5e7bd82f39 Start working on fourth map's objectives 2022-04-30 20:15:29 -04:00
Anuken
59be28b5eb Time to begin adding the new units 2022-04-30 18:08:40 -04:00
Anuken
fe62e1b6e3 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-30 09:02:51 -04:00
Anuken
79ffe22b7f Build consistency tweaks 2022-04-30 09:02:45 -04:00
Epowerj
045d59fedf Start working on fourth map's objectives 2022-04-30 02:45:20 -04:00
Anuken
2dd8cb01ec fixed router update 2022-04-29 22:10:40 -04:00
Anuken
c61e058231 fine 2022-04-29 21:44:46 -04:00
Anuken
b696e1c89a Radar only on Erekir 2022-04-29 18:38:58 -04:00
Anuken
712fa95e88 File chooser bracket escape 2022-04-29 16:48:01 -04:00
Anuken
dcb51ca73f Misc balance/bugfixing 2022-04-29 14:59:57 -04:00
Epowerj
ffdd04a278 Changed time before nuke to 8 minutes 2022-04-29 12:53:52 -04:00
Anuken
db7e567832 All stat stuff converted to non-enums 2022-04-29 12:10:49 -04:00
Anuken
a2d4363c9f Slower enemy build speed in map3 2022-04-29 11:33:05 -04:00
Anuken
e3c1b7ba30 Better objective indicators for 3rd map 2022-04-29 10:08:50 -04:00
Anuken
636f464f95 Logic cutscene fix 2022-04-28 22:30:43 -04:00
Anuken
a46cc17d38 Nuke cutscene 2022-04-28 22:05:46 -04:00
Anuken
6e04c70b16 Better nuke announcement 2022-04-28 19:57:21 -04:00
Anuken
9f501a33a3 Many misc bugfixes 2022-04-28 19:46:52 -04:00
Anuken
60c74ee65d Map tweaks, etc 2022-04-28 19:20:31 -04:00
Anuken
6c42dff884 Bugfixes 2022-04-28 18:25:39 -04:00
Anuken
969b70d512 cost tweaks 2022-04-28 18:07:19 -04:00
Anuken
2d488e9614 Tech tree/balance tweaks 2022-04-28 17:47:56 -04:00
Anuken
c2452e2370 Misc 2022-04-28 17:34:18 -04:00
Anuken
512e409417 Less turret HP 2022-04-28 17:23:54 -04:00
Anuken
7e665d376e Bugfixes 2022-04-28 17:09:34 -04:00
Anuken
5ddd394214 Map/cost tweaks 2022-04-28 15:31:51 -04:00
Anuken
1fae8f20af Reconstructor cost tweaks, part 2 2022-04-28 15:17:07 -04:00
Anuken
6ffb3b61d8 Reconstructor cost tweaks 2022-04-28 15:13:40 -04:00
Epowerj
6d615bf641 Bundled nuclear launch text 2022-04-28 14:56:39 -04:00
Anuken
293311087d Fixed destroyblocks objective 2022-04-28 14:52:51 -04:00
Anuken
fe4b32be1f Color tweak 2022-04-28 14:51:38 -04:00
Anuken
90a2f00041 Nuke launch format string 2022-04-28 14:51:20 -04:00
Epowerj
668b6aa563 Tweaked tech tree for level 3 2022-04-28 14:44:19 -04:00
Anuken
e92e307431 Minor fixes 2022-04-28 12:21:19 -04:00
Anuken
ee23886666 Better bullet aiming 2022-04-28 10:49:29 -04:00
Anuken
d40fcc10ab Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-27 23:14:21 -04:00
Anuken
1075e4b1b7 Mod subtitles 2022-04-27 23:14:14 -04:00
Epowerj
f8316a71cd Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-27 20:34:41 -04:00
Epowerj
0f6e0044bd Tweaks and objectives for level three 2022-04-27 20:34:33 -04:00
Anuken
f892811ac3 More shieldbreaker health 2022-04-27 18:16:46 -04:00
Anuken
3d12b66f3c DestroyBlocksObjective 2022-04-27 16:37:38 -04:00
Anuken
fa92c7ed3e Fixed crash 2022-04-27 14:18:53 -04:00
Anuken
8ab584c33b Save fixes 2022-04-27 13:37:26 -04:00
Anuken
8d39ba69ee Fixed logic finding invalid units 2022-04-27 12:56:33 -04:00
Anuken
2f4a6fc235 Crash fix 2022-04-27 12:54:32 -04:00
Anuken
9b8098f731 Added flag for killable units 2022-04-27 11:17:01 -04:00
Anuken
1ee8687d94 Sublimate nerf 2022-04-26 17:26:25 -04:00
Anuken
1b884c1a5c Unit artillery fix 2022-04-26 15:30:06 -04:00
Anuken
b3ec8745d2 Multiplayer fixes 2022-04-26 15:23:38 -04:00
Anuken
b03fe2c86c Skip overriding non-existent sprites 2022-04-26 12:03:18 -04:00
Anuken
42781bd754 Many misc bugfixes 2022-04-26 10:13:33 -04:00
Anuken
8f5b3ee1e0 Removed destruction delay when core is destroyed 2022-04-26 09:41:25 -04:00
Anuken
f6e0c0ce11 Better bloom 2022-04-26 00:19:14 -04:00
Anuken
aab6c3a9df Spawn wave instruction 2022-04-25 18:52:33 -04:00
Anuken
1ac7317986 Bloom config options 2022-04-25 10:53:18 -04:00
Anuken
eb880ba2be Fixed low-FPS continuous bullets 2022-04-24 23:12:28 -04:00
Anuken
1d74011c3e Better continuous laser bullet visuals (2) 2022-04-24 22:57:50 -04:00
Anuken
9251ba6008 Better continuous laser bullet visuals 2022-04-24 22:49:36 -04:00
Anuken
d5e522994e Configurable RTS AI parameters for logic 2022-04-24 16:46:26 -04:00
Anuken
abdb1c1252 "Hugging" fix for RTS AI 2022-04-24 14:11:21 -04:00
Anuken
03a469e56f malis team swap 2022-04-24 13:24:14 -04:00
Anuken
14dcd71819 Faction color changes again 2022-04-24 12:50:33 -04:00
Anuken
fa8b94722e Second map polish 2022-04-23 14:57:52 -04:00
Anuken
43aeb90eb9 Min attack weight rule 2022-04-23 12:26:59 -04:00
Anuken
7b496b610e Revert "Cullable LogicCanvas (#6699)" 
This reverts commit 815a396fbd.
 2022-04-23 11:33:06 -04:00
Anuken
12eb2dec4e Fog rule 2022-04-23 11:32:39 -04:00
Anuken
8b8ca85d96 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-23 09:26:57 -04:00
Anuken
9a05b36478 Minor bullet despawn fix 2022-04-23 09:26:52 -04:00
Epowerj
fbd6fb61f5 Tweaked level two 2022-04-22 20:42:09 -04:00
Anuken
d559cd2412 Better timed destroy with overlap 2022-04-22 20:22:09 -04:00
Anuken
764b1c27bf Configurable min squad size 2022-04-22 17:46:47 -04:00
Anuken
520d80a96b Minimap marker support 2022-04-22 15:45:27 -04:00
Anuken
76d7a31b65 Fixed electrolyzer 2022-04-22 15:33:34 -04:00
Anuken
5a6d1787c5 Better timer objective formatting 2022-04-22 15:05:23 -04:00
Epowerj
2d025b43ed Lots of tweaks after testing second map 2022-04-22 14:52:08 -04:00
Anuken
eb12c64f07 Fixed "waiting for players" 2022-04-22 14:30:09 -04:00
Anuken
8212d441c2 Fixed autobuilding 2022-04-22 13:17:42 -04:00
Anuken
1133283e0e Bullet hit position snap 2022-04-21 23:22:32 -04:00
Anuken
2bed4b25eb sprite for T2 ship 2022-04-21 21:36:49 -04:00
Anuken
209e71255b Block type fetching 2022-04-21 18:25:52 -04:00
Anuken
45a0f3c588 Proper shield breaker 2022-04-21 14:39:30 -04:00
Anuken
09221f952a Shield breaker block 2022-04-21 14:34:01 -04:00
Anuken
bfdf07d0eb Fixed override issue 2022-04-21 11:10:36 -04:00
Anuken
e5f8eb3a30 Burst drill stat fix 2022-04-21 11:06:42 -04:00
Anuken
34ba60d526 Made turrets ignore passable buildings 2022-04-20 14:27:23 -04:00
Anuken
b40957e28b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/JoinDialog.java
 2022-04-20 14:16:20 -04:00
Qendolin
2dae8fdef4
Use sprites instead of polygons (#6725) 
Lines.circle is quite expensive and used for some minor effects. This has been changed to use sprites in certain places.
 2022-04-20 14:15:35 -04:00
Anuken
f1c6b6f949 Launch sector description 2022-04-20 14:15:23 -04:00
Anuken
6441d0b2d5 Log atlas utilization 2022-04-20 10:38:57 -04:00
Anuken
c883fbdb81 Slightly more accurate unit payloads 2022-04-19 21:32:43 -04:00
Anuken
6d7f8a1123 Added map objective button 2022-04-19 19:00:22 -04:00
Anuken
be9d3b334c Minor wording changes 2022-04-19 17:15:29 -04:00
Anuken
81acc5285c Better mod unit packing 2022-04-19 16:51:43 -04:00
Epowerj
56c02faedc Finished first level enemy base 2022-04-19 16:36:24 -04:00
Anuken
415402e61b Better mod sprite packing 2022-04-19 12:21:54 -04:00
Anuken
a74c5ef943 Minor bugfixes 2022-04-19 09:14:56 -04:00
Anuken
78c44bf237 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-18 22:43:48 -04:00
Anuken
1fc983bd4e Duct transparent color tweak 2022-04-18 22:43:44 -04:00
Epowerj
569aaf1156 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-18 22:19:07 -04:00
Epowerj
261aa45d07 Finished overall objectives and scripting for first map 2022-04-18 22:19:02 -04:00
Anuken
41865631ed Polish 2022-04-18 22:07:18 -04:00
Anuken
7fd470c1cb New insectoid almost done + DestroyBlockObjective 2022-04-18 21:37:48 -04:00
Anuken
4f9999c700 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-18 21:34:24 -04:00
Anuken
5b4e424cda New insectoid almost done + DestroyBlockObjective 2022-04-18 21:34:21 -04:00
Epowerj
cdb7a4c9d8 Some small tweaks on first level 2022-04-18 21:32:41 -04:00
Anuken
5721cc75b6 Mod load fixes 2022-04-18 17:22:47 -04:00
Anuken
e9205482e7 WIP t2 insect 2022-04-18 12:28:59 -04:00
Anuken
5d8fb01710 Removed something pointless 2022-04-18 00:02:22 -04:00
Anuken
1e9a21023f Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-17 21:23:58 -04:00
Anuken
cce1d1ac8f Fixed last-planet clearing 2022-04-17 21:23:54 -04:00
Epowerj
2350175373 Updated map logic and research cost for first map 2022-04-17 21:23:39 -04:00
Anuken
dded736c8f Flag set instruction fix 2022-04-17 21:05:50 -04:00
Epowerj
68e6b7ff3e Updated and tweaked everything for first map 2022-04-17 21:04:26 -04:00
Epowerj
a3b54f7bdb Updated objectives for the now-first level, and changed the map itself 2022-04-17 20:51:00 -04:00
Anuken
9ea891bf64 Timer objective text 2022-04-17 20:31:49 -04:00
Anuken
854dbacd14 Timer objective 2022-04-17 20:22:45 -04:00
Anuken
f21f649387 Fixed privileged blocks being "built" on landing 2022-04-17 20:06:08 -04:00
Anuken
224b1b022a Better team building presence check 2022-04-17 19:59:36 -04:00
Anuken
eb299f5ec7 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-17 19:33:17 -04:00
Anuken
a69595ee4e Fixed naval pathfinding somehow 2022-04-17 19:33:11 -04:00
Epowerj
287e7b478c Updated objectives for the now-first level 2022-04-17 19:19:09 -04:00
Anuken
9af256fffa Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-17 19:13:32 -04:00
Anuken
8364a6ac78 Destroy units objective, WIP 2022-04-17 19:13:29 -04:00
Epowerj
37525861a7 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-17 18:58:39 -04:00
Epowerj
50c173e95d Updated objectives for the now-first level 2022-04-17 18:58:33 -04:00
Anuken
d1cf1e2aba Avoid caching paths on servers 2022-04-17 18:53:28 -04:00
Anuken
42c14ecfbb Mouse position option 2022-04-17 17:55:33 -04:00
Anuken
b5b4edcb67 Misc polish stuff 2022-04-17 17:12:01 -04:00
Anuken
95c34996af Minor workshop fixes 2022-04-17 11:08:51 -04:00
Anuken
495250850e Custom Config support / Corrupt crux 2022-04-17 10:21:44 -04:00
Anuken
2014d066e5 Less aggressive AI pursuit 2022-04-15 19:26:12 -04:00
Anuken
9def4b8d88 FlagObjective 2022-04-15 14:25:24 -04:00
Anuken
f533aae887 SetFlag instruction 2022-04-15 12:46:20 -04:00
Anuken
e1e29c1da7 Merge branch '7.0-features' of https://github.com/Anuken/MindustryPrivate into 7.0-features 2022-04-15 12:42:54 -04:00
Anuken
78e95844dc Fixed WorldLoadEvent being fired on startup 2022-04-15 12:42:50 -04:00
Epowerj
8a19663e54 tweaked second map's objectives 2022-04-15 00:28:56 -04:00
Anuken
193ec10c56 Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2022-04-14 21:17:48 -04:00
Anuken
35f2aad595 Tech tree fix / Objective text fix 2022-04-14 21:17:43 -04:00
Epowerj
87fad5d00f Added objectives to second map 2022-04-14 21:04:14 -04:00
Anuken
01b77f86c9 Fixed wall thorium being mine-able 2022-04-14 17:20:53 -04:00
Anuken
037d028465 Label localization support 2022-04-14 17:01:06 -04:00
Anuken
29810c0445 Make sure objectives aren't modified in editor 2022-04-14 16:47:09 -04:00
Anuken
0f3fc92746 Objective flag system 2022-04-14 16:23:39 -04:00
Anuken
efd30809e8 Tutorial marker fix 2022-04-14 12:30:54 -04:00
Anuken
bf0df3997c Fixed indents 2022-04-14 02:19:58 -04:00
Epowerj
729aa6e20e Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-13 22:09:57 -04:00
Epowerj
a33a432c33 Added more objectives to onset 2022-04-13 22:09:51 -04:00
Anuken
ea4600beb3 Better MultiEffect 2022-04-13 21:35:26 -04:00
Epowerj
2f6ff1d22c Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-13 21:34:49 -04:00
Epowerj
1dd5db7e57 Fixed issue with tutorial and finished the rest of objectives 2022-04-13 21:32:07 -04:00
Anuken
48762ed9d2 No hints / Fixed floor caching bug 2022-04-13 21:07:16 -04:00
Epowerj
9dbfa03af9 Added more tutorial text to the first level 2022-04-13 20:43:07 -04:00
Epowerj
2ae91befae Added more tutorial text to the first level 2022-04-13 19:11:16 -04:00
Anuken
4b5d833c74 Centralized executor 2022-04-13 17:38:18 -04:00
Anuken
c01348af29 Objective details 2022-04-13 16:51:11 -04:00
Anuken
693482df83 Added most necessary objectives 2022-04-13 15:32:33 -04:00
Anuken
2a8c4b51d4 Objectives 2022-04-13 15:09:49 -04:00
Anuken
da4c54b734 Place objective 2022-04-13 12:56:57 -04:00
Anuken
d5c4f862e7 Fixed Serpulo-placeable blocks on Erekir 2022-04-13 09:44:58 -04:00
Anuken
41a3dae138 Objective cleanup 2022-04-12 23:52:24 -04:00
Anuken
0902a675db More objective stuff 2022-04-12 13:28:22 -04:00
Anuken
c5d89ea6bf WIP objective system 2022-04-12 11:53:34 -04:00
Anuken
a4ba1ed340 WIP map objective system 2022-04-11 23:59:38 -04:00
Anuken
5e65e250c3 Fixed laser underBullet 2022-04-11 16:32:37 -04:00
Anuken
123e62d275 Second map fixes 2022-04-11 15:35:02 -04:00
Anuken
e2abc055a2 Better target priority + underBullets for pierce 2022-04-11 15:11:10 -04:00
Anuken
ea9e5ae632 Better heal FX / Lower wall priority 2022-04-11 14:01:00 -04:00
Anuken
12eddd131b underBullet for ducts and related blocks 2022-04-11 13:06:39 -04:00