mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 18:05:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,724 Commits 4 Branches 160 Tags 2.3 GiB
add3fd9fb3
Commit Graph

9095 Commits

Author SHA1 Message Date
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
71488313e1 Fixed #4082 2020-12-22 20:13:34 -05:00
Anuken
a44f3c379f Ammo/shot display 2020-12-22 15:10:48 -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
7f863abb06 Hide map when opening planet map 2020-12-18 20:39:16 -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
a4f9518d1e testing winMM 2020-12-18 09:42:57 -05:00
Anuken
91692f362f Mod browser cleanup 2020-12-17 21:17:55 -05:00
Anuken
6815f3305f Better bridge linking 2020-12-17 18:35:50 -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
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
Amaoto Inochi
15116ca384
fix the wrong unit ai path of mod content parser (#3998) 2020-12-15 19:55:31 -05:00
Anuken
446dd6abe5 Consistent water bullet drag 2020-12-15 19:25:23 -05:00
Anuken
ff254d4fdf Fixed #3997 2020-12-15 19:09:33 -05:00
Anuken
eaa5e6f5a1 Increased foreshadow coolant multiplier 2020-12-15 18:39:44 -05:00
Anuken
b90f51224c Fixed #3996 2020-12-15 18:07:15 -05:00
Anuken
47e321f57d Removed atlas outputs 2020-12-15 15:24:09 -05:00
Anuken
6ab96e2787 Fixed #3987 2020-12-15 14:15:06 -05:00
Anuken
659c481c83 cleanup 2020-12-15 11:15:39 -05:00
Anuken
a18e1854ab Null checks & cleanup of upgrade pathing 2020-12-15 10:58:03 -05:00
Anuken
6c67dc1266 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-15 10:52:38 -05:00
Slava0135
0c581c520f
Conveyor upgrade system (#3912) 
* conveyor/conduit upgrading system

* style
 2020-12-15 10:52:20 -05:00
Anuken
c6c18696c0 Cleanup 2020-12-15 10:28:12 -05:00
Anuken
8a5bd7571e 121.3 2020-12-14 22:55:58 -05:00
Anuken
ff93c21269 Merge remote-tracking branch 'origin/master' 2020-12-14 16:31:01 -05:00
Anuken
cec1eb5608 Fixed jitpack build error 2020-12-14 13:42:48 -05:00
Anuken
16f7a8e9d2 Merge remote-tracking branch 'origin/master' 2020-12-14 13:29:59 -05:00
Anuken
f4d0dfd0da Less junction capacity (again) 2020-12-14 10:36:37 -05:00
Skat
aee5d46dfa
Code formatting (#3904) 2020-12-13 23:56:13 -05:00
Sharlotte
5223a89bf1
Update bundle_ko.properties (#3953) 
fix some miss-translation
add translated values
 2020-12-13 23:47:00 -05:00
YellOw139
5b11dbc085
[Bundle][RO] Translation Update (#3957) 
This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 98c4ee6e74
- Typo fixes & various other improvements
 2020-12-13 23:46:50 -05:00
GamyGamer
df1f8b8bb4
Update bundle_pl.properties (#3964) 
Added missing lines and fixed typo
 2020-12-13 23:46:39 -05:00
DeltaNedas
ffa7256e5a
add ContentInitEvent (#3951) 
* add ContentInit(ialized)Event

* a

* a
 2020-12-13 23:43:27 -05:00
Anuken
bbf84185cc Fixed #3973 2020-12-13 23:40:06 -05:00
Anuken
901c23f295 Fixed #3969 2020-12-13 18:01:22 -05:00
Anuken
e25f0c6ae2
Merge pull request #3967 from DeltaNedas/version 
disallow descriptions after mod version
 2020-12-13 16:26:23 -05:00
Anuken
484b480076 Fixed #3968 2020-12-13 16:25:36 -05:00
DeltaNedas
926497ba77 disallow descriptions after mod version 2020-12-13 19:30:21 +00:00
Anuken
ddd9f2259c Fixed #3960 2020-12-13 10:27:44 -05:00
Anuken
d6546a38c0 #3830 2020-12-12 18:49:24 -05:00
Karl-Robert Ernst
4aebba0a0c fix units aiming sidewards missing their aim 2020-12-12 22:11:19 +01:00