mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-11 07:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 4 Branches 160 Tags 2.1 GiB
a21f79ac6a
Commit Graph

10629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MEEP of Faith
a21f79ac6a
Draw size independent from puddle size. (#3826) 
* Draw size independent from puddle size.

* Apply change to Bullets
 2020-12-23 10:29:26 -05:00
Sunny Kim
986caa857e
public SettingsTables for mod settings (#4085) 2020-12-23 09:41:43 -05:00
Sunny Kim
1a14860b62
bump editor only blocks foward (#4084) 2020-12-23 09:40:00 -05:00
Patrick 'Quezler' Mounier
d144e9c91c
Allow plastanium conveyor to be unloaded (#4087) 2020-12-23 09:39:29 -05:00
Patrick 'Quezler' Mounier
9d740e1e37
Rebrand power infinite as power source (#4088) 2020-12-23 09:39:04 -05:00
Anuken
054e2337ff Merge remote-tracking branch 'origin/master' 2020-12-22 20:13:40 -05:00
Anuken
71488313e1 Fixed #4082 2020-12-22 20:13:34 -05:00
Anuken
a44f3c379f Ammo/shot display 2020-12-22 15:10:48 -05:00
Patrick 'Quezler' Mounier
e1125a38da
Update servers_be.json (#4081) 2020-12-22 14:14:17 -05:00
Anuken
f3d5cb315e Cleanup 2020-12-22 13:51:11 -05:00
Anuken
d3f99105b2 Merge remote-tracking branch 'origin/master' 2020-12-22 13:42:01 -05:00
Anuken
7f49f0c6fa Fixed #4079 2020-12-22 13:41:54 -05:00
Anuken
ceb298ca0b cleanup 2020-12-22 12:52:01 -05:00
VozDuh
0aaa77a5ea
Scrap Walls Textures Cleanup (#4074) 2020-12-22 11:31:24 -05:00
Sunny Kim
79d4925761
THIS WAS WHAT IT WAS ALL ALONG (#4069) 2020-12-22 11:30:09 -05:00
Anuken
7ea12e97ec Fixed #4073 2020-12-22 11:28:33 -05:00
Anuken
8521d5cd1b Merge remote-tracking branch 'origin/master' 2020-12-22 11:20:43 -05:00
Anuken
17177f87aa Fixed #4071 2020-12-22 11:20:35 -05:00
Anuken
24c71e49c7 cleanup 2020-12-22 10:48:11 -05:00
Skybbles
ac06fa8f96
update my github name (#4070) 
updating my name here since I changed my username
 2020-12-22 10:33:07 -05:00
Anuken
eda134a18c Merge remote-tracking branch 'origin/master' 2020-12-21 20:48:07 -05:00
Anuken
852013cd63 #4068 2020-12-21 20:48:00 -05:00
Sunny Kim
5b163d7843
Heat for accelerator (#4065) 
* heat

* better animations
 2020-12-21 20:04:04 -05:00
Anuken
806cea4b33 Added building damage to bullet stats 2020-12-21 16:55:04 -05:00
Anuken
952639a72e Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-21 13:10:00 -05:00
Anuken
e4e428f84a Fixed #4064 2020-12-21 13:09:08 -05:00
Patrick 'Quezler' Mounier
9a577adf5f
Makes Drill.drawMineItem default to true (#4057) 
* Update Blocks.java

* Update Drill.java
 2020-12-20 15:22:34 -05:00
Anuken
e3c68b485d Placement rendering cleanup 2020-12-20 14:28:14 -05:00
Anuken
75a4d2901f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-20 14:22:27 -05:00
Patrick 'Quezler' Mounier
bbdcef62e4
Draw item in the drill center when in place mode (#4055) 
* Draw item in the drill center when in place mode

* Update core/src/mindustry/world/blocks/production/Drill.java

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-12-20 14:22:14 -05:00
Patrick 'Quezler' Mounier
118ae8e87d
#3889 2: electric boogaloo (#4056) 2020-12-20 14:22:01 -05:00
Anuken
40a6a9e1c7 Comment cleanup 2020-12-20 12:04:36 -05:00
Patrick 'Quezler' Mounier
22221a0f28
Add in region to payload block icons (#4052) 2020-12-20 09:58:18 -05:00
Anuken
c39f4c1b7d Fixed #4051 2020-12-20 09:50:29 -05:00
Anuken
082b04a143 Merge remote-tracking branch 'origin/master' 2020-12-20 09:47:52 -05:00
Anuken
4f683cac8b Fixed #4054 2020-12-20 09:47:45 -05:00
YellOw139
0d2b660ed1
Ty po (#4046) 2020-12-19 14:01:50 -05:00
Anuken
f9fe396d1f Fixed #4044 2020-12-19 13:02:20 -05:00
Anuken
a4f4b9367f Tweaks of merged PR 2020-12-19 12:32:03 -05:00
키에르
09a84550f4
Ask double pop-ups to create a public server (#4042) 
* Double check public host dialog

* Update bundle.properties

* Update core/src/mindustry/ui/dialogs/HostDialog.java

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-12-19 12:31:26 -05:00
Anuken
9e05f7604d Fixed #4043 2020-12-19 12:28:56 -05:00
Anuken
e5982faf35 Merge remote-tracking branch 'origin/master' 2020-12-18 20:39:23 -05:00
Anuken
7f863abb06 Hide map when opening planet map 2020-12-18 20:39:16 -05:00
Volas171
b328d098a1
add minty server but this time the json is all right (#4034) 2020-12-18 19:16:59 -05:00
Anuken
0dd3c2cb5a Fixed #4033 2020-12-18 17:22:01 -05:00
Anuken
9d9cbdffd5 Pulsar nerf 2020-12-18 16:33:43 -05:00
Anuken
8d43590657 Multiblock damage calculation bugfix 2020-12-18 14:56:14 -05:00
Anuken
6783069f95 Merge remote-tracking branch 'origin/master' 2020-12-18 13:36:22 -05:00
Anuken
b33b3a7919 Always-on weather rule support 2020-12-18 13:36:18 -05:00
Anuken
b0bf80d8b7 Cleanup 2020-12-18 13:21:51 -05:00