Commit Graph
100 Commits
Author SHA1 Message Date
Anuken 5ee4101ba4 Moved some static regions 2020-10-15 16:33:51 -04:00
Anuken d177c8b875 arc 2020-10-15 15:45:19 -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
AnukenandGitHub 6806c09760 Merge pull request #2960 from sharlotte-mobile/patch-1
changed private -> public of checkRadius method
2020-10-15 09:49:08 -04:00
Anuken fb0179da95 Attempting jitpack Java 14 workaround 2020-10-14 09:15:47 -04: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
AnukenandGitHub 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
AnukenandGitHub 3bd3dcf03b Merge pull request #2924 from summetdev/groovy-imports
Cleanup some groovy's imports
2020-10-13 18:14:19 -04:00
AnukenandGitHub 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
AnukenandGitHub 41c08a64e2 Merge pull request #2724 from Prosta4okua/patch-6
Ukrainian localisation
2020-10-13 18:07:35 -04:00
AnukenandGitHub caab6c1fa3 Merge pull request #2720 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-10-13 18:06:45 -04:00
AnukenandGitHub 7a770d8aed Merge pull request #2696 from YellOw139/patch-4
[Bundle][RO] Translation Update
2020-10-13 18:06:31 -04:00
AnukenandGitHub 77458e1e4d Merge pull request #2694 from PetrGasparik/v106-alpha
[v107-alpha] Czech translation - update
2020-10-13 18:06:16 -04:00
AnukenandGitHub 64cae7d877 Merge pull request #2693 from laohuaji233/patch-38
Update bundle_zh_CN.properties(finished)
2020-10-13 18:06:07 -04:00
AnukenandGitHub 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
AnukenandGitHub 3bf80e6732 Merge pull request #2420 from DaGamerFiles/patch-1
Indonesian translation
2020-10-13 18:03:47 -04:00
Anuken 37bb48076d Fixed #2931 2020-10-13 17:41:47 -04: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 ca875876cd arc 2020-10-13 11:18:30 -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
AnukenandGitHub d4c72b2a9c Merge pull request #2915 from genNAowl/pierce-cap-info
Add `pierceCap` Info
2020-10-13 10:53:17 -04:00
AnukenandGitHub b40bbdad0e Merge pull request #2927 from sk7725/patch-19
Let buildTable accept `closeSelect`
2020-10-13 10:44:57 -04:00
AnukenandGitHub cf27b0f10a Merge pull request #2899 from FruityPear/patch-1
Add Pearkin Attack Server to servers.json
2020-10-12 16:23:52 -04:00
AnukenandGitHub 565892b39a Merge branch 'master' into patch-1 2020-10-12 16:23:46 -04:00
AnukenandGitHub 59223fb7aa Merge pull request #2464 from way-zer/patch-1
Update servers_be.json
2020-10-12 16:22:13 -04:00
AnukenandGitHub 0b11185f39 Merge branch 'master' into patch-1 2020-10-12 16:22:09 -04:00
AnukenandGitHub 259d611c2c Merge pull request #2523 from Recessive/patch-3
Update servers.json
2020-10-12 16:20:18 -04:00
AnukenandGitHub 65f1d027a1 Merge branch 'master' into patch-3 2020-10-12 16:20:13 -04:00
AnukenandGitHub f1123e51a3 Merge pull request #2820 from LeoSko/patch-1
Update servers.json
2020-10-12 16:17:45 -04:00
Anuken 06877b457e Rule selection fixes 2020-10-12 15:59:22 -04: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
AnukenandGitHub 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
AnukenandGitHub a1f222b76d Merge pull request #2908 from Somka000/patch-8
Update servers_be.json
2020-10-12 10:40:10 -04: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
AnukenandGitHub 0ddc34a51d Merge pull request #2920 from Catchears/dacite-boulder
Add bundle entry for dacite boulder
2020-10-12 10:03:30 -04:00
AnukenandGitHub 9edec3c7ab Update .travis.yml 2020-10-11 19:14:16 -04:00
AnukenandGitHub 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
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
AnukenandGitHub 4473d1d674 Merge pull request #2911 from summetdev/patch-5
Fix Vars.loops declaration
2020-10-11 13:56:59 -04:00
Anuken ad2bda8ec1 Better sector gen 2020-10-11 13:33:02 -04: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
AnukenandGitHub cc051dd787 Merge pull request #2905 from DeltaNedas/uinames
add names to lots of ui elements
2020-10-11 10:36:18 -04:00
AnukenandGitHub d9aa1f765d Merge pull request #2906 from Quezler/patch-53
Visualize maximum amount of power node wires
2020-10-11 10:19:58 -04:00
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
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
AnukenandGitHub 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
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
AnukenandGitHub dbdd1bd87f Merge pull request #2894 from Quezler/patch-51
Who needs two pairs of legs?
2020-10-10 12:50:33 -04: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
AnukenandGitHub a4306431f0 Merge pull request #2892 from DeltaNedas/storage
make storageblock instantiable
2020-10-10 11:19:05 -04:00
Anuken 5a31d419fc Bugfixes 2020-10-09 19:10:16 -04:00
Anuken 5455ef4361 CI 2020-10-09 18:49:46 -04:00
Anuken 2a7987d916 CI 2020-10-09 18:35:54 -04:00
Anuken e4c8366a70 CI 2020-10-09 17:50:23 -04:00
Anuken e4bf46ab6a CI 2020-10-09 17:31:53 -04:00
Anuken 03a47baec3 CI 2020-10-09 17:08:58 -04:00
Anuken 4e1b46dda7 CI 2020-10-09 17:08:15 -04:00
Anuken d21e321c80 CI 2020-10-09 17:03:32 -04:00
Anuken 9f28750063 CI 2020-10-09 16:42:00 -04:00
Anuken 532263b417 Different Android version code system 2020-10-09 16:19:58 -04:00
Anuken 8d738c31e7 arc 2020-10-09 16:17:23 -04:00
Anuken 36463f920d Signed Android releases, maybe 2020-10-09 15:58:55 -04: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
AnukenandGitHub d75be3fcd6 Merge pull request #2888 from Quezler/patch-50
Update leak behaviour in plated conduit description
2020-10-09 13:18:11 -04:00