mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 16:37:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
11,399 Commits 4 Branches 160 Tags 2.3 GiB
5fc4e1f5a5
Commit Graph

11399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arik
5fc4e1f5a5
Black Bar Fix (#5079) 2021-04-07 21:07:08 -04:00
MEEP of Faith
24f0a17395
Crawlers do not explode from their center (#5078) 2021-04-07 18:48:34 -04:00
RebornTrack970
08d200e1fa
Moved 2r2t (#5066) 
Now 2r2t is a mindustry host instead of mc.
 2021-04-06 18:08:06 -04:00
Somka000
782442f144
Add .pl server to public list (#5069) 
Minigame server
 2021-04-06 15:55:11 -04:00
buthed010203
7e6f3e3761
Update pr.yml (#5067) 2021-04-06 11:50:49 -04:00
Anuken
6f8d43bc78
typo fix 2021-04-04 12:36:19 -04:00
MEEP of Faith
ad46fa93a5
Ignore VSCode settings (#5054) 2021-04-03 20:39:56 -04:00
Anuken
4fec3bfcf9 PR typo fix 2021-04-03 11:42:47 -04:00
Anuken
ef49a16c9e Use core/src for kotlin source 2021-04-03 11:31:41 -04:00
Anuken
93f3d6039e Excluded comp** from final jar 2021-04-03 11:15:41 -04:00
Anuken
19778c743c Fewer methods 2021-04-03 01:28:19 -04:00
Anuken
28a2e7c697 Kotlin support fixes 2021-04-03 00:59:57 -04:00
Max Leibowitz
d538e63c4c :) 2021-04-02 17:26:58 -07:00
Max Leibowitz
31f8d6c830 Move to kapt for annotation processing (allows kotlin to be used in the core module) 2021-04-02 17:25:07 -07:00
GaviTSRA
02e68d27a3
Added TSR Hub to serverlist (#4965) 
* Added TSR Hub to serverlist

* Update servers_v6.json

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

* Update servers_v6.json

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

* Updated hub ip

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2021-04-02 10:37:58 -04:00
Anuken
0aa2d5f18c Merge remote-tracking branch 'origin/master' 2021-04-01 09:27:43 -04:00
Anuken
5a5854420e Long support for UI.formatAmount 2021-04-01 09:27:36 -04:00
TranquillyUnpleasant
6a8127e7cd
un-escape \n for string configs. (#5042) 
Currently it escapes them to a literal text, making multi line messages impossible.
 2021-04-01 09:14:20 -04:00
Anuken
1bd4c96ee8 Power node placement fixes 2021-03-31 22:36:46 -04:00
Anuken
d66d7e09e3 Explosion damage tweaks 2021-03-31 13:28:08 -04:00
Anuken
e85e43c162 Disable blending when drawing displays 2021-03-31 11:18:17 -04:00
Anuken
dee020bd71 Merge remote-tracking branch 'origin/master' 2021-03-31 09:52:35 -04:00
Anuken
d548a11c60 Skip invalid lobbies 2021-03-31 09:52:31 -04:00
RebornTrack970
59bf2e3571
Updated Server Omega (#5031) 
Moved Expansion and fixed immesureable ping.
 2021-03-31 09:46:14 -04:00
Anuken
6ebabbb56a Fixed local games sometimes not being found on Steam 2021-03-31 09:42:44 -04:00
Anuken
179cedd6cc Merge remote-tracking branch 'origin/master' 2021-03-30 20:58:20 -04:00
Anuken
3b56f36bbd Fixed #5029 2021-03-30 20:58:13 -04:00
buthed010203
be0765f5ea
Radar shouldn't sense derelict as enemies (#5027) 
Turrets no longer shoot derelict units by default, they shouldn't be sensed as enemies if this is the case.
 2021-03-30 11:58:53 -04:00
Anuken
1715741e37 arc 2021-03-30 11:06:39 -04:00
Anuken
aaa41fbf72 copyNatives before iOS copyAssets 2021-03-30 10:42:51 -04:00
Anuken
2096d006be Merge remote-tracking branch 'origin/master' 2021-03-30 10:24:57 -04:00
Anuken
e455f7d170 Fixed #5025 2021-03-30 10:24:53 -04:00
MEEP of Faith
7a0e772a05
Remove space between damage and /sec (#5024) 2021-03-30 10:22:08 -04:00
Anuken
7f3b8f7e56
jitpack is dead 2021-03-29 20:35:07 -04:00
Anuken
5a493ebf0e arc 2021-03-29 19:05:55 -04:00
Anuken
70bcb0a940 copyNatives task for iOS 2021-03-29 18:33:03 -04:00
Anuken
3105478328 Merge remote-tracking branch 'origin/master' 2021-03-29 15:06:21 -04:00
Anuken
ae8833e679 Fixed rare schematic crash 2021-03-29 15:06:06 -04:00
OSP
afbac48a45
Change ip hub (#5014) 
transition to new hosting
 2021-03-29 09:38:56 -04:00
Anuken
4a9eeeeac3 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-03-28 19:56:20 -04:00
liuxilu
e7d9cddbae
update zh-CN for logic hints (#4655) 
* add new logic hints to zh-CN

* logic hints for zh-CN completed

* more hints and fix

* draw operations

* update command hint

* 载荷

* up to d7f848f
 2021-03-28 18:44:29 -04:00
YellOw139
a6fe1275c7
[Bundle][RO] Update (#4860) 
* [Bundle][RO] Update

This PR ~~was~~ will soon be tested in-game ~~and is ready to merge at any time~~.

Changelog:

- New strings/changes up to commit b75a8d5260
- Typo fixes & various other improvements

* Status effects

* Minor change

* Improve, adapt

* After test bundles be like

* cleanup

* typo

* options, options...

* Added block_info keybind name
 2021-03-28 18:42:50 -04:00
Prosta4okua
2f3fd9de3b
[Bundle][uk_UA] Update Ukrainian (#4868) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

03.06.2021

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-03-28 18:42:41 -04:00
MEEP of Faith
8b2e78ab1e
maxRange overriding on laser bulllets (#4873) 2021-03-28 18:42:26 -04:00
Catchears
d04eaa81e0
german translation (#4897) 
* update german translation to b75a8d5260

* update german translation to 8e52d8a272

* foreshadow improvements

* block info keybind
 2021-03-28 18:41:06 -04:00
cinnx
b71d5837e9
Update bundle_pl.properties (#4910) 
Added missing part of the translation from the English bundle file, fixed a lot of typos.

Huge thanks to:
Somka#9325
count sudoku#9564
Zielony Trójkąt#9074
for pointing out those errors :D
 2021-03-28 18:40:55 -04:00
MEEP of Faith
332b1ce100
collidesGround targetting in GroundAI (#4911) 2021-03-28 18:40:47 -04:00
Vanguard
c17040b1ab
[Bundle][RU] Update (#4927) 
* 21 new, 4 changed, 4 deleted

New:
status.burning.name
status.freezing.name
status.wet.name
status.muddy.name
status.melting.name
status.sapped.name
status.spore-slowed.name
status.tarred.name
status.overclock.name
status.shocked.name
status.blasted.name
status.unmoving.name
stat.opposites
stat.damagemultiplier
stat.healthmultiplier
stat.speedmultiplier
stat.reloadmultiplier
stat.buildspeedmultiplier
stat.reactive
bullet.lightning
content.status.name

Changed:
wavemode.health
boss.health
rules.blockhealthmultiplier
rules.unithealthmultiplier

Deleted:
bullet.sapping
bullet.shock
bullet.freezing
bullet.tarred

* 1 new line

keybind.block_info.name
 2021-03-28 18:38:50 -04:00
Sharlotte
a3bd7ba3ad
[KO]Update Bundle (#4935) 2021-03-28 18:38:44 -04:00
MEEP of Faith
2a7525cdf1
Allow for dynamic counting (#4988) 2021-03-28 18:38:16 -04:00