Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,048 Commits 4 Branches 180 Tags
268a87a6c0cbb12076be79468caedd8939077d2a
Commit Graph
11870 Commits
Author SHA1 Message Date
Anuken b48c78a50a Merge remote-tracking branch 'origin/master' 2022-09-26 10:56:15 -04:00
Anuken dec2642434 Fixed #7628 2022-09-26 10:56:10 -04:00
Даркнесс#3729andGitHub 04a75d14b1 remove enabled() check in getMod() method (#7625) 2022-09-25 13:26:17 -04:00
Anuken edaa0652bd Merge remote-tracking branch 'origin/master' 2022-09-25 07:11:26 -04:00
Anuken 4735e28aad Fixed #7622 2022-09-25 07:11:21 -04:00
nullandGitHub fd0d4fb097 why is this hardcoded anyway (#7617) 2022-09-24 07:49:54 -04:00
Anuken b26f7625d8 Cleanup 2022-09-23 16:24:51 -04:00
hortiSquashGitHubcitrusMarmeladeAnuken
 		1d971231ca Support of mods with textures in different resolution (HD or low-res) (#7602) 
* HDustry - scl() & private map

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

* MEEP stop doing stuff when i work

<3 <3

* Replaced Draw.scl

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-09-23 16:21:53 -04:00
Anuken 8b9cbc2c7c BuildVisibility non-enum / Canvas is now shown 2022-09-23 12:27:44 -04:00
Anuken 710fd3484f Fixed #7607 2022-09-22 09:32:08 -04:00
Anuken e56f207160 Moved logo back over menu 2022-09-21 12:42:10 -04:00
Anuken 4c8c0efd0c Made Corvus/Vela no longer stop to shoot with command AI 2022-09-20 22:51:38 -04:00
Anuken 9b7ac713ee DefenderAI tweaks 2022-09-20 21:54:57 -04:00
Anuken 7f5095921a Mod pregenerated meta option 2022-09-20 21:50:44 -04:00
Anuken ac93539a5c Merge remote-tracking branch 'origin/master' 2022-09-20 15:27:17 -04:00
Anuken 7aaf5e477b Fixed treads on modded units 2022-09-20 15:27:11 -04:00
MnemotechnicanandGitHub 10d989fbc2 Support for custom menu buttons (#7595) 
* added support for custom main menu buttons

* layout fix

* ...and yet another fix

* removed another unneccesary table, which was causing issues

* actually, it looks better with even and odd buttons swapped

* made the container a scroll pane, needs some testing...

* this seems to work correctly

* render the logo under the menu buttons

* rename Buttoni to MenuButton
 2022-09-20 11:25:56 -04:00
MEEPofFaithandGitHub a8bed595c3 Fix Variable Reactor power output (#7600) 2022-09-20 08:43:05 -04:00
Anuken 3eb6061358 Slightly better planet icon 2022-09-19 11:37:47 -04:00
Anuken e4fe0c24c1 Merge remote-tracking branch 'origin/master' 2022-09-18 23:33:57 -04:00
Anuken cbd38003b1 Added initial campaign selection dialog 2022-09-18 23:33:47 -04:00
Mythril382andGitHub 991d98b718 add a display field to weapons just like abilities (#7591) 
* weapo

* that
 2022-09-18 07:50:27 -04:00
buthed010203andGitHub d66a3b80ae Fix javaPath not looking for .exe (#7590) 
I never tested this on windows and finally decided to get to the bottom of all the weird reports ive been getting
 2022-09-17 22:37:00 -04:00
Anuken c46c99bb08 Fixed #7589 2022-09-17 22:36:40 -04:00
MEEPofFaithandGitHub 9d6b08a15d Hide Items on Planets Field (#7550) 
* Hide item on planet field

* Better name, Planet[] instead of String[]

* a
 2022-09-16 12:20:43 -04:00
Anuken bdf3bea2a4 Tantros is hidden now 2022-09-16 11:22:47 -04:00
Anuken 942a3796d7 Hide missiles on minimap 2022-09-16 08:59:28 -04:00
Anuken a0535395eb Unlinked global items of Serpulo and Erekir 2022-09-15 17:06:35 -04:00
Anuken ad858c74ad Merge remote-tracking branch 'origin/master' 2022-09-14 19:39:14 -04:00
Anuken bbb612d3cc Added missing Erekir tech to tree 2022-09-14 19:39:09 -04:00
Даркнесс#3729andGitHub 8a50aa931b Why it uses name instead of id? (#7562) 2022-09-14 18:26:15 -04:00
MEEPofFaithandGitHub 918eb1bafe Fix ContinuousLiquidTurret not changing bullets when changing liquids. (#7561) 
* Wrong liquid, don't keep bullet alive.

* Better transition

* Annihilate unnecessary code duplication

* Further reduce duplicated code

* Unnecessary imports
 2022-09-14 10:50:23 -04:00
Anuken 38d96a26f3 Random attempts to fix Android game freeze 2022-09-14 10:28:18 -04:00
Anuken 8c0b03b17a Fixed wrapping issue 2022-09-14 07:56:49 -04:00
Anuken bf8ebb773e Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-09-12 19:47:58 -04:00
Anuken a45c0f4a42 Added crystalline stone vent variant 2022-09-12 19:47:54 -04:00
MEEPofFaithandGitHub cd6332900b Fix things being detached from mech sway. (#7480) 2022-09-12 09:59:18 -04:00
MEEPofFaithandGitHub 7189be69b0 killShooter + shootOnDeath Causes Double Firing (#7524) 
* Store building pos instead of start pos

Fix an explosion hitting the same building multiple times if it's larger than 1x1.

* Increment total shots before spawning bullet

Fixes `killShooter` triggering the `shootOnDeath` shot.

* Revert "Store building pos instead of start pos"

This reverts commit bfd04e2683.
 2022-09-12 09:41:43 -04:00
Anuken 77ddbd027a Misc bugfixes and tweaks 2022-09-10 15:49:58 -04:00
Anuken b2e960a038 Minor smooth movement tweak 2022-09-10 15:06:20 -04:00
Anuken abb92350c0 Fixed strange smooth movement of fast ground units 2022-09-10 15:02:55 -04:00
Anuken 3acb449205 #7521 with len checks 2022-09-09 18:07:52 -04:00
Anuken 979509acce Merge remote-tracking branch 'origin/master' 2022-09-09 14:28:45 -04:00
Anuken f3002ef7c1 Fixed #7536 2022-09-09 14:28:36 -04:00
MEEPofFaithandGitHub 2f5f984416 Make missile units not be affected by map border. (#7530) 
* Unbounded units

* Unbound missiles
 2022-09-08 12:58:29 -04:00
MEEPofFaithandGitHub b7e8c211f7 Countdowns on other objectives. (#7528) 
* Destroy units objective countdown

* Countdown on other objectives
 2022-09-07 22:50:06 -04:00
MEEPofFaithandGitHub 31149c08ea More control over wave sending (#7442) 
* Wave send rule

* Send natural wave command

* Use a boolean

* boolean selection

* Revert "boolean selection"

This reverts commit 01e7a8f0e0.

* Natural wave last

* I don't see why it wouldn't
 2022-09-07 18:54:26 -04:00
Anuken 687bc11e54 Merge remote-tracking branch 'origin/master' 2022-09-07 08:56:45 -04:00
Anuken 51d4853351 Fixed #7525 2022-09-07 08:56:41 -04:00
WayZerandGitHub 5c1e3a2862 Add WorldBeforeLoadEvent and WorldEndLoadEvent (#7523) 
* Add `WorldBeforeLoadEvent` and `WorldEndLoadEvent`

* rename
 2022-09-07 08:24:31 -04:00