mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 04:44:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,454 Commits 4 Branches 160 Tags 2.3 GiB
60621520ee
Commit Graph

13454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
61bb4d2dac Breach turret done / DrawTurret & reload fixes 2021-12-03 12:28:13 -05:00
Anuken
9c9d147b95 TeamEntry class implementation 2021-12-03 10:28:34 -05:00
alex
adb03c465b
add v7 servers for alex servers (#6393) 
* Update v6 servers for alex servers

* Update servers_v7.json

alex v7 server
 2021-12-02 19:24:44 -05:00
Anuken
8168d8a3be Testing waves 2021-12-02 18:33:33 -05:00
Anuken
2b416588f1 Pyro generator tree entry 2021-12-02 17:37:18 -05:00
Anuken
4e181d715f Pyrolysis generator + generation tweaks 2021-12-02 17:00:49 -05:00
Matthew (or Maya) Peng
5ea4688e88
get by name (#6396) 2021-12-02 15:43:31 -05:00
Anuken
fff492d89d Erekir generation improvements 2021-12-02 13:25:43 -05:00
Anuken
f754dd1373 Un-cursed standard core shading 2021-12-02 09:57:49 -05:00
Anuken
b6988e631e arkycite floor + fixes 2021-12-01 22:38:21 -05:00
Anuken
585affeeee chemical combustion chamber 2021-12-01 19:31:59 -05:00
Anuken
99488e7c8d Duct blend fix / Duct autobridge 2021-12-01 16:01:49 -05:00
Anuken
a31ddb7fa1 Turbine condenser output display 2021-12-01 14:32:51 -05:00
Anuken
773dba8aca Hide illuminator 2021-12-01 14:25:43 -05:00
Anuken
0b6eda2ac8 Plasma bore beryllium support 2021-12-01 13:58:09 -05:00
Anuken
3f503a7f4d Bugfixes 2021-12-01 13:50:08 -05:00
Anuken
e30d090a2e arkycite recolor 2021-11-30 22:52:33 -05:00
Anuken
b3dd7f4b8b WIP arkycite 2021-11-30 18:13:34 -05:00
Matthew (or Maya) Peng
8cb830ba41
Make MoveLightningAbility alternating a boolean (#6390) 
* Revert "BlueWolf does not want MoveLightningAbility to mirror (#6376)"

This reverts commit e1685ef46c.

* boolean `alternate`

* Better Javadoc description
 2021-11-29 23:05:35 -05:00
Matthew (or Maya) Peng
3819e327e9
Grammar (#6383) 
* Grammar

* English is a terrible language
 2021-11-29 21:15:15 -05:00
Anuken
51fe07daef Backported EnumSet changes 2021-11-29 20:15:13 -05:00
Anuken
dc0904a6c7 Merge remote-tracking branch 'origin/master' 2021-11-29 20:14:05 -05:00
Anuken
feba9d677e Fixed #6389 2021-11-29 20:13:59 -05:00
Anuken
a0b7d96f67 Cargo tech tree entry 2021-11-29 20:12:43 -05:00
Anuken
6483d924af Unit cargo transport system 2021-11-29 20:06:49 -05:00
smol
582f05fa33
Fix a single pixel in Fuse's sprite (#6387) 
* Create m

* Delete m

* Add files via upload
 2021-11-29 12:23:16 -05:00
Anuken
635027bb81 Save unit variables in processors 2021-11-29 10:57:42 -05:00
Anuken
ea6d794c36 Fixd unit tests 2021-11-29 10:04:28 -05:00
Anuken
e2576f1538 Persistent unit IDs 2021-11-29 10:02:03 -05:00
Darkness#3729
061357e1df
Reserved 5000 port for a new gamemode (#6385) 
👀
 2021-11-29 09:46:45 -05:00
Anuken
117fd3769e Fixed ConsumeLiquids dependencies 2021-11-28 20:57:47 -05:00
Anuken
68e0b0e27e Initial Erekir tech tree 2021-11-28 20:51:26 -05:00
Anuken
30e2d52341 Massive TechTree system cleanup 2021-11-28 13:48:06 -05:00
Anuken
c1477e1f2f WIP erekir tech tree 2021-11-27 18:23:41 -05:00
Anuken
d7eb76d4b2 arc 2021-11-27 14:07:02 -05:00
Anuken
5446b7c6f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-11-27 14:06:57 -05:00
Anuken
bc296728f9 Erekir thorium + Minor visual tweaks 2021-11-27 13:10:10 -05:00
Anuken
a24c15117d Cyanogen synthesis retexture 2021-11-27 12:17:45 -05:00
Anuken
0aa85163d2 weird liquid animations 2021-11-26 22:48:51 -05:00
Anuken
77b3a83826 WIP animated gas 2021-11-26 21:35:58 -05:00
buthed010203
c055407249
Fix editor camera panning (#6380) 
VSync being disabled will make the camera move unbearably fast currently as it isnt tied to frame time.
 2021-11-26 13:45:27 -05:00
Matthew (or Maya) Peng
e1685ef46c
BlueWolf does not want MoveLightningAbility to mirror (#6376) 2021-11-26 11:05:50 -05:00
Anuken
22564de3c8 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-11-25 18:54:49 -05:00
Anuken
ce065f0324 arc 2021-11-25 18:54:46 -05:00
Anuken
616fa8748f DrawRegion spinSprite 2021-11-25 18:54:35 -05:00
router
4eca2b4b0b
Make updateInUnits description actually readable (#6371) 2021-11-25 15:33:21 -05:00
Anuken
f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
Anuken
04b1ba31a9 Fixed #6370 2021-11-25 13:29:35 -05:00
Anuken
57e0f5ba3f Merge remote-tracking branch 'private/7.0-features' into 7.0-features 2021-11-25 13:29:19 -05:00
Anuken
d6fa71ba92 Scuttler disabled for now 2021-11-25 13:29:14 -05:00