mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 18:05:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,724 Commits 4 Branches 160 Tags 2.3 GiB
add3fd9fb3
Commit Graph

9095 Commits

Author SHA1 Message Date
Anuken
8da18984d2 Removed redundant Block#isVisible code 2020-12-17 12:38:22 -05:00
Patrick 'Quezler' Mounier
056afa572e
Allow hidden blocks to be revealed by plugins (#4017) 
* Add revealedBlocks rule

(1/2)

* Use revealedBlocks rule

(2/2)
 2020-12-17 12:37:47 -05:00
Anuken
9f5183b36f Building cleanup 2020-12-17 11:38:03 -05:00
Anuken
0d81681af5 Merge remote-tracking branch 'origin/master' 2020-12-17 10:46:53 -05:00
Anuken
4b1554db54 arc 2020-12-17 10:46:49 -05:00
Charlotte Vixen
c58289dd47
added conduit color indications (#4015) 2020-12-17 10:20:29 -05:00
rMuchan
9a777f3ce5
fix health calculation in background sectors (#4011) 2020-12-17 10:09:28 -05:00
Anuken
b8efed9eaf Better space skybox scaling 2020-12-16 19:52:10 -05:00
Anuken
cd7d2163b9 Merge remote-tracking branch 'origin/master' 2020-12-16 19:47:43 -05:00
Anuken
59c85a486f Fixed phase deflect achievement 2020-12-16 19:47:40 -05:00
DeltaNedas
8bc349b68c
add @commanded for units (#3870) 2020-12-16 19:42:48 -05:00
Angel_24
b12cac7b30
Update bundle_es.properties (#4002) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Tweaks from a newer pull request

Added changes based on the Frankz30's Pull request: [ https://github.com/Anuken/Mindustry/pull/3879#issue-534932998 ]

* Added translations for wheather graphics and report bugs options
 2020-12-16 19:41:07 -05:00
Thomas Widyantoko
bd85d1d7ca
update in_ID translation (#4003) 
* update in_ID translation

* weather graphics setting

suggestion from Discord
 2020-12-16 19:40:52 -05:00
Xelo
9a88426ff7
raw strings for SurfaceShaders (#4004) 
* SurfaceShaders thing

* Update core/src/mindustry/graphics/Shaders.java

spacing fix

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* star import

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
 2020-12-16 19:39:08 -05:00
Anuken
d0bf3d6fa1 Merge remote-tracking branch 'origin/master' 2020-12-16 19:33:36 -05:00
Anuken
bc2c7be45d Fixed #4010 2020-12-16 19:33:29 -05:00
DeltaNedas
74a7dc5eb9
allow mods to set zoom limits (#4006) 
* allow mods to set zoom limits

* rounding

* dont round min

* zoom 1.5 -> 1
 2020-12-16 16:41:08 -05:00
Anuken
3db04da20a Payload tweaks 2020-12-16 13:35:55 -05:00
Anuken
d0cba1aff2 Code cleanup 2020-12-16 10:39:28 -05:00
Anuken
4ad234ad75 Merge remote-tracking branch 'origin/master' 2020-12-16 09:28:11 -05:00
Amaoto Inochi
15116ca384
fix the wrong unit ai path of mod content parser (#3998) 2020-12-15 19:55:31 -05:00
Anuken
446dd6abe5 Consistent water bullet drag 2020-12-15 19:25:23 -05:00
Anuken
ff254d4fdf Fixed #3997 2020-12-15 19:09:33 -05:00
Anuken
eaa5e6f5a1 Increased foreshadow coolant multiplier 2020-12-15 18:39:44 -05:00
Anuken
b90f51224c Fixed #3996 2020-12-15 18:07:15 -05:00
Anuken
47e321f57d Removed atlas outputs 2020-12-15 15:24:09 -05:00
Anuken
6ab96e2787 Fixed #3987 2020-12-15 14:15:06 -05:00
Anuken
659c481c83 cleanup 2020-12-15 11:15:39 -05:00
Anuken
a18e1854ab Null checks & cleanup of upgrade pathing 2020-12-15 10:58:03 -05:00
Anuken
6c67dc1266 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-15 10:52:38 -05:00
Slava0135
0c581c520f
Conveyor upgrade system (#3912) 
* conveyor/conduit upgrading system

* style
 2020-12-15 10:52:20 -05:00
Anuken
c6c18696c0 Cleanup 2020-12-15 10:28:12 -05:00
Anuken
8a5bd7571e 121.3 2020-12-14 22:55:58 -05:00
Anuken
ff93c21269 Merge remote-tracking branch 'origin/master' 2020-12-14 16:31:01 -05:00
Anuken
cec1eb5608 Fixed jitpack build error 2020-12-14 13:42:48 -05:00
Anuken
16f7a8e9d2 Merge remote-tracking branch 'origin/master' 2020-12-14 13:29:59 -05:00
Anuken
f4d0dfd0da Less junction capacity (again) 2020-12-14 10:36:37 -05:00
Skat
aee5d46dfa
Code formatting (#3904) 2020-12-13 23:56:13 -05:00
Sharlotte
5223a89bf1
Update bundle_ko.properties (#3953) 
fix some miss-translation
add translated values
 2020-12-13 23:47:00 -05:00
YellOw139
5b11dbc085
[Bundle][RO] Translation Update (#3957) 
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 98c4ee6e74
- Typo fixes & various other improvements
 2020-12-13 23:46:50 -05:00
GamyGamer
df1f8b8bb4
Update bundle_pl.properties (#3964) 
Added missing lines and fixed typo
 2020-12-13 23:46:39 -05:00
DeltaNedas
ffa7256e5a
add ContentInitEvent (#3951) 
* add ContentInit(ialized)Event

* a

* a
 2020-12-13 23:43:27 -05:00
Anuken
bbf84185cc Fixed #3973 2020-12-13 23:40:06 -05:00
Anuken
901c23f295 Fixed #3969 2020-12-13 18:01:22 -05:00
Anuken
e25f0c6ae2
Merge pull request #3967 from DeltaNedas/version 
disallow descriptions after mod version
 2020-12-13 16:26:23 -05:00
Anuken
484b480076 Fixed #3968 2020-12-13 16:25:36 -05:00
DeltaNedas
926497ba77 disallow descriptions after mod version 2020-12-13 19:30:21 +00:00
Anuken
ddd9f2259c Fixed #3960 2020-12-13 10:27:44 -05:00
Anuken
d6546a38c0 #3830 2020-12-12 18:49:24 -05:00
Karl-Robert Ernst
4aebba0a0c fix units aiming sidewards missing their aim 2020-12-12 22:11:19 +01:00
Anuken
8afb6006ce
Merge pull request #3941 from DeltaNedas/public 
make some proc stuff public
 2020-12-12 13:27:22 -05:00
Anuken
d117eb249e Merge remote-tracking branch 'origin/master' 2020-12-12 13:26:34 -05:00
Anuken
768d14088a Fixed #3943 2020-12-12 13:26:30 -05:00
Anuken
86f16bfc94
Merge pull request #3934 from LottieVixen/fix-issue 
fixed an error in global.js
 2020-12-12 11:31:36 -05:00
Anuken
8fa6b76bf9 Fixed #3936 2020-12-12 11:14:17 -05:00
DeltaNedas
19af1a0cc8 make some proc stuff public 2020-12-12 15:57:43 +00:00
Charlotte Lily-Llaitchee Vixen
409d27e3df found more occurances of the error 2020-12-12 07:23:23 +00:00
Charlotte Lily-Llaitchee Vixen
d47abd4f83 fixed an error in global.js 2020-12-12 07:15:24 +00:00
Anuken
e6c4a6cf69 Fixed #3932 2020-12-11 23:52:43 -05:00
Anuken
7c80af85e3 Property cleanup 2020-12-11 19:28:03 -05:00
Anuken
6983f57459 circleTarget unit AI parameter 2020-12-11 18:54:03 -05:00
Anuken
adeeaa6e27 Merge remote-tracking branch 'origin/master' 2020-12-11 12:56:10 -05:00
Anuken
075e7cf5d8 Disabled poly spawns 2020-12-11 12:56:07 -05:00
Anuken
98c4ee6e74
Merge pull request #3855 from AFFalcons/patch-1 
[QOL] Ability to Disable Weather Effects
 2020-12-11 12:52:07 -05:00
Anuken
87f9a077ac Increase wave spacing by 10sec every sector defeat 2020-12-11 12:43:43 -05:00
Anuken
bc26d3ba7b Merge remote-tracking branch 'origin/master' 2020-12-11 11:48:27 -05:00
Anuken
daaea591e4 Implemented #3486 with some minor changes 2020-12-11 11:48:20 -05:00
Anuken
c444cbf623
Merge pull request #3908 from buthed010203/patch-2 
Delete old bleeding edge builds on update
 2020-12-11 10:52:19 -05:00
Anuken
c54f398063 Fixed Parallax not moving players serverside 2020-12-10 18:21:39 -05:00
Anuken
2d6db1583b Improved approach behavior in formations/logic 2020-12-10 12:51:07 -05:00
buthed010203
b3beb92557
fixed 2020-12-10 12:18:11 -05:00
buthed010203
0f8304674f
now 100% less readable 2020-12-10 11:54:47 -05:00
buthed010203
3b3daf0e25
Delete old bleeding edge builds on update 2020-12-10 11:41:50 -05:00
Anuken
28e18332a0 Decreased junction item capacity 2020-12-10 09:58:09 -05:00
Anuken
dcc4764914 Merge remote-tracking branch 'origin/master' 2020-12-10 09:50:12 -05:00
Anuken
ee4ace1146 Fixed #3902 2020-12-10 09:50:06 -05:00
Patrick 'Quezler' Mounier
2da7afc081
Update Accelerator.java 2020-12-10 12:15:29 +01:00
Patrick 'Quezler' Mounier
e5b341c63e
Prevent accelerator from blending with conveyors 2020-12-10 12:14:57 +01:00
Anuken
a544888f16 cleanup 2020-12-09 20:20:22 -05:00
Anuken
57ad1d5366 Fixed #3899 2020-12-09 20:19:54 -05:00
Anuken
42d66d1136 Sector item system cleanup 2020-12-09 16:26:50 -05:00
Anuken
999cc9c651 Fixed #3890 2020-12-09 14:02:38 -05:00
Anuken
9537051590
Merge pull request #3836 from Nikolass1000/patch-5 
Update polish bundle
 2020-12-09 11:10:02 -05:00
Anuken
827372633d
Merge pull request #3838 from YellOw139/patch-3 
[Bundle][RO][Ready-for-Stable] Translation Update
 2020-12-09 11:09:42 -05:00
Anuken
c93bc0e457 Fixed #3884 / Fixed #3881 / Fixed #3880 2020-12-09 10:49:26 -05:00
Anuken
1460a15942 Fixed #3874 2020-12-08 21:36:20 -05:00
Anuken
15a07a4a18 Merge remote-tracking branch 'origin/master' 2020-12-08 16:43:27 -05:00
Anuken
e07a203d56 Don't use mods for floor decoration 2020-12-08 16:43:23 -05:00
Anuken
cead92b2c7
Merge pull request #3865 from Ordoviz/master 
Improve German translation
 2020-12-08 14:31:26 -05:00
Anuken
8d4ab2d7fb Cleanup 2020-12-08 14:23:13 -05:00
Lennard Hofmann
5ec5f1aa93 Improve German translation 2020-12-08 17:09:37 +01:00
Anuken
5e10c9d416 Decreased slag viscosity 2020-12-08 10:13:08 -05:00
Matthew
881491d151 Requested Changes 2020-12-08 09:10:30 -06:00
Matthew
863159a5fe Init 2020-12-07 18:14:58 -06:00
Anuken
849943a0de Increased surge smelter item capacity 2020-12-07 18:57:59 -05:00
Anuken
b5abc23c9d Minor Fungal Pass tweaks 2020-12-07 16:27:25 -05:00
Anuken
c2b03a3fdc Merge remote-tracking branch 'origin/master' 2020-12-07 15:52:53 -05:00
Anuken
4e1d999838 Rounded up lancer requirements 2020-12-07 15:52:50 -05:00
Anuken
4af971776f Rounded up lancer requirements 2020-12-07 15:48:07 -05:00
Anuken
86d2788232
Merge pull request #3735 from Nikolass1000/patch-4 
Fix for missing foreshadow description [PL]
 2020-12-07 15:18:13 -05:00
Anuken
5654e3120d Logic constant optimizations / Display admins on top 2020-12-07 12:51:31 -05:00
Anuken
25125f5a9b Removed Tile#bc(), use Tile.build instead 2020-12-07 11:44:57 -05:00
Anuken
5d4b8a43e3 Merge remote-tracking branch 'origin/master' 2020-12-07 11:10:23 -05:00
Anuken
557cb1c532 Fixed #3834 / Fixed #3835 / Fixed #3837 2020-12-07 11:10:19 -05:00
Patrick 'Quezler' Mounier
2a1ddf2573
Fixed #3839 2020-12-07 13:21:32 +01:00
YellOw139
fdb8da5767
[Bundle][RO][Ready-for-Stable] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).
Its strings are ready and _**merging**_ is _**recommended**_ for **_the next stable release._**

Changelog:

- New strings/changes up to commit f9cfc8a2b8
- Typo fixes & various other improvements
 2020-12-07 13:50:55 +02:00
Nikolass1000
738aa26a20
Another completion 2020-12-07 10:41:16 +01:00
Anuken
e636ceb317
Merge pull request #3791 from joshuaptfan/master 
Enable double-click to play sector
 2020-12-06 11:47:54 -05:00
Joshua Fan
70cc6d07b0 Detect double-tap using count 2020-12-06 07:52:50 -08:00
Anuken
4d5c2c83fd Removed spawn shockwave delay 2020-12-06 10:50:13 -05:00
Anuken
cf91bcbd49 Run damage before spawn points activate 2020-12-06 10:23:24 -05:00
Anuken
18b19e964a
Merge pull request #3773 from Diegator04/patch-2 
Complete bundle_it
 2020-12-06 09:32:24 -05:00
Anuken
bf1ace4791
Merge pull request #3747 from VitLogArx/patch-1 
Update bundle_be.properties
 2020-12-06 09:31:52 -05:00
Anuken
dcd56a2d87
Merge pull request #3751 from Angel-24/patch-3 
Update bundle_es.properties
 2020-12-06 09:31:41 -05:00
Anuken
67c1db0fcc
Merge pull request #3765 from YellOw139/patch-2 
[Bundle][RO][Ready-for-Stable] Translation Update
 2020-12-06 09:31:24 -05:00
Anuken
6027fff543
Merge pull request #3811 from Prosta4okua/patch-2 
[Bundle][Uk_ua]Update translation
 2020-12-06 09:31:04 -05:00
Anuken
0c3c9fce2a
Merge pull request #3815 from sharlotte-mobile/patch-2 
Update bundle_ko.properties
 2020-12-06 09:30:50 -05:00
Quick-Korc
2d3b33bd9c
more id translate 2020-12-06 14:33:57 +07:00
Joshua Fan
dd6ae80817 Merge remote-tracking branch 'origin/master' 2020-12-05 22:56:34 -08:00
Sharlotte
304bfb5a40
Update bundle_ko.properties 
translated new hint value.
removed over-translated value.
checked some values and fix.
and do unification of some terms, reinforce poor translation etc
 2020-12-06 15:18:57 +09:00
Joshua Fan
58c1718d01 Detect double-tap 2020-12-05 22:07:09 -08:00
Anuken
29fe5dab06 Allow client research 2020-12-05 21:24:27 -05:00
Anuken
f9024e5500 Consider sectors with bases unlocked 2020-12-05 21:14:10 -05:00
Anuken
f9cfc8a2b8 Fixed #3812 / Fixed #3813 2020-12-05 20:48:56 -05:00
Anuken
d61bb66418 Fixed capture wave being set to 0 in some situations 2020-12-05 18:03:21 -05:00
Anuken
b0f62f25e6 No suggested mods 2020-12-05 17:53:49 -05:00
Anuken
bdbc9b865b Fixed distort artifacts 2020-12-05 17:50:29 -05:00
Prosta4okua
21c97571e0
Update bundle_uk_UA.properties 2020-12-06 00:45:30 +02:00
Prosta4okua
8e92be9037
Update bundle_uk_UA.properties 2020-12-06 00:42:18 +02:00
Anuken
f6428b8857 Fixed #3808 2020-12-05 16:40:54 -05:00
Anuken
cb3b43cc48 Disabled cursor scaling 2020-12-05 14:23:29 -05:00
Anuken
587c63fc92 Merge remote-tracking branch 'origin/master' 2020-12-05 14:16:06 -05:00
Anuken
97fa8057ba Fixed #3805 2020-12-05 14:16:02 -05:00
Anuken
6a2bb7b01f
Merge pull request #3794 from sharlotte-mobile/patch-1 
ko hotfix
 2020-12-05 11:05:55 -05:00
Anuken
edbced6642 Fixed #3798 2020-12-05 10:58:30 -05:00
Anuken
8c0477f6bd Fixed #3795 2020-12-05 10:30:46 -05:00
Angel_24
4e00c4b015
Update bundle_es.properties 2020-12-05 14:06:20 +01:00
Sharlotte
42f0364319
ko hotfix 
translate all missing values
removed over-translated values
and do Uniform some terms, correction of typos.
 2020-12-05 20:10:03 +09:00
Joshua Fan
6ececea004 Enable double-click to play sector 2020-12-05 00:58:56 -08:00
Anuken
6570d23512 Fixed #3786 2020-12-04 19:24:09 -05:00
Anuken
7ec3ab5a17 Fixed #3784 2020-12-04 18:55:37 -05:00
Anuken
bac4bb8c8f Heighten export cap when production is negative 2020-12-04 15:20:15 -05:00
YellOw139
5ac1c32652
coreIncinerate 2020-12-04 22:19:56 +02:00
Anuken
dec5a2aaaf Minor campaign tweaks 2020-12-04 15:07:35 -05:00
Anuken
5c3ae425ae Display locked sectors / Core incinerate hint 2020-12-04 11:31:27 -05:00
Anuken
744b1b2037 Looking into test failure 2020-12-04 10:56:47 -05:00
Anuken
a313ca8a26 Checking if tests fail 2020-12-04 10:44:39 -05:00
Anuken
bc70c08820 Fixed #3756 2020-12-04 10:25:41 -05:00
Diegator04
70c6cd2e87
Complete bundle_it 
I compared the **@GioIacca9's bundle** with mine so I was able to notice **mistakes** and **missing translations** which I corrected. We worked together and we discussed about a suitable words and phrases in italian. Furthermore I added the **first version** of _unit's names_, we'll improve them in the future.
 2020-12-04 13:55:22 +01:00
Angel_24
a8a629c5ef
Update bundle_es.properties 2020-12-04 11:24:25 +01:00