mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,070 Commits 4 Branches 160 Tags 2.3 GiB
875d40a34b
Commit Graph

11847 Commits

Author SHA1 Message Date
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
9c46ae8b0f sprite update 2022-04-21 23:49:47 -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
Epowerj
30100b4e7c Replaced two with a new map 2022-04-21 21:01:51 -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
YozoZChomutova
ee3911cceb
Updated bundle_cs.properties (#6716) 
* Updated bundle_cs.properties

All unstraslated words I've found were translated. Spacing between lines were synchronized with bundle.properties. +Added self to contributors file.

* Updated bundle_cs.properties

Replaced with shorters words, fixing issue with multilined text in buttons.
 2022-04-20 10:48:13 -04:00
Anuken
6441d0b2d5 Log atlas utilization 2022-04-20 10:38:57 -04:00
bendn
471dbd8bab
impact reactor fix(only) (#6718) 2022-04-20 10:33:32 -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
0915598d64 sfgdhjk 2022-04-18 22:14:33 -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
5e349e237a Fast pack 2022-04-18 16:58:50 -04:00
Anuken
e9205482e7 WIP t2 insect 2022-04-18 12:28:59 -04:00
Tegas Aziz
c7ace935aa
[ID] Desolate rift description change (#6720) 
* Desolate rift description change

* skill issue
 2022-04-18 09:26:52 -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
5256e27b84 Replaced first map with second 2022-04-17 17:49:45 -04:00
Epowerj
e0721aeb58 Begin reworking second map 2022-04-17 17:46:54 -04:00
Anuken
b5b4edcb67 Misc polish stuff 2022-04-17 17:12:01 -04:00
notrealn
c95ee5e8d5
Change desolate rift description (#6684) 
It says "leave as soon as possible", which does not really make sense anymore.
 2022-04-17 12:37:36 -04:00
TheMrAlbert
0d13a608d5
Another in_ID bundles update (#6685) 
Another parity update

Co-authored-by: TheMrAlbert <TheMrAlbert@users.noreply.github.com>
 2022-04-17 11:23:13 -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
bendn
ac5d8fa5fd
fix 8 (#6712) 2022-04-16 09:38:08 -04:00
Даркнесс#3729
f5085280e5
Some fixes in bundle (#6706) 2022-04-16 09:27:19 -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
08f0e20714 Started working on serpulo testing map 2022-04-14 21:13:27 -04:00
Epowerj
bd020eea53 Updated two map for objectives 2022-04-14 21:13:13 -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
Epowerj
8bd0ac8c27 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 2022-04-14 16:23:55 -04:00
Epowerj
6d49b834cb Removed tungsten from the first enemy base on the second map 2022-04-14 16:23:49 -04:00
Anuken
0f3fc92746 Objective flag system 2022-04-14 16:23:39 -04:00
end-me-please
cfafc9cc8a
Update bundle_de.properties (#6708) 2022-04-14 12:48:50 -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