Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,387 Commits 4 Branches 180 Tags
277291ce09ec88adeb31c6c218c71607fbb3f56e
Commit Graph

10880 Commits

Author SHA1 Message Date
Anuken
06bacab710 Crash fix 2023-11-12 21:55:16 -05:00
Anuken
84eb35ec83 Merge remote-tracking branch 'origin/master' 2023-11-12 09:49:12 -05:00
Anuken
8282a1e1bb Fixed #9269 2023-11-12 09:49:07 -05:00
ApsZoldat
c4dc095adb Minor ban/unban instruction and join dialog changes (#9249) 
* Make PlacementFragment update after world processor's ban/unban instructions, add buttons in community server list to add server as remote

* Small world processor ban/unban optimization
 2023-11-11 09:55:01 -05:00
Anuken
9bf23bfcc8 Fixed #9260 2023-11-10 02:00:15 -05:00
Anuken
66b8a6f939 Reverted fix for #9257 2023-11-08 10:12:35 -05:00
Anuken
bc6434bb64 Merge remote-tracking branch 'origin/master' 2023-11-08 09:02:27 -05:00
Anuken
7f805f1712 Fixed #9257 2023-11-08 09:02:20 -05:00
Gerald Elder-Vass
498bf079ec Move Surge Alloy in ErekirTechTree to the correct position (#9253) 
Surge Alloy can be first obtained on the "Ravine" map.
Thorium can be first obtained on the "Caldera" map.
The "Ravine" map must be unlocked and completed before the "Caldera" map can be accessed.
Since Surge Alloy isn't required to produce Thorium (and vice versa), they should appear at the same level of the tech tree, under Tungsten.

Signed-off-by: Gerald Elder-Vass <geraldev@hotmail.co.uk>
 2023-11-07 22:44:22 -05:00
ApsZoldat
6dff68e7d9 Texture marker implementation 2023-11-07 22:42:42 +03:00
Anuken
884482e9b6 Fixed #9248 2023-11-06 13:29:40 -05:00
Anuken
c0ed5b48f7 Fixed #9247 2023-11-06 08:59:33 -05:00
Anuken
cdb6e3f85b Merge remote-tracking branch 'origin/master' 2023-11-04 17:38:56 -04:00
Anuken
6b2229ffb9 Fixed #9239 2023-11-04 17:38:50 -04:00
Ilya246
b4f01742cc overdrivable meltdown (#9234) 2023-11-04 10:56:24 -04:00
ErosAa2
e02bb988c6 Slight adjusment (#9231) 2023-11-04 09:12:21 -04:00
Anuken
318ff1b5ad Merge remote-tracking branch 'origin/master' 2023-11-03 18:56:10 -04:00
Anuken
2aaa861755 Fixed #9224 2023-11-03 18:56:02 -04:00
Ilya246
b3cddb0d82 uncap fsh shield damage (#9230) 2023-11-03 11:19:49 -04:00
Anuken
f606589173 Merge remote-tracking branch 'origin/master' 2023-11-02 22:46:22 -04:00
Anuken
5b5c5d0365 Fixed off-by-one team sprite in editor 2023-11-02 22:46:15 -04:00
ErosAa2
7b686d56a8 Scepter buff (#9226) 
* Update UnitTypes.java

* Update UnitTypes.java

* nevermind
 2023-11-02 09:01:59 -04:00
Ilya246
6014f2353a foreshadow overhaul (#9223) 
* overhaul foreshadow

* whar ?
 2023-11-02 08:58:26 -04:00
Anuken
9c10a09438 Simplification 2023-11-01 12:23:48 -04:00
Anuken
67e35af718 Fixed #8917 2023-10-31 23:59:34 -04:00
Anuken
5fe4b9a36c alignment, comments 2023-10-31 12:38:55 -04:00
Anuken
1d051b5c16 Add setProp of speed/armor 2023-10-31 12:20:18 -04:00
Anuken
e5047d752d Added dynamic status for custom speed/health/etc 2023-10-31 11:24:03 -04:00
Anuken
968fa2f9b1 Derelict repair rule 2023-10-30 21:01:04 -04:00
Anuken
db60fcd64d Fixed #9216 2023-10-30 09:45:48 -04:00
Anuken
55684e8b98 Ignore .git in mods 2023-10-30 09:13:55 -04:00
Anuken
a0a0b5942e Fixed #9208 2023-10-28 09:29:28 -04:00
Anuken
212adddd53 Fixed some blocks not being mobile rotate-able 2023-10-27 18:42:25 -04:00
Anuken
ef7ee5fdfe Fixed #9195 2023-10-23 11:34:54 -04:00
Anuken
da32780a38 Merge remote-tracking branch 'origin/master' 2023-10-23 11:18:08 -04:00
Anuken
3229c1e7b7 Derelict block click repair 2023-10-23 11:18:01 -04:00
Mythril382
4f701a7063 useUnitCap fun (#9187) 
* a

* aaaaa

* aaaaaaaaaaaa

* AAAAAAAAAAAAAAAAAAAAAAA

* *inhales*

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* *inhales*

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* *inhales*

* aaaa

* AAAAAAAÆEEEEEEEEEEEEEEEE

* anyways im stupid

* *exhales*

* Update core/src/mindustry/world/blocks/units/Reconstructor.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2023-10-22 09:14:52 -04:00
Anuken
471c8728a0 Let units without weapons patrol 2023-10-21 23:04:12 -04:00
Anuken
3c6fc363f3 Fixed load block command not arriving on target 2023-10-21 15:18:57 -04:00
Anuken
e391434dc9 Unit enter payload command 2023-10-20 01:48:11 -04:00
Anuken
69462eb3f0 Merge remote-tracking branch 'origin/master' 2023-10-19 22:02:41 -04:00
Anuken
ed7f00f48a Load/unload command icon swap 2023-10-19 22:02:34 -04:00
MEEPofFaith
2522b16738 SoundEffect - An Effect that produces sound when created. (#9178) 
* SoundEffect

* Add to ClassMap

* Loading via prov does not work

* MEEP, that's not how you random
 2023-10-19 13:55:04 -04:00
Anuken
b0f449371e Merge remote-tracking branch 'origin/master' 2023-10-15 09:52:07 -04:00
Anuken
d01294d35c Fixed #9166 2023-10-15 09:52:02 -04:00
WayZer
a6d0a17bd9 PR: world-switch (#9167) 2023-10-14 09:09:59 -04:00
Anuken
74844a6fa9 Fixed #9156 2023-10-13 02:15:05 -04:00
Anuken
4ea8199f83 Json support for UnlockableContent fields 2023-10-13 00:38:53 -04:00
Anuken
19b4f871c2 ShootSummon empty constructor 2023-10-08 13:00:45 -04:00
Anuken
3ae016e8ab Merge remote-tracking branch 'origin/master' 2023-10-07 13:18:06 -04:00