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

4233 Commits

Author SHA1 Message Date
Anuken
ae924e6e2b Merge remote-tracking branch 'origin/master' 2022-02-02 11:54:44 -05:00
Anuken
ca6723e696 Light RGB clamp + Arc update 2022-02-02 11:54:39 -05:00
Leonid Skorospelov
0b9483cffc Preserve conveyors end rotation on placement (#6496) 
* Preserve conveyors end rotation on placement

* Formatting
 2022-01-27 14:57:43 -05:00
buthed010203
fa06d2c20b Fix broken powernode Point2[] config (#6531) 
This was broken. I fixed it.
 2022-01-25 10:38:38 -05:00
Sh1p*nfire
d81efe4f71 fix Cyerce's frag keeping owner velocity (#6527) 2022-01-25 10:05:52 -05:00
Matthew (or Maya) Peng
716702623d onConfigureClosed (#6523) 
* onConfigureClosed

* Run the closing of the previous block's config on the opening of another
 2022-01-23 19:34:28 -05:00
Iloveidea
287dc35640 Update LiquidConverter.java (#6507) 2022-01-21 09:46:03 -05:00
Weathercold
4a05c9547a TextSetting (#6503) 
* tile

tile

* > Called right after load()

* TextSetting

* nvm I change the doc instead

* Fixes
 2022-01-18 22:26:24 -05:00
Anuken
cc221d669a Sector bugfix backport 2022-01-17 15:41:45 -05:00
Matthew (or Maya) Peng
795edb2494 Tractor Beam Suction multiplies by timescale twice (#6489) 2022-01-13 15:28:29 -05:00
Matthew (or Maya) Peng
43e857e810 Fix ammo of one item transforming into another. (#6483) 
* Fix ammo transmutation

* Small fixes

* small fix 2

* a

* commit spam aeugh
 2022-01-11 09:29:25 -05:00
Phinner
cd88400154 Better Mod/Plugin dependencies handling (#6328) 
* Dependencies goes brrrr

* mmh, maybe voiding exception in findMeta ?

* Let Anuke code handle everything

I trust the Cat :^)

* My god, I sleep too much...

* Forgot that one...
 2022-01-10 23:43:11 -05:00
Matthew (or Maya) Peng
1d14fa78bf Make ItemEntry's item public (#6474) 2022-01-10 23:38:28 -05:00
Matthew (or Maya) Peng
9825d2f746 Incorrect reset (#6477) 2022-01-08 21:34:12 -05:00
buthed010203
692718d4ea Fix strange behavior of MinerAI (#6454) 
* Fix strange behavior of MinerAI 

See: https://discord.com/channels/391020510269669376/396416151032299521/925110542216073216

> Anuke, is the current behavior of miner ai where it wont mine anything if the item that the core has the fewest of has all of its ores covered?
The only place the hasOre code is used is miner ai so i assume thats a bug?

* Update BlockIndexer.java
 2021-12-28 23:22:01 -05:00
Anuken
2dfa238ff3 More debug stats 2021-12-21 10:33:09 -05:00
Anuken
a093ba5511 Merge remote-tracking branch 'origin/master' 2021-12-21 10:25:54 -05:00
Anuken
24420c4371 Added temporary client debug status methods 2021-12-21 10:25:47 -05:00
Matthew (or Maya) Peng
339d87ad78 Check the status, not the bullet (#6434) 2021-12-13 21:44:54 -05:00
Matthew (or Maya) Peng
052b47fbe4 remove space from perSecond and perMinute (#6435) 2021-12-13 21:44:10 -05:00
Prosta4okua
192588d373 Update LanguageDialog.java (#6431) 2021-12-12 18:15:26 -05:00
Darkness#3729
3a91460e24 Fix (#6414) 2021-12-08 10:01:02 -05:00
Matthew (or Maya) Peng
8e89b24e5b unprivate countOre (#6410) 2021-12-08 00:02:52 -05:00
buthed010203
5c3ecaabb5 Fix incorrect return value (#6401) 
* Fix incorrect return value

the javadoc is a lie

* Update Administration.java
 2021-12-04 20:41:29 -05:00
Matthew (or Maya) Peng
5ea4688e88 get by name (#6396) 2021-12-02 15:43:31 -05:00
Matthew (or Maya) Peng
8cb830ba41 Make MoveLightningAbility alternating a boolean (#6390) 
* Revert "BlueWolf does not want MoveLightningAbility to mirror (#6376)"

This reverts commit e1685ef46c.

* boolean `alternate`

* Better Javadoc description
 2021-11-29 23:05:35 -05:00
Matthew (or Maya) Peng
3819e327e9 Grammar (#6383) 
* Grammar

* English is a terrible language
 2021-11-29 21:15:15 -05:00
Anuken
51fe07daef Backported EnumSet changes 2021-11-29 20:15:13 -05:00
Anuken
dc0904a6c7 Merge remote-tracking branch 'origin/master' 2021-11-29 20:14:05 -05:00
Anuken
feba9d677e Fixed #6389 2021-11-29 20:13:59 -05:00
buthed010203
c055407249 Fix editor camera panning (#6380) 
VSync being disabled will make the camera move unbearably fast currently as it isnt tied to frame time.
 2021-11-26 13:45:27 -05:00
Matthew (or Maya) Peng
e1685ef46c BlueWolf does not want MoveLightningAbility to mirror (#6376) 2021-11-26 11:05:50 -05:00
router
4eca2b4b0b Make updateInUnits description actually readable (#6371) 2021-11-25 15:33:21 -05:00
Anuken
04b1ba31a9 Fixed #6370 2021-11-25 13:29:35 -05:00
Anuken
d4ccbaa6df Merge remote-tracking branch 'origin/master' 2021-11-25 11:33:50 -05:00
Anuken
07696c7f92 Closes #6327 2021-11-25 11:33:44 -05:00
MrDuck557
ccfd062c85 ParticleEffect Rotation (#6323) 
* Additive

* ternary

* copypasta

I missed a total of 4 instances

* anuke has spoken

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-25 11:24:34 -05:00
Anuken
4c36abde28 Fixed payEnter creating ghost units 2021-11-25 11:09:13 -05:00
MrDuck557
25f98fdeb0 engineColor (#6360) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:11:03 -05:00
MrDuck557
f1e9d05163 blinkSize (#6359) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:08:57 -05:00
Anuken
b4cd21752c Merge remote-tracking branch 'origin/master' 2021-11-20 10:58:12 -05:00
Anuken
d1a5198efc Fixed #6351 2021-11-20 10:58:07 -05:00
hortiSquash
fd1678dbc9 Unloading into plast belts - bug fix (#6347) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

* unloader - fix cant load

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-17 09:35:36 -05:00
Matthew Peng
4a7774fe5a Dynamic resupply check (#6338) 2021-11-15 09:27:22 -05:00
Anuken
d23813f328 Merge remote-tracking branch 'origin/master' 2021-11-15 08:24:47 -05:00
Anuken
f586fd285c Fixed #6341 2021-11-15 08:24:39 -05:00
MrDuck557
1c4e6b77b4 DestroyBullet (#6311) 
* DestroyBullet

* one space

* review

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-09 18:10:28 -05:00
LawrenceLin2333
68f8668162 Fix the memory leak when light rendering is disabled (#6321) 2021-11-09 11:10:18 -05:00
Matthew Peng
51730556a5 Batteries can be overdrived. (#6320) 2021-11-08 21:43:00 -05:00
Goobrr
c2b5e4b82b Show internal names (#6317) 
* internal names

* enableConsole

* how did this get left out
 2021-11-08 19:25:17 -05:00