mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-15 03:11:07 -07:00
Code Issues Projects Releases Wiki Activity
10599 commits 4 branches 180 tags 2.3 GiB
Commit graph

10599 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Patrick 'Quezler' Mounier
abcd27184d
Update Drill.java (#4030) 2020-12-18 13:08:03 -05:00
Anuken
5de2c0c512 Merge remote-tracking branch 'origin/master' 2020-12-18 12:41:23 -05:00
Anuken
bd25294096 Generic node/bridge placement system 2020-12-18 12:41:13 -05:00
Ilya246
a8bae56b2c
fix comment (#4026) 2020-12-18 09:44:15 -05:00
Anuken
d80678dfeb arc 2020-12-18 09:43:17 -05:00
Anuken
a4f9518d1e testing winMM 2020-12-18 09:42:57 -05:00
Anuken
6815f3305f Better bridge linking 2020-12-17 18:35:50 -05:00
Anuken
0cc3340bd6 Fixed texture packer Gradle dependencies 2020-12-17 14:37:13 -05:00
Anuken
8da18984d2 Removed redundant Block#isVisible code 2020-12-17 12:38:22 -05:00
Patrick 'Quezler' Mounier
056afa572e
Allow hidden blocks to be revealed by plugins (#4017) 
* Add revealedBlocks rule

(1/2)

* Use revealedBlocks rule

(2/2)
 2020-12-17 12:37:47 -05:00
Anuken
9f5183b36f Building cleanup 2020-12-17 11:38:03 -05:00
Anuken
0d81681af5 Merge remote-tracking branch 'origin/master' 2020-12-17 10:46:53 -05:00
Anuken
4b1554db54 arc 2020-12-17 10:46:49 -05:00
Charlotte Vixen
c58289dd47
added conduit color indications (#4015) 2020-12-17 10:20:29 -05:00
Patrick 'Quezler' Mounier
cfd67bb1fc
Fix sprite packing typo (#4016) 2020-12-17 10:15:58 -05:00
rMuchan
9a777f3ce5
fix health calculation in background sectors (#4011) 2020-12-17 10:09:28 -05:00
Anuken
b8efed9eaf Better space skybox scaling 2020-12-16 19:52:10 -05:00
Anuken
cd7d2163b9 Merge remote-tracking branch 'origin/master' 2020-12-16 19:47:43 -05:00
Anuken
59c85a486f Fixed phase deflect achievement 2020-12-16 19:47:40 -05:00
DeltaNedas
8bc349b68c
add @commanded for units (#3870) 2020-12-16 19:42:48 -05:00
Angel_24
b12cac7b30
Update bundle_es.properties (#4002) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Tweaks from a newer pull request

Added changes based on the Frankz30's Pull request: [ https://github.com/Anuken/Mindustry/pull/3879#issue-534932998 ]

* Added translations for wheather graphics and report bugs options
 2020-12-16 19:41:07 -05:00
Thomas Widyantoko
bd85d1d7ca
update in_ID translation (#4003) 
* update in_ID translation

* weather graphics setting

suggestion from Discord
 2020-12-16 19:40:52 -05:00
Xelo
9a88426ff7
raw strings for SurfaceShaders (#4004) 
* SurfaceShaders thing

* Update core/src/mindustry/graphics/Shaders.java

spacing fix

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* star import

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
 2020-12-16 19:39:08 -05:00
Anuken
d0bf3d6fa1 Merge remote-tracking branch 'origin/master' 2020-12-16 19:33:36 -05:00
Anuken
bc2c7be45d Fixed #4010 2020-12-16 19:33:29 -05:00
DeltaNedas
74a7dc5eb9
allow mods to set zoom limits (#4006) 
* allow mods to set zoom limits

* rounding

* dont round min

* zoom 1.5 -> 1
 2020-12-16 16:41:08 -05:00
Anuken
3db04da20a Payload tweaks 2020-12-16 13:35:55 -05:00
Anuken
d0cba1aff2 Code cleanup 2020-12-16 10:39:28 -05:00
Anuken
4ad234ad75 Merge remote-tracking branch 'origin/master' 2020-12-16 09:28:11 -05:00
Anuken
e6717b37ce Fixed #4000 2020-12-16 09:28:06 -05:00