mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,672 Commits 4 Branches 160 Tags 2.3 GiB
231902aec5
Commit Graph

7416 Commits

Author SHA1 Message Date
Anuken
eb8658e140 Mud tweaks / Unit count tweaks 2020-09-19 16:04:50 -04:00
Anuken
84b1c0348d Merge remote-tracking branch 'origin/master' 2020-09-19 14:11:51 -04:00
Anuken
0bcb48ca31 Costs for unit research 2020-09-19 14:11:48 -04:00
Anuken
c470c0abe1
Merge pull request #2612 from sk7725/patch-17 
[KO] Update bundle_ko.properties
 2020-09-19 13:26:31 -04:00
Anuken
dcbfc2b7aa Storage team colors 2020-09-19 12:38:24 -04:00
Anuken
ce8e060f29 Merge remote-tracking branch 'origin/master' 2020-09-19 12:31:06 -04:00
Anuken
9b0947a6e5 Fixed #2607 / Fixed #2604 2020-09-19 12:30:58 -04:00
Anuken
c865dbb465
Merge pull request #2610 from DeltaNedas/pubtree 
make techtree funcs public
 2020-09-19 12:14:26 -04:00
Anuken
eb60b60b4a
Merge pull request #2615 from Remint32/patch-4 
[Bundle] Missing keybind lines
 2020-09-19 12:12:52 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Felix Corvus
68cf2af6e0
missing keybind lines 2020-09-19 17:34:49 +03:00
Felix Corvus
db3eaf9a33
missing lines 2020-09-19 17:29:33 +03:00
Felix Corvus
48f6ed47a6
Merge branch 'master' into master 2020-09-19 17:01:57 +03:00
Felix Corvus
c1efb69a91
Update bundle_ru.properties 2020-09-19 16:58:22 +03:00
Vanguard
742b171d5c
2 new lines 
unit.sei.name
unit.omura.name
 2020-09-19 16:10:07 +03:00
Sunny Kim
8a4dd09137
Update bundle_ko.properties 
+ Lots of environmental blocks(reflects 74cefb3ec9)!
 2020-09-19 20:49:08 +09:00
DeltaNedas
435ef23eed
Update CrashSender.java 2020-09-19 09:50:02 +00:00
DeltaNedas
cdc1337fcb make techtree funcs public 2020-09-19 10:00:33 +01:00
DeltaNedas
c324cf2c66 h 2020-09-19 09:56:05 +01:00
DeltaNedas
3894234578 more info in crash reports 2020-09-19 09:54:09 +01:00
Anuken
b29c0ab401 Unit production limit tweaks 2020-09-18 22:42:05 -04:00
Anuken
8a99a89f57 how many times do I neet to press refresh before IntelliJ sees the files that were there all along 2020-09-18 21:19:26 -04:00
Anuken
aae045b5dd Outline changes 2020-09-18 21:14:04 -04:00
Anuken
8dd1c5f1f8 hhhhh 2020-09-18 18:56:01 -04:00
Anuken
f53af781ba T4/5 naval / Controversial weapon outlines 2020-09-18 18:54:09 -04:00
Felix Corvus
4cc90c0f4d
Update bundle_ru.properties 2020-09-18 22:25:59 +03:00
Felix Corvus
80490c401a
Update bundle_ru.properties 2020-09-18 21:38:31 +03:00
Anuken
6b6783f201 Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587 2020-09-18 11:21:50 -04:00
Anuken
c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Anuken
4c241f9867 Bugfixes 2020-09-17 23:53:35 -04:00
Anuken
f242a2b2cd Fixed #2585 2020-09-17 22:25:56 -04:00
Anuken
0c7a7e00eb Merge remote-tracking branch 'origin/master' 2020-09-17 21:05:23 -04:00
Anuken
ea224bd1f1 many things 2020-09-17 21:05:16 -04:00
DeltaNedas
ee08fa8f77 add lua-style integer division with // 2020-09-17 17:46:45 +01:00
Anuken
ce2dd89f44 Fixed #2571 2020-09-16 23:34:56 -04:00
Anuken
bdf814c9b9 Removed sector data cache system 2020-09-16 18:38:23 -04:00
Felix Corvus
e1277da02d
Update bundle_ru.properties 2020-09-17 00:49:02 +03:00
Anuken
030542890e Bugfixes 2020-09-16 16:04:11 -04:00
Anuken
5c98512e4f Bugfixes 2020-09-16 14:53:44 -04:00
Anuken
0847fc9f09 Crash fix 2020-09-16 12:58:26 -04:00
Anuken
47b4da59e0 Fixed #2567 2020-09-16 12:56:32 -04:00
TheSlaylord
b24c5ea920
Update contributors 2020-09-16 18:48:04 +03:00
TheSlaylord
7dfe973664
Update bundle_ru.properties 2020-09-16 18:46:04 +03:00
Anuken
ddcfd0728d Merge remote-tracking branch 'origin/master' 2020-09-16 11:44:46 -04:00
Anuken
9cfd78ee1f Fixed #2565 2020-09-16 11:44:39 -04:00
Anuken
90978b54da
Merge pull request #2558 from sk7725/patch-16 
[KO] Unit name changes
 2020-09-16 10:50:39 -04:00
