mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 16:09:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,233 Commits 4 Branches 160 Tags 2.3 GiB
6983577b20
Commit Graph

7874 Commits

Author SHA1 Message Date
YellOw139
2ff6630e23
Bumped up a couple of commits 2020-10-18 05:39:38 +03:00
Anuken
521d44714d Disabled spawnpoints during ongoing attack maps 2020-10-17 19:49:13 -04:00
Anuken
4ab0c8a1ca Merge remote-tracking branch 'origin/master' 2020-10-17 18:37:57 -04:00
Anuken
7349af4753 Various small tweaks 2020-10-17 18:37:54 -04:00
Anuken
55a8ae083b
Merge pull request #2992 from DeltaNedas/planetdraw 
allow modded planets to customize drawing
 2020-10-17 17:56:12 -04:00
Anuken
e9131b4631 Minor payload acceptor fixes 2020-10-17 17:05:34 -04:00
Anuken
5d9beb4c28 Fixed #2582 2020-10-17 14:37:51 -04:00
Anuken
a47432c20b Merge remote-tracking branch 'origin/master' 2020-10-17 13:03:03 -04:00
Anuken
8043c09e2b Breaking logic change: Coordinates are now tile-based 2020-10-17 13:02:57 -04:00
DeltaNedas
091593c84d
Merge branch 'master' into planetdraw 2020-10-17 16:59:28 +00:00
Anuken
1324e75eea
Merge pull request #2996 from DeltaNedas/universe 
add universe draw events
 2020-10-17 12:52:26 -04:00
Anuken
c99873c823 Added bool to enable editor cliff button 2020-10-17 11:02:48 -04:00
DeltaNedas
ef2bf2e129 add universeDraw event 2020-10-17 15:38:12 +01:00
Anuken
46ec457819 Cleanup 2020-10-17 10:37:28 -04:00
DeltaNedas
35a86a1aac add universe draw events 2020-10-17 15:34:00 +01:00
Anuken
3a7ee50db3 Merge remote-tracking branch 'origin/master' 2020-10-17 10:10:34 -04:00
Anuken
be394c4b33 Checks to prevent uncaptureable sectors 2020-10-17 10:10:29 -04:00
Anuken
41dcf7a6f2
Merge pull request #2817 from ThePythonGuy3/patch-7 
Some typo fixes and various stuff for spanish bundle.
 2020-10-17 09:19:05 -04:00
Anuken
c3d0819cc1 Fixed #2988 2020-10-17 09:17:16 -04:00
DeltaNedas
8e0c5023c9 hh 2020-10-17 12:28:46 +01:00
DeltaNedas
54b0d308be h 2020-10-17 12:16:47 +01:00
DeltaNedas
05b77d787e hide orbits of hidden planets 2020-10-17 12:10:52 +01:00
Anuken
962d0729d6 Merge remote-tracking branch 'origin/master' 2020-10-16 20:09:55 -04:00
Anuken
fc1b03f322 Various tweaks 2020-10-16 20:09:48 -04:00
Anuken
91b4fb1c97
Merge pull request #2979 from DeltaNedas/planet 
PlanetGrid stuff
 2020-10-16 19:46:05 -04:00
DeltaNedas
0fa947bfaa make calc stuff pkg private again 2020-10-16 23:22:39 +01:00
DeltaNedas
060152fc29 make calc stuff pkg private again 2020-10-16 23:06:46 +01:00
DeltaNedas
97b0461d7f allow modded planets to customize drawing 2020-10-16 23:00:06 +01:00
DeltaNedas
fd54c66726 make ptile/edge/corner mutable 2020-10-16 22:26:50 +01:00
Anuken
e00daffe6d Bugfixes 2020-10-16 15:27:30 -04:00
DeltaNedas
bddcdc0aa2 make planet stuff public, constructor protected 2020-10-16 19:57:13 +01:00
Anuken
1fbced0433 Corrected loadout placement function 2020-10-16 14:09:29 -04:00
Anuken
d6c5d2bc10 Merge remote-tracking branch 'origin/master' 2020-10-16 12:56:51 -04:00
Anuken
b0ea725142 Sector tweaks 2020-10-16 12:56:48 -04:00
Anuken
8be6eabec9
Merge pull request #2974 from abomb4/patch-homing-delay 
New feature request: bullet homing delay
 2020-10-16 12:44:51 -04:00
