Commit Graph

7709 Commits

Author SHA1 Message Date
Anuken
e11a8565d0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java
2020-10-11 10:51:46 -04:00
Anuken
3d99e38f10 Sector simplification 2020-10-11 10:51:33 -04:00
Anuken
cc051dd787 Merge pull request #2905 from DeltaNedas/uinames
add names to lots of ui elements
2020-10-11 10:36:18 -04:00
DeltaNedas
0f2c38b0c0 oh no 2020-10-11 15:28:50 +01:00
Anuken
d9aa1f765d Merge pull request #2906 from Quezler/patch-53
Visualize maximum amount of power node wires
2020-10-11 10:19:58 -04:00
Anuken
62baf5cab2 Update core/src/mindustry/world/blocks/power/PowerNode.java
Co-authored-by: Patrick 'Quezler' Mounier <patrick@queztech.net>
2020-10-11 09:24:27 -04:00
Anuken
65d9978fa1 Fixed #2901 / Fixed #2903 2020-10-11 09:02:20 -04:00
Patrick 'Quezler' Mounier
6d632fc532 Update bundle.properties 2020-10-11 14:59:44 +02:00
Patrick 'Quezler' Mounier
a975da543b Add a connections bar to powernodes
Bundle entry in next commit.
2020-10-11 14:58:53 +02:00
Vanguard
ec8708067b 1 new line
editor.center
2020-10-11 14:59:05 +03:00
DeltaNedas
5eb8a87528 h 2020-10-11 12:59:00 +01:00
DeltaNedas
1539d86846 add names to some major dialog elements 2020-10-11 12:57:18 +01:00
DeltaNedas
a60ae3a060 add names to major fragment elements 2020-10-11 12:56:55 +01:00
Patrick 'Quezler' Mounier
eaf7a86bce Make deconstructing scrap walls return scrap 2020-10-11 13:54:28 +02:00
MEEP of Faith
5600f96a37 Make the sound pitch not random. 2020-10-10 18:03:53 -07:00
Anuken
bcb248907c Campaign core item incineration + better idle gen 2020-10-10 19:02:47 -04:00
Anuken
ab772d4901 fewer destruction turns 2020-10-10 17:31:16 -04:00
Anuken
7bcecea539 Merge remote-tracking branch 'origin/master' 2020-10-10 17:09:22 -04:00
Anuken
4d889cd8d1 Weather fixes 2020-10-10 17:09:19 -04:00
Anuken
a3e42b28bd Merge pull request #2821 from summetdev/schems-description
Descriptions for schematics.
2020-10-10 16:22:00 -04:00
Anuken
c2202a0173 Bugfixes 2020-10-10 15:50:03 -04:00
Anuken
316e6e298c Fixed #2896 2020-10-10 14:55:21 -04:00
Anuken
8482221c83 . 2020-10-10 14:47:59 -04:00
summetdev
d94fdfa50f don't show desc at schem save 2020-10-10 20:28:43 +03:00
Anuken
2079a91ac6 Merge remote-tracking branch 'origin/master' 2020-10-10 13:16:03 -04:00
Anuken
d61ad8d2ef Fixed #2895 2020-10-10 13:15:59 -04:00
Patrick 'Quezler' Mounier
f2bd4bf38c Who needs two pairs of legs? 2020-10-10 18:35:00 +02:00
Anuken
837a8cecb3 Wave balancing & other tweaks 2020-10-10 12:26:57 -04:00
Anuken
3f74c61c0a Map center button 2020-10-10 12:05:11 -04:00
Anuken
63bf066cff Merge remote-tracking branch 'origin/master' 2020-10-10 11:38:05 -04:00
Anuken
fb831e8fef Better cliff sprites 2020-10-10 11:37:58 -04:00
Pietro303HD
2e4cbdcc05 Update bundle_pt_BR.properties 2020-10-10 09:51:23 -03:00
DeltaNedas
4b9659d4fa thank you quezler 2020-10-10 12:23:08 +01:00
DeltaNedas
fd71e159d3 make storageblock instantiable 2020-10-10 11:16:04 +01:00
Anuken
5a31d419fc Bugfixes 2020-10-09 19:10:16 -04:00
Summet
be1cc21ff5 Протекает меньше -> Не протекает (#21) 2020-10-10 01:04:31 +03:00
Anuken
7639f8102f Bugfixes 2020-10-09 15:34:25 -04:00
Anuken
7da400608c Bugfixes 2020-10-09 15:18:13 -04:00
Anuken
81633dace4 Merge remote-tracking branch 'origin/master' 2020-10-09 13:52:15 -04:00
Anuken
c78088ab5f Harder default waves 2020-10-09 13:52:07 -04:00
Patrick 'Quezler' Mounier
d776744905 Update leak behaviour in plated conduit description 2020-10-09 19:11:56 +02:00
Anuken
96656bac6b Bugfixes 2020-10-09 12:59:59 -04:00
Anuken
99539bbab0 Merge remote-tracking branch 'origin/master' 2020-10-09 10:02:12 -04:00
Anuken
22f1c3b2d1 Bugfixes 2020-10-09 10:02:08 -04:00
Anuken
1d34b8474b Merge pull request #2877 from genNAowl/pierce-cap
Adds a Pierce Cap Variable
2020-10-09 09:59:53 -04:00
Patrick 'Quezler' Mounier
ae9093bfd6 Update ArmoredConduit.java 2020-10-09 10:10:50 +02:00
Patrick 'Quezler' Mounier
f3473e78b4 Update Conduit.java 2020-10-09 10:10:34 +02:00
Patrick 'Quezler' Mounier
1672c70c99 Update BuildingComp.java 2020-10-09 10:07:56 +02:00
Leonwang4234
e73a813d69 prevent from breaking other things 2020-10-08 19:27:01 -07:00
Leonwang4234
af5fd4551c true it is 2020-10-08 19:18:53 -07:00