mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 02:15:37 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,337 Commits 4 Branches 160 Tags 2.3 GiB
a393e21326
Commit Graph

10326 Commits

Author SHA1 Message Date
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
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
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
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
SoMall-dumpling
f20b9c828c
Update Blocks.java (#5939) 
simplest integer ratio
 2021-09-04 22:30:07 -04:00
Anuken
0331d8c6c4 Fixed #5937 2021-09-04 20:37:26 -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
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
buthed010203
c209b0bdaf
add statustable name to hudfragment (#5904) 2021-09-04 11:05:06 -04:00
Matthew Peng
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 Peng
b004146015
Input liquid drawing for DrawLiquid and DrawMixer (#5906) 2021-09-04 10:18:44 -04:00
CancerGuy
3901ae1720
change (#5923) 2021-09-04 10:14:40 -04:00
buthed010203
2dffd525a3
remove useless method call (#5912) 
sector.hasBase() already checks that save != null
 2021-09-04 10:14:04 -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
Кирилл Алдашкин
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 Peng
9b28eaa3b3
Allow for SingleTypeGenerators to use only liquid. (#5900) 2021-08-30 08:23:58 -04:00
Matthew Peng
2f47f13ef7
Adjustable generateEffect randomness (#5901) 2021-08-29 22:55:52 -04:00
Anuken
80acea4708 #5897 with proper formatting 2021-08-29 16:25:26 -04:00
Anuken
cc689fd114 Fixed #5895 2021-08-29 10:26:39 -04:00
Anuken
be5d9154a7 Merge remote-tracking branch 'origin/master' 2021-08-29 09:12:08 -04:00
Anuken
bb9d7fedf7 Fixed #5894 2021-08-29 09:12:03 -04:00
Matthew Peng
71f064bda1
Shouldn't shorten() also reset the counter? (#5890) 2021-08-29 08:28:38 -04:00
Anuken
e30d7e998d Allow unit icons for sectors 2021-08-28 20:49:39 -04:00
Anuken
a3270dd908 this turned out to be pretty difficult 2021-08-28 16:29:58 -04:00
Anuken
48d568978b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/entities/Damage.java
 2021-08-28 14:17:29 -04:00
Anuken
9a7324ce54 Fixed #5887 2021-08-28 14:17:01 -04:00
Darkness6030
d254d971a9
Add unitSpawnEvent (#5876) 2021-08-28 10:53:19 -04:00
SMOLKEYS.exe
800f0f4511
inconspicuous OCD goes to brazil (#5884) 2021-08-28 09:13:57 -04:00
Matthew Peng
60b2842d82
Rotator spinSpeed (#5881) 2021-08-28 08:47:11 -04:00
Matthew Peng
f8c7ff0159
Damage.damage doesn't properly convert cores (#5882) 
* `Damage.damage` doesn't properly convert cores

* Well that was a complete failure
 2021-08-28 08:46:08 -04:00
Anuken
4d62b0321f Fixed #5885 2021-08-28 08:44:42 -04:00
Anuken
6ca2855365 Fixed RailBulletType effect length 2021-08-27 22:33:56 -04:00
Anuken
ced97888e4 why 2021-08-27 21:51:37 -04:00
Zelaux
9f68fe520b
Fixed incorrect work of TextureRegion.found() when creating icons (#5879) 
* Fixed incorrect work of TextureRegion.found() when creating icons

* fixed comment text

* fixed comment text
 2021-08-27 11:08:04 -04:00