Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,011 Commits 4 Branches 180 Tags
70cf55f31408dff86d62e2cd3fb583d32e6a9ef1
Commit Graph

13011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darkness#3729
d89184da43 [RU] Translation of save search & map search (#6219) 2021-10-26 10:46:29 -04:00
Anuken
898bddee7c Merge remote-tracking branch 'origin/master' 2021-10-26 09:52:07 -04:00
Anuken
860e4a2999 Clamp pixelator FBO size 2021-10-26 09:52:02 -04:00
Valeriy
39ef3ab4ce My fault (#6236) 
Anuke, excuse me plz.
 2021-10-26 09:51:03 -04:00
Valeriy
e57f4c9877 Rebeanding SMoA (#6235) 
I think, comments is less
 2021-10-26 09:19:13 -04:00
Anuken
471fdd61b1 klmnbsdfhx 2021-10-25 22:09:18 -04:00
Anuken
bc0b9e9eb3 plasma bore 2021-10-25 20:51:45 -04:00
Phinner
30214e68b3 Add Xpdustry to V7 server list... (#6173) 
They want a V7 server, I say why not ? Mindustry can run on a potato after all...
 2021-10-25 19:30:00 -04:00
hortiSquash
59a480cb30 hortiloaders 1.0.3.0 bug fix (#6233) 
* hortiloaders 1.0.3.0 bug fix

it didnt unload from StackConveyors/Storage when they had the same loadfactor as the factory

* unloader fix, using fields
 2021-10-25 18:22:56 -04:00
Zelaux
46c6a6f6f7 Fixed using wrong weapon outline height (#6228) 2021-10-24 20:56:15 -04:00
Anuken
d01404d7ca intellij stop 2021-10-24 18:09:00 -04:00
Anuken
f347ab4714 WIP core bastion 2021-10-24 18:08:07 -04:00
Anuken
b6acf1af0a Comparator cleanup 2021-10-24 15:18:21 -04:00
Anuken
b19691078f a 2021-10-24 15:14:43 -04:00
hortiSquash
16f4e300a8 fixed the full factory priority bug (#6211) 2021-10-24 15:14:36 -04:00
Anuken
b18b4cdc90 Fixed #6222 2021-10-23 19:59:20 -04:00
Anuken
aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken
255f97dc56 breach 2021-10-23 17:32:58 -04:00
Anuken
79d90ca75d Merge remote-tracking branch 'origin/master' 2021-10-23 14:35:59 -04:00
Anuken
b2b47353bf Fixed kotlin daemon randomly crashing 2021-10-23 14:35:54 -04:00
Anuken
693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
lifestarse
b7fe2bedae Update servers_v7.json (#6214) 
lostdustry.northeurope.cloudapp.azure.com
 2021-10-23 14:22:01 -04:00
Anuken
553333b656 Beam drill bugfixes 2021-10-23 11:27:25 -04:00
Anuken
00e1d69348 Merge remote-tracking branch 'origin/master' 2021-10-23 09:26:35 -04:00
Anuken
88d1165909 Fixed #6220 / Fixed #6217 2021-10-23 09:26:30 -04:00
TranquillyUnpleasant
b22efb8c83 fix block picker working while logic dialog is open (#6215) 2021-10-22 18:52:08 -04:00
Anuken
a7c78c4193 Bundle case fixes 2021-10-22 18:17:25 -04:00
TranquillyUnpleasant
5c5acb2d48 Saved games search & Mapsearch filter improvements (#6194) 
* better filter menu

* remove unused bundle property

* indent

* Add text instead of using labels

* Saved game search

* Save not map

* auto cursor to search bar

* change icon to terrain
 2021-10-22 18:14:33 -04:00
Anuken
414f27a3b6 Merge remote-tracking branch 'origin/master' 2021-10-22 17:47:22 -04:00
Anuken
009eea1988 Cloud rendering overlap fix 2021-10-22 17:47:17 -04:00
hortiSquash
c9eed5a936 horti and the better unloaders (#6201) 
* hortiloaders 0.9.8.1 seq fix

* tiny fixes
added more comments

* a tiny fix, and rewriting of a comment
 2021-10-22 10:57:16 -04:00
Anuken
5d20f3a89b Merge remote-tracking branch 'origin/master' 2021-10-22 09:04:06 -04:00
Anuken
677e0e6f58 Fixed #6207 2021-10-22 09:04:00 -04:00
Fernando
49c64faece Update servers_v6.json and servers_v7.json (#6206) 
* Update servers_v6.json

Update IPs

* Update servers_v7.json
 2021-10-21 14:46:13 -04:00
JrTRinny
f944d3d579 deselectable content selection UI (#6205) 2021-10-21 12:40:34 -04:00
Anuken
4dc2164468 Merge remote-tracking branch 'origin/master' 2021-10-21 12:11:59 -04:00
Anuken
e9612ce9f0 Fixed #6203 / Minor block requirement changes 2021-10-21 12:11:54 -04:00
Darkness#3729
b19eb3fc04 AdminRequestEvent (#6198) 
* AdminRequest event

* Lol

* Revert
 2021-10-21 09:38:28 -04:00
Anuken
699364580e Added hiddenBuildItems rule 2021-10-20 16:25:24 -04:00
Anuken
085a974350 Cleanup 2021-10-20 14:34:27 -04:00
Anuken
4436a5ced9 An experiment 2021-10-20 14:30:06 -04:00
Anuken
9416f137cb bugfixes 2021-10-20 11:01:47 -04:00
Anuken
d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
 2021-10-20 10:45:51 -04:00
Anuken
a21f6d335f Fixed incorrect waves on serpulo sectors 2021-10-19 18:18:58 -04:00
Anuken
2469cf0851 Added isPayload utility for buildings 2021-10-19 12:13:29 -04:00
Anuken
a82ba0567b Merge remote-tracking branch 'origin/master' 2021-10-19 09:19:51 -04:00
Anuken
6022fcd109 Removed unused iOS splash screen 2021-10-19 09:19:46 -04:00
Fernando
038d132da9 Update servers_v7.json (#6183) 
Add brazillian V7 servers
 2021-10-19 00:13:58 -04:00
buthed010203
52238e3aa4 Remove redundant cast (#6193) 
* Remove redundant cast

* dumb
 2021-10-18 21:57:05 -04:00
MrDuck557
f2ce32cbb2 LogicDisable (#6191) 
* LogicDisable

* I have read CONTRIBUTING.md

I forgot one space

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-10-18 20:17:57 -04:00