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

12930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
e997768a0a d 2021-09-09 12:08:33 -04:00
itcannotbe
671098cc28 Add Build Cost Multiplier to Distributor (#5967) 
It just makes sense.
 2021-09-09 11:16:47 -04:00
Anuken
1a686c44a1 Fixed editor crash 2021-09-09 09:59:35 -04:00
Anuken
9e737cd3fe Merge remote-tracking branch 'origin/master' 2021-09-08 20:44:31 -04:00
Anuken
deed84f9a3 Public power graph contents 2021-09-08 20:44:26 -04:00
Matthew Peng
868cd4fb0b Just because a generator doesn't have turbines doesn't mean it doesn't have liquid (#5962) 2021-09-08 20:40:56 -04:00
Anuken
a5697a7d4b Fixed mod alpha bleeding not applying correctly 2021-09-08 15:09:05 -04:00
Anuken
2222330b43 Added hint for high threat level sector 2021-09-08 11:23:37 -04:00
Anuken
cde192b59a Added Block#allowConfigInventory 2021-09-08 09:04:04 -04:00
Anuken
c98eb2edd7 Fixed #5958 2021-09-08 08:42:23 -04:00
Anuken
dd7062f0f7 ParticleEffect#sizeInterp / Log usable RAM 2021-09-07 22:32:27 -04:00
Anuken
8adefb7b72 Merge remote-tracking branch 'origin/master' 2021-09-07 17:57:17 -04:00
Anuken
5e13f71fde Minor bugfixes & compatibility fixes 2021-09-07 17:57:03 -04:00
Matthew Peng
d257adf0c1 Show All (#5954) 2021-09-07 15:20:59 -04:00
TranquillyUnpleasant
34d2a0d3a0 Hide all button for units (#5953) 
* Hide all button for units

* Add bundle property
 2021-09-07 13:38:43 -04:00
Matthew Peng
efae0d3b6a Anuke what is this (#5949) 2021-09-06 20:45:42 -04:00
buthed010203
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
CancerGuy
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
Darkness6030
461d87dbef Add HexPvp server to global V6 list (#5940) 2021-09-05 12:03:57 -04:00
TranquillyUnpleasant
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-dumpling
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
Volas171
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
ZestyLemonade
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
Volas171
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