Commit Graph

7739 Commits

Author SHA1 Message Date
Leonwang4234
24d295a924 add infinitepierce + bugfixes 2020-10-12 17:57:00 -07:00
Anuken
06877b457e Rule selection fixes 2020-10-12 15:59:22 -04:00
Felix Corvus
7564f93445 Merge branch 'master' into master 2020-10-12 22:11:18 +03:00
Anuken
fde1881fd5 Merge remote-tracking branch 'origin/master' 2020-10-12 14:33:29 -04:00
Anuken
876534bd26 Wave balancing & AI tweaks 2020-10-12 14:33:22 -04:00
Anuken
fbda1fb7cf Merge pull request #2863 from MEEPofFaith/patch-2
If units can have `chargeSound`, why not `chargeTurret`s too?
2020-10-12 10:40:50 -04:00
Vanguard
e2403b96e6 3 changed lines
indev.popup
block.silicon-smelter.description
block.alloy-smelter.description
2020-10-12 17:38:56 +03:00
Summet
2a1ce6109e Дацитовый валун (#23) 2020-10-12 17:25:13 +03:00
Vanguard
eec7408b0e 3 lines added; 1 line changed
Added:
wave.guardianwarn
wave.guardianwarn.one
lastaccessed

Changed:
block.silicon-smelter.description
2020-10-12 17:08:57 +03:00
Anuken
f10c5c1ca8 Merge remote-tracking branch 'origin/master' 2020-10-12 10:06:41 -04:00
Anuken
378e81cd90 Fixed #2917 2020-10-12 10:06:34 -04:00
Wiki Updater
08629bb7f7 add bundle entry for dacit boulder 2020-10-12 10:49:41 +02:00
Leonwang4234
7f5561f037 add... 2020-10-11 17:03:48 -07:00
Anuken
66ecf96be2 Merge pull request #2904 from Quezler/patch-52
Make deconstructing scrap walls return scrap
2020-10-11 19:11:52 -04:00
Anuken
6807b589a3 Logic unit control tweaks 2020-10-11 19:10:33 -04:00
MEEP of Faith
7662174dc4 oki doki 2020-10-11 12:58:50 -07:00
Anuken
ee50995dde Removed "sector attacked" message 2020-10-11 14:54:05 -04:00
Anuken
2f6f205dc7 Better builder detection for ConstructBlock 2020-10-11 14:20:53 -04:00
Anuken
f1ec26f82b Correct logic control position rendering 2020-10-11 14:10:55 -04:00
Anuken
7df575e76a Merge remote-tracking branch 'origin/master' 2020-10-11 14:05:19 -04:00
Anuken
af54de894c Balancing / LogicAI sync 2020-10-11 14:05:16 -04:00
YellOw139
8ed6f1e3a8 Updates until commit 3fe79531a6 2020-10-11 21:01:37 +03:00
Summet
4f258b54c5 Fix Vars.loops declaration 2020-10-11 20:47:04 +03:00
Anuken
ad2bda8ec1 Better sector gen 2020-10-11 13:33:02 -04:00
Felix Corvus
6d436ce680 избегаем потенциальных проблем 2020-10-11 19:18:28 +03:00
Summet
504d29ca54 Подключения узлов
* Подключения узлов 

* Подключения -> Подключений
2020-10-11 19:10:02 +03:00
Anuken
f12379ee07 Fixed #2910 2020-10-11 11:55:45 -04:00
Anuken
3fe79531a6 Added message for last accessed player of block 2020-10-11 11:47:22 -04:00
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