Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,264 Commits 4 Branches 180 Tags
v143.1
Commit Graph
16264 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
buthed010203andGitHub a393e21326 remove redundant Core.bundle.get (#5947) 2021-09-06 15:08:22 -04:00
Anuken 5641b4901c Easier stained mountains guardian 2021-09-05 23:01:26 -04:00
Anuken 4da21ba363 Added cliff support to editor 2021-09-05 20:08:02 -04:00
Anuken 00eca00f11 space payloads 2021-09-05 19:04:04 -04:00
Anuken 508abba2ec Merge remote-tracking branch 'origin/master' 2021-09-05 18:00:21 -04:00
Anuken 87ff876db3 Take block timeScale into account for sector damage 2021-09-05 18:00:16 -04:00
CancerGuyandGitHub 4720f1b876 Add files via upload (#5943) 2021-09-05 17:06:00 -04:00
Anuken e35d09fe62 Merge remote-tracking branch 'origin/master' 2021-09-05 12:07:20 -04:00
Anuken fb74dfa02f Default visualElevation for ships 2021-09-05 12:07:15 -04:00
Darkness6030andGitHub 461d87dbef Add HexPvp server to global V6 list (#5940) 2021-09-05 12:03:57 -04:00
TranquillyUnpleasantandGitHub cf5d172922 Wave graph y axis refactor (#5926) 
* Y axis refactor

* Fix formatting inconsistencies

* Make style match xml
 2021-09-05 11:21:49 -04:00
Anuken 227fb388b8 Update building consume module before main update 2021-09-05 11:18:31 -04:00
Anuken dedfd8efd3 Cloud improvements 2021-09-05 11:10:36 -04:00
Anuken 9feedabf07 Serpulo clouds, now with 2 layers 2021-09-05 01:18:50 -04:00
Anuken ed86f50a2f Serpulo clouds 2021-09-05 00:42:47 -04:00
Anuken e958cce816 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/Planet.java
 2021-09-04 23:29:02 -04:00
Anuken 89d495fdb1 Merge remote-tracking branch 'origin/master' 2021-09-04 23:28:20 -04:00
Anuken 82e659dd80 Planet rendering infrastructure stuff 2021-09-04 23:28:15 -04:00
Anuken 393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
SoMall-dumplingandGitHub f20b9c828c Update Blocks.java (#5939) 
simplest integer ratio
 2021-09-04 22:30:07 -04:00
Anuken efe5668c5a Merge remote-tracking branch 'origin/master' 2021-09-04 20:37:31 -04:00
Anuken 0331d8c6c4 Fixed #5937 2021-09-04 20:37:26 -04:00
Volas171andGitHub 15882016ca 🤦 (#5936) 2021-09-04 18:07:29 -04:00
Anuken b4b9a44126 Merge remote-tracking branch 'origin/master' 2021-09-04 18:07:15 -04:00
Anuken 063d2ce6c0 Implemented #5905 properly 2021-09-04 18:07:08 -04:00
ZestyLemonadeGitHubsample-text-here
 		3985620289 space-begone (#5935) 
Co-authored-by: sample-text-here <kjdshkasjhdfkj@jashdkaj.ksdh>
 2021-09-04 17:43:03 -04:00
Anuken 23d0dfe6bf Deprecated DoubleOverlayFloor 2021-09-04 16:29:14 -04:00
Anuken 0a5b1d1380 Merge remote-tracking branch 'origin/master' 2021-09-04 15:23:53 -04:00
Anuken 24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Volas171andGitHub 57cd20e2a1 update mindustry reborn v7 (#5933) 
* update mindustry reborn ip

* i forgo-
 2021-09-04 12:49:11 -04:00
Anuken ed1d4414a0 Payload conveyors are magnetic 2021-09-04 12:27:15 -04:00
Anuken dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
Anuken 3f49807348 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-09-04 11:27:29 -04:00
Anuken 13ddca750a arc 2021-09-04 11:27:26 -04:00
buthed010203andGitHub c209b0bdaf add statustable name to hudfragment (#5904) 2021-09-04 11:05:06 -04:00
Matthew PengandGitHub 264052a95f Remove the slight delay in wind3.ogg (#5909) 
* Remove the slight delay in `wind3.ogg`

* Don't need to export the quality that high
 2021-09-04 10:26:42 -04:00
Matthew PengandGitHub b004146015 Input liquid drawing for DrawLiquid and DrawMixer (#5906) 2021-09-04 10:18:44 -04:00
CancerGuyandGitHub 3901ae1720 change (#5923) 2021-09-04 10:14:40 -04:00
RebornTrack970GitHubVolas171
 		bcf798c247 Moved All OmegaHub servers from all Nodes to N5 (#5917) 
* Moved All OmegaHub servers from all Nodes to N5

* Update servers_v7.json

* v6 life matters!

* Update servers_v6.json

* Update servers_v7.json

Co-authored-by: Volas171 <60143910+Volas171@users.noreply.github.com>
 2021-09-04 10:14:16 -04:00
buthed010203andGitHub 2dffd525a3 remove useless method call (#5912) 
sector.hasBase() already checks that save != null
 2021-09-04 10:14:04 -04:00
QmelZandGitHub d31389efca remove space (#5929) 2021-09-04 10:12:13 -04:00
Anuken ee8683c734 Do not display overdrive visual for router/conduit 2021-09-04 10:07:13 -04:00
Anuken 8224cc3fce Fixed #5922 2021-09-04 10:03:40 -04:00
Anuken 94a340d3ee Merge remote-tracking branch 'origin/master' 2021-09-04 09:59:32 -04:00
Anuken f8048be429 Fixed #5918 2021-09-04 09:59:28 -04:00
Кирилл АлдашкинandGitHub 3714077fbe Fixed the display of the oil extractor efficiency (#5915) 2021-09-04 09:58:38 -04:00
Anuken 6984be2172 Merge remote-tracking branch 'origin/master' 2021-09-04 09:55:28 -04:00
Anuken 48f359ca9b Fixed #5907 2021-09-04 09:55:23 -04:00
Matthew PengandGitHub 9b28eaa3b3 Allow for SingleTypeGenerators to use only liquid. (#5900) 2021-08-30 08:23:58 -04:00
Matthew PengandGitHub 2f47f13ef7 Adjustable generateEffect randomness (#5901) 2021-08-29 22:55:52 -04:00