Anuken
f391e7a5ac Sector production bugfixes 2020-10-16 12:16:00 -04:00
abomb4
83756a6ea0
New feature: bullet homing delay 2020-10-17 00:05:19 +08:00
Prosta4okua
a8f45b464c
Update bundle_uk_UA.properties 2020-10-16 18:57:13 +03:00
Anuken
f5decdaa1c Disabled spawner radius/warning when waves off 2020-10-16 11:27:17 -04:00
Anuken
2f54edf34f Sector refactoring, invasions and cleanup 2020-10-16 11:02:24 -04:00
Anuken
5ee4101ba4 Moved some static regions 2020-10-15 16:33:51 -04:00
Anuken
45b87ec615 fixed some sector things, broke more things 2020-10-15 15:41:09 -04:00
Anuken
988e1add82 Merge remote-tracking branch 'origin/master' 2020-10-15 13:44:29 -04:00
Anuken
86c2fe8805 too many things to list 2020-10-15 13:44:20 -04:00
Sharlotte
fa2cdb752a
changed private -> public of checkRadius method 
when i try to change color of forceField by using draw method , the Mindustry is crashed because of that private method.
 2020-10-15 20:46:29 +09:00
Anuken
2b435c2600 UnitType serializer set 2020-10-14 09:13:29 -04:00
Anuken
d630110396 JITPack version check 2020-10-14 09:08:03 -04:00
Anuken
f96552a1a1 Merge remote-tracking branch 'origin/master' 2020-10-14 08:49:09 -04:00
Anuken
6b4a7d025b Fixed #2938 / Fixed #2936 2020-10-14 08:49:05 -04:00
Prosta4okua
592708811b
Update bundle_uk_UA.properties 2020-10-14 14:54:21 +03:00
YellOw139
99b3a224d0
Typo fix 2020-10-14 11:49:13 +03:00
YellOw139
80bf157752
[Bundle][RO] Translation Update 
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 1554fd0394
- Typo fixes & various other improvements
 2020-10-14 11:45:09 +03:00
Petr Gašparík
a85a20b346 Czech translation up to commit 1554fd0 2020-10-14 08:00:43 +02:00
Anuken
bb655100ee
Merge pull request #2865 from sk7725/patch-18 
Update bundle_ko.properties
 2020-10-13 19:38:18 -04:00
Anuken
bea9deb386 Removed planet switch debug code 2020-10-13 19:37:45 -04:00
Anuken
1554fd0394 Planet selection for mods 2020-10-13 18:50:18 -04:00
Anuken
6bfae1c34f
Merge pull request #2932 from Prosta4okua/master 
Update bundle_ru.properties
 2020-10-13 18:09:59 -04:00
Anuken
cce8b5a530 Merge remote-tracking branch 'origin/master' 2020-10-13 18:09:49 -04:00
Anuken
a8b55c27e8 x 2020-10-13 18:09:46 -04:00
Anuken
41c08a64e2
Merge pull request #2724 from Prosta4okua/patch-6 
Ukrainian localisation
 2020-10-13 18:07:35 -04:00
Felix Corvus
f846125e78
Update bundle_ru.properties 2020-10-14 01:07:32 +03:00
Anuken
caab6c1fa3
Merge pull request #2720 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-10-13 18:06:45 -04:00
Anuken
7a770d8aed
Merge pull request #2696 from YellOw139/patch-4 
[Bundle][RO] Translation Update
 2020-10-13 18:06:31 -04:00
Anuken
77458e1e4d
Merge pull request #2694 from PetrGasparik/v106-alpha 
[v107-alpha] Czech translation - update
 2020-10-13 18:06:16 -04:00
Anuken
64cae7d877
Merge pull request #2693 from laohuaji233/patch-38 
Update bundle_zh_CN.properties(finished)
 2020-10-13 18:06:07 -04:00
Anuken
0e544825f9
Merge pull request #2481 from Pietro303HD/patch-2 
some small changes, and also removed a typo
 2020-10-13 18:03:56 -04:00
Anuken
3bf80e6732
Merge pull request #2420 from DaGamerFiles/patch-1 
Indonesian translation
 2020-10-13 18:03:47 -04:00
Felix Corvus
e612213969
Update bundle_ru.properties 2020-10-14 00:44:10 +03:00
Anuken
37bb48076d Fixed #2931 2020-10-13 17:41:47 -04:00
Summet
37cafe5081
Бета 2020-10-13 23:31:41 +03:00
Anuken
4bf2b3b43e Now in beta 2020-10-13 16:18:11 -04:00
Anuken
b1acc90739 Cleanup 2020-10-13 16:13:18 -04:00
Anuken
5d76dd0e2f Fixed #2929 2020-10-13 15:56:00 -04:00
Anuken
c05f40af4a Merge remote-tracking branch 'origin/master' 2020-10-13 10:53:50 -04:00
Anuken
b2c236fe7b Difficulty settings for sector presets 2020-10-13 10:53:40 -04:00
Anuken
d4c72b2a9c
Merge pull request #2915 from genNAowl/pierce-cap-info 
Add `pierceCap` Info
 2020-10-13 10:53:17 -04:00
Sunny Kim
4364851cf4
let buildTable accept closeSelect 2020-10-13 22:29:55 +09:00
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
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