Anuken
7e9f5f5dc4
Merge pull request #2562 from Quezler/patch-44 
+ commander
 2020-09-16 10:49:39 -04:00
Anuken
edb776a549
Merge pull request #2521 from YellOw139/patch-1 
Create bundle_ro.properties
 2020-09-16 10:29:07 -04:00
Anuken
d015e878c8 Visual fixes 2020-09-16 09:57:12 -04:00
Anuken
e2a838a715 Fixed #2563 2020-09-16 09:23:57 -04:00
Felix Corvus
41f3fcbe16
Update bundle_ru.properties 2020-09-16 16:01:47 +03:00
Felix Corvus
013995b30d
nicknames fixes 2020-09-16 15:13:25 +03:00
YellOw139
66aacd6ef0
Update bundle_ro.properties 2020-09-16 13:39:28 +03:00
YellOw139
703ad61b72
Update bundle_ro.properties 2020-09-16 13:38:54 +03:00
Patrick 'Quezler' Mounier
e7162004f2
+ commander 2020-09-16 12:04:24 +02:00
YellOw139
9e81460adb
Update bundle_ro.properties 2020-09-16 08:18:01 +03:00
YellOw139
71df10c6d8
Update bundle_ro.properties 2020-09-16 07:43:07 +03:00
Anuken
3974497c31 Merge remote-tracking branch 'origin/master' 2020-09-15 23:49:47 -04:00
Anuken
462e6733ed Cliff-spam cache fix 2020-09-15 23:49:40 -04:00
Sunny Kim
3407520645
[KO] Unit name changes 
[KO] Unit name changes, based on community reactions.
 2020-09-16 10:15:38 +09:00
