Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,562 Commits 4 Branches 180 Tags
cd7d2163b98f245492c655302f4dd7cee9a86246
Commit Graph

10562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anuken
e6717b37ce Fixed #4000 2020-12-16 09:28:06 -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
475bef1d78 Fixed sprite antialiasing 2020-12-15 17:43:01 -05:00
Anuken
dd9095bfba Cleanup 2020-12-15 15:31:45 -05:00
Anuken
50125166a6 Merge remote-tracking branch 'origin/master' 2020-12-15 15:24:14 -05:00
Anuken
47e321f57d Removed atlas outputs 2020-12-15 15:24:09 -05:00
Recessive
144751bdce Update servers_v6.json (#3983) 
Added {AA} Assault
 2020-12-15 14:28:52 -05:00
L0615T1C5-216AC-9437
6cc3676f5e Final addition to the CN Network (#3986) 
introducing a new unique game mode, Mech-Battles, were players fight against each other.
 2020-12-15 14:28:36 -05:00
Anuken
6ab96e2787 Fixed #3987 v121.4 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
Somka000
4b1c55b876 Update server (#3984) 2020-12-15 09:59:46 -05:00
Anuken
5ab090f28d Merge remote-tracking branch 'origin/master' v121.3 2020-12-14 22:56:06 -05:00
Anuken
8a5bd7571e 121.3 2020-12-14 22:55:58 -05:00
Fernando
3cb0cc9a3c Brazil is under maintenance (#3898) 
We will be back later
 2020-12-14 20:07:02 -05:00
Anuken
ff93c21269 Merge remote-tracking branch 'origin/master' 2020-12-14 16:31:01 -05:00
Anuken
0512e54df5 Merge remote-tracking branch 'origin/master' 2020-12-14 13:42:52 -05:00
Anuken
cec1eb5608 Fixed jitpack build error 2020-12-14 13:42:48 -05:00
L0615T1C5-216AC-9437
1c6ebd3f6a retire CN from v5 Mindustry (#3977) 2020-12-14 13:31:41 -05:00
Anuken
16f7a8e9d2 Merge remote-tracking branch 'origin/master' 2020-12-14 13:29:59 -05:00
Anuken
889c53dc1b Update SERVERLIST.md 2020-12-14 13:26:42 -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
alex
6286b0b275 Add ALEX v6 servers to servers_v6.json (#3927) 2020-12-13 23:52:15 -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
1c8d368d3b Merge remote-tracking branch 'origin/master' 2020-12-13 16:28:32 -05:00