Anuken
2877bdf0d6
Update bundle_ko.properties (#2475) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2020-09-15 20:36:18 -04:00
Anuken
23c56974b2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
 2020-09-15 19:28:57 -04:00
Anuken
a5ce57e56d Deployment fixes 2020-09-15 19:28:38 -04:00
Prosta4okua
7e2b3a6e2d
Ukrainian translation (#2492) 
* Український переклад :flag_ua:

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Оновлення перекладу до стану 10.09.2020

* Update bundle_uk_UA.properties

* Оновлення на 15.09.2020

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2020-09-15 18:21:11 -04:00
Anuken
234649bd68 Weather tweaks 2020-09-15 18:20:56 -04:00
Anuken
d655f95b67 Random weather wind direction 2020-09-15 18:15:26 -04:00
Anuken
903a2c069e Merge remote-tracking branch 'origin/master' 2020-09-15 18:00:39 -04:00
Anuken
306a660e87 Custom map weather definition 2020-09-15 18:00:29 -04:00
Petr Gašparík
e624c42026
Czech translation - up-to-date! (#2393) 
* Czech translation - up-to-date!

* fix
 2020-09-15 16:44:54 -04:00
Felix Corvus
76ed066a95
[Bundle][RU] actual L10n (#2381) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* *Командный центр*

* Update bundle_ru.properties

* Update bundle_ru.properties

Новые (нет) юниты, Scepter и Reign

* Забыл про Toxopid

* [ru l10n] Обходчик -> Ползун

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* BasedUser was trolled by Anuke

* Update bundle_ru.properties

* Ого, вот это обновление окружения!

* *Ы*

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update achievements.vdf

* Update bundle_ru.properties

* Пункт снаряжения -> Пункт снабжения

Co-authored-by: TheSlaylord <62336673+TheSlaylord@users.noreply.github.com>
 2020-09-15 16:44:29 -04:00
YellOw139
f52693ae88
Update bundle_ro.properties 2020-09-15 21:55:17 +03:00
Anuken
b06a9cbf16 Query V6 servers on non-BE instead of standard servers 2020-09-15 14:01:20 -04:00
Anuken
f609ee77a4 Bridge align fix 2020-09-15 13:56:42 -04:00
Anuken
d1b5b7eb3c Fixed #2556 2020-09-15 13:47:00 -04:00
Anuken
b3d7515dcd Line optimization & cleanup 2020-09-15 13:19:02 -04:00
Anuken
1327a2bef4 Mega repair AI 2020-09-15 10:39:45 -04:00
Anuken
757e0fbda0 Cleanup 2020-09-14 16:56:32 -04:00
Anuken
50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
Anuken
d6447cb31a Fixed #2553 2020-09-14 11:13:27 -04:00
Anuken
8901838c19 Fixed #2551 2020-09-14 09:41:54 -04:00
YellOw139
ac8c82eaa1
Update bundle_ro.properties 2020-09-14 14:52:45 +03:00
YellOw139
fffa07398e
Update bundle_ro.properties 2020-09-14 10:40:26 +03:00
YellOw139
7021d2b9fd
Update bundle_ro.properties 2020-09-14 09:45:51 +03:00
Anuken
5c63ff889a what 2020-09-13 23:30:51 -04:00
Anuken
3f1ed6d4a4 Bugfixes 2020-09-13 23:11:24 -04:00
Anuken
bbb9b3ef62 Bugfixes & unit status polish 2020-09-13 22:30:05 -04:00
Anuken
0e78751c6c Turret ammo display 2020-09-13 21:22:39 -04:00
Anuken
7ce93c7f85 Prototype health/ammo indication 2020-09-13 21:08:24 -04:00
Anuken
be229f441e click fix 2020-09-13 14:32:15 -04:00
Anuken
f3921e3dcc Minor optimization 2020-09-13 14:30:31 -04:00
Anuken
48391219fd Packed sprites for cliff removal 2020-09-13 12:18:41 -04:00
Anuken
27e9b5aeb9 Removed cliffs / Nerfed explosion bombing 2020-09-13 12:13:42 -04:00
YellOw139
140569238b
Update bundle_ro.properties 2020-09-13 18:59:52 +03:00
Anuken
bab43859f5 Bugfixes 2020-09-13 10:02:10 -04:00
YellOw139
12d8cba2a7
Update bundle_ro.properties 2020-09-13 16:11:43 +03:00
YellOw139
a5d36dff7e
Update bundle_ro.properties 2020-09-13 13:59:52 +03:00
Anuken
1fd98fe07c Bugfixes (2) 2020-09-12 23:43:03 -04:00
Anuken
4d6c8ade98 Bugfixes 2020-09-12 23:41:25 -04:00
Anuken
8234f31e83 Various tweaks 2020-09-12 21:41:43 -04:00
Anuken
e5ff429241 ??? 2020-09-12 15:32:35 -04:00
Anuken
b58b6c7361 Fixed #2544 2020-09-12 14:57:00 -04:00
Anuken
5ce8e6339d Merge remote-tracking branch 'origin/master' 2020-09-12 12:47:29 -04:00
Anuken
fa9611e28c Bugfixes 2020-09-12 12:47:18 -04:00
Sunny Kim
b5b75656d1
Block Fields for Modding (#2538) 
* quickRotate

* quickRotate and rotateArrow

* rotateArrow

* rotateArrow

* Update contributors

* quickRotate

* removed rotateArrow

* remove rotateArrow

* removal
 2020-09-12 10:11:10 -04:00
Anuken
197b67f8c1 Fixed #2543 2020-09-12 09:51:57 -04:00
Anuken
c95f0674b6 Fixed outdated fuse schematic 2020-09-11 23:28:22 -04:00
Anuken
1c6fed8df8 Many things that won't fit in a commit message 2020-09-11 23:04:19 -04:00
Anuken
3feb9e76f0 Allowed Steam name change / T4+5 reconstructor cost increase 2020-09-11 19:57:46 -04:00
Anuken
3d8fb1b6ca Bridge fixes 2020-09-11 13:36:10 -04:00
Anuken
83d9bd7d81 Difficulty indicator for sectors / Power sense FPS scale 2020-09-11 10:42:16 -04:00
Anuken
5373011058 Merge remote-tracking branch 'origin/master' 2020-09-10 22:20:27 -04:00
Anuken
c0ca134c5d Fixed #2537 (mostly) 2020-09-10 22:20:20 -04:00
LordChrom
007a0da40a
Bugfix for Logic Ops (#2535) 
Performing some operations on larger numbers gave erroneous results when converting from doubles to ints. Now uses longs instead, which should help.
 2020-09-10 19:14:03 -04:00
Anuken
e6eb847d81 Fixed #2536 2020-09-10 19:09:00 -04:00
Anuken
7c1d035977 Bugfixes 2020-09-10 16:45:48 -04:00
Anuken
74cefb3ec9 Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
Anuken
88e3022db0 files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
Anuken
0e61d61dd2 Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
Anuken
aec4a07aec Fixed steam-generator bundle name 2020-09-10 10:29:54 -04:00
Anuken
55b6abffd1 Fixed #2530 2020-09-10 09:24:25 -04:00
Anuken
3e2fcfa30f Fixed #2529 2020-09-10 09:20:54 -04:00
Anuken
3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00
Anuken
2260e6824c Fixed minGameVersion / Crawler command / New rules 2020-09-09 22:17:26 -04:00
Anuken
c5cb2d8683 Miner unit bugfixes 2020-09-09 19:09:56 -04:00
Anuken
5259969384 Object sense support / Bugfixes 2020-09-09 19:02:40 -04:00
YellOw139
aff57f2f30
Update bundle_ro.properties 2020-09-10 00:01:35 +03:00
Anuken
c03e3f56aa Added min-game-version 105 enforcement 2020-09-09 16:40:08 -04:00
YellOw139
8c0fb1edbb
Update bundle_ro.properties 2020-09-09 23:29:21 +03:00
YellOw139
3ceda53202
Update bundle_ro.properties 2020-09-09 23:20:36 +03:00
YellOw139
7fc53f0a9e
Update bundle_ro.properties 2020-09-09 18:32:51 +03:00
YellOw139
4503096e26
Update bundle_ro.properties 2020-09-09 18:27:12 +03:00
Anuken
6787bbdc05 Better builder AI / Various tweaks 2020-09-09 10:39:18 -04:00
Anuken
d9a067b4d2 Small sprite tweaks & bugfixes 2020-09-08 21:40:50 -04:00
YellOw139
6c7a603219
Create bundle_ro.properties 
I know unfinished translations in non-draft pull requests are a big no, but I ran low on battery, had no available charger and needed to change devices while making sure progress is not lost.

Will fix ASAP.
 2020-09-09 03:14:51 +03:00
Anuken
ac88d84322 Various base generation tweaks 2020-09-08 16:25:01 -04:00
Anuken
ef617b7fd2 New base parts 2020-09-08 15:46:24 -04:00
Anuken
fdca6771fb Better attack-mode core spawning limits 2020-09-08 11:54:23 -04:00
Anuken
27565cfe1c Merge remote-tracking branch 'origin/master' 2020-09-08 10:05:45 -04:00
Anuken
b66c29e12c Cleanup 2020-09-08 10:05:41 -04:00
zethnest
1439f9d14b
[QOL] Quick Copy Implementation (#2097) 
* quick copy implementation

* quick copy implementation

* limit break + copy to schematic size

changed default

added comments

* fix error

* fix cannot copy schematic after placing

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-09-08 09:27:41 -04:00
Anuken
b6912254c4 Translations for startup message 2020-09-07 18:00:25 -04:00
Anuken
1b5a338e1e Merge remote-tracking branch 'origin/master' 2020-09-07 17:07:01 -04:00
Anuken
fe76490418 Fixed #2515 2020-09-07 17:06:56 -04:00
DeltaNedas
29b31daba7
ignore indentation in imported assembly (#2511) 
* ignore indentation in imported assembly

* oop

* Update LAssembler.java
 2020-09-07 11:13:28 -04:00
Anuken
15bb01fd22 Slight steam generator nerf + differential buff 2020-09-07 09:40:22 -04:00
Anuken
93d1904978 Fixed payload calculations not using squares 2020-09-06 22:19:30 -04:00
Anuken
010a1594fa Name fixes 2020-09-06 19:09:41 -04:00
Anuken
7b18389d45 Payload system rework (#2485) 2020-09-06 17:13:14 -04:00
Anuken
27d9f965be Fixed #2507 2020-09-06 14:54:10 -04:00
Anuken
0a3193f1d6 Merge remote-tracking branch 'origin/master' 2020-09-06 13:26:30 -04:00
Anuken
2a995efa2a Fixed default campaign core spawning units in blocks 2020-09-06 13:26:23 -04:00
Sunny Kim
8a6b5668fa
Distribution/PowerNode/TractorBeamTurret fields for modding (#2498) 
* Effect stuff for quezler conveyors

* shootSound for mass driver

* *color intensifies*

* Update TractorBeamTurret.java

* Update MassDriver.java

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-09-06 11:55:24 -04:00
Anuken
cbce04f70f Fixed #2502 2020-09-06 10:05:10 -04:00
Anuken
e5674b1b1e Fixed #2501 2020-09-06 09:41:48 -04:00
Anuken
50a94af0d1 Fixed #2500 2020-09-06 09:07:51 -04:00
Anuken
e267519c6d Balance & bugfixes 2020-09-05 22:58:07 -04:00
Anuken
f87bd78674 Placement config code cleanup 2020-09-05 20:41:50 -04:00
Anuken
c483ae2c23 Fixed certain teams not attacking other units 2020-09-05 15:03:13 -04:00
Anuken
09e34da880 Bugfixes 2020-09-05 13:35:36 -04:00
Anuken
9fb570f965 Merge remote-tracking branch 'origin/master' 2020-09-05 11:52:00 -04:00
Anuken
ad7692b110 Added debug logging for erroneous rate limit 
I still don't know what causes this and I can't reproduce it locally
 2020-09-05 11:51:50 -04:00
Sunny Kim
ec447fa2c0
More defense fields for modding(fixed) (#2490) 
* lightningColor for Shock Mines

Because various colored lightning is widely used in 6.0, this would be neat for modders.

* doorSound

* just...in case

* oh no
 2020-09-05 10:15:33 -04:00
Anuken
bc74208c8c Merge remote-tracking branch 'origin/master' 2020-09-05 10:14:53 -04:00
Anuken
631b0a7761 Fixed #2491 2020-09-05 10:14:46 -04:00
Sunny Kim
f447aeff3e
More wall fields for modding (#2486) 
* More wall fields for mods

- `flashColor` (`flashWhite` is renamed to `flashHit` since it isn't white anymore)
- `lightningColor`

* Update Blocks.java
 2020-09-05 08:50:46 -04:00
Anuken
12f1ee9537 Overdriveable bridges 2020-09-05 08:47:38 -04:00
Anuken
68f00a8983 Bugfixes 2020-09-04 22:36:38 -04:00
Anuken
d77830ebf0 Added boss mechs to reconstructors 2020-09-04 22:17:28 -04:00
Anuken
739c4f2de2 Final mech boss unit (unfinished) 2020-09-04 22:05:15 -04:00
Anuken
ee2b099799 Initial Vestige mech implementation 2020-09-04 14:27:55 -04:00
Anuken
c7522ff89f Fixed more unit warp 2020-09-04 11:07:01 -04:00
Anuken
af47e7662f Reduced ridiculous wave spacing in campaign 2020-09-03 21:23:36 -04:00
Anuken
ba1363895e Fixed projector clipping 2020-09-03 19:17:49 -04:00
Anuken
07305aecf4 Unit bugfixes 2020-09-03 16:02:14 -04:00
Anuken
90247e3b27 Fixed #2472 2020-09-03 15:23:08 -04:00
Anuken
90aed50ca8 Many various fixes 2020-09-03 14:04:30 -04:00
Anuken
13a2319416 Merge branch 'master' of https://github.com/Anuken/Mindustry into refactor-paths 
 Conflicts:
	core/src/mindustry/ai/types/GroundAI.java
 2020-09-03 09:18:06 -04:00
Anuken
a6ee946024 Pathfinder progress 2020-09-03 09:17:21 -04:00
Anuken
ed02eadb76 Bugfixes 2020-09-02 18:27:02 -04:00
Anuken
439c9c5599 Bugfixes 2020-09-02 16:24:05 -04:00
Anuken
0cc3bcb121 Fixed #2477 2020-09-02 14:39:02 -04:00
Anuken
b3e7b9e65b Cleanup 2020-09-02 14:30:56 -04:00
Anuken
6f6e9f4cc2 Initial Toxopid implementation 2020-09-02 13:32:08 -04:00
Anuken
6de1920042 Fixed #2476 2020-09-02 09:35:03 -04:00
Anuken
c1cc11c7cb Initial toxopid sprites, WIP 2020-09-02 00:13:25 -04:00
Sunny Kim
850d3a037a
Update bundle_ko.properties 2020-09-02 09:21:10 +09:00
Sunny Kim
80e2c06c48
Update bundle_ko.properties 2020-09-02 09:17:18 +09:00
Sunny Kim
7d4a1cb627
Update bundle_ko.properties 2020-09-02 09:12:22 +09:00
Anuken
f1772418f2 Bugfixes 2020-09-01 16:11:54 -04:00
Anuken
8e17571824 Fixed #2449 / Fixed #2456 / Fixed #2458 / Fixed #2459 / Fixed #2466 / Fixed #2474 2020-09-01 11:34:03 -04:00
Anuken
c9b37419c7
Fixed #2455 2020-08-31 07:43:53 -05:00
Anuken
b1e39b1bcb
Update BuildBlock.java 2020-08-30 09:58:47 -05:00
Anuken
540a5f30cb
Update Turret.java 2020-08-30 09:34:30 -05:00
Anuken
f2cc56ddc8
Fixed #2452 2020-08-30 09:02:44 -05:00
Anuken
e41b17543f
Update LiquidModule.java 2020-08-30 08:58:53 -05:00
Anuken
d40cff0741
Update CoreBlock.java 2020-08-30 08:19:28 -05:00
Anuken
02a9e2cd57
??? 2020-08-29 11:54:20 -05:00
DeltaNedas
1f543f6c18
fix #2460 (#2461) 2020-08-29 11:18:40 -05:00
J-VdS
fee15caf7a
Merge branch 'master' into schematic 2020-08-28 13:38:46 +02:00
Anuken
44b0ef408f testing BE builds 2020-08-27 20:21:20 -04:00