Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,041 Commits 4 Branches 180 Tags
aa018b314d24f8e3b67ba057f5f9a019d5fa57c4
Commit Graph
1245 Commits
Author SHA1 Message Date
Anuken 88d6c4c8f9 Full implementation of #7014 2022-10-04 13:07:23 -04:00
Anuken 49b789fc39 Allow mixtech in sandbox / Beta release tag 2022-10-03 22:23:46 -04:00
Anuken 2822764698 Test fixes 2022-10-01 20:55:30 -04:00
Anuken 48f143a530 Implemented #6493 2022-10-01 18:03:47 -04:00
Anuken 93a08be440 Fixed #7643 2022-09-30 19:27:46 -04:00
MEEPofFaithandGitHub f90bb5b542 Fix tree branch overlap (#7641) 2022-09-30 15:04:36 -04:00
Anuken 85228bad0a Merge branch 'master' of https://github.com/Anuken/Mindustry into map_4 2022-09-28 19:11:10 -04:00
Anuken 713119fb29 Map limit visuals fix 2022-09-28 19:11:02 -04:00
Anuken 48a5ae443f Fixed #7633 2022-09-27 11:57:11 -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 e56f207160 Moved logo back over menu 2022-09-21 12:42:10 -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
Anuken cbd38003b1 Added initial campaign selection dialog 2022-09-18 23:33:47 -04:00
Anuken a0535395eb Unlinked global items of Serpulo and Erekir 2022-09-15 17:06:35 -04:00
Даркнесс#3729andGitHub 8a50aa931b Why it uses name instead of id? (#7562) 2022-09-14 18:26:15 -04:00
Anuken 8c0b03b17a Fixed wrapping issue 2022-09-14 07:56:49 -04:00
Anuken a45c0f4a42 Added crystalline stone vent variant 2022-09-12 19:47:54 -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
JniTrRnyandGitHub ffb3535f56 Generation quick copy & paste (#7520) 
* several UI changes

* block ID bad
 2022-09-05 14:59:21 -04:00
xStaBUxandGitHub c437a98b40 Copied. (#7519) 2022-09-05 13:38:05 -04:00
Anuken 08d5ca1912 Removed shield breaker block 2022-09-04 16:32:13 -04:00
Anuken 1f4372ebc7 Don't allow mixtech in new maps 2022-09-03 11:00:01 -04:00
MEEPofFaithandGitHub e9d3adfef3 Options for SectorPreset overriding plant launch fields. (#7478) 
* Preset overriding loadouts

* a

* You know I should really learn what this actually does
 2022-09-01 20:47:53 -04:00
xStaBUxandGitHub 47d335b629 Better Discord dialog (#7445) 2022-08-25 14:46:49 -04:00
Anuken 43fae3b9e3 Fixed #7382 2022-08-17 10:34:34 -04:00
Anuken a8b8028835 Hide Erekir resources on Serpulo loadout 2022-08-16 07:23:55 -04:00
PhinnerGitHubAnuken
 		4030acbd75 Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

Co-authored-by: Anuken <arnukren@gmail.com>

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Anuken 06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
LunaandGitHub e28dbfad69 Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Anuken e4c6822cca JSON payload stack support 2022-08-11 08:43:58 -04:00
Anuken 6e11418fa4 Fixed #7331 2022-08-09 09:11:11 -04:00
JniTrRnyandGitHub 6a2c6e3a74 the return of deselectable (#7319) 2022-08-07 13:10:12 -04:00
Anuken 9a95754007 Fixed incorrect scaling with command layout 2022-08-01 20:56:37 -04:00
Anuken 36ecb45fb4 Minor UI style tweaks 2022-07-31 13:59:31 -04:00
Anuken 3d0a1868c6 Merge remote-tracking branch 'origin/master' 2022-07-31 11:43:26 -04:00
Anuken 427100c61d Fixed commanded unit UI refresh 2022-07-31 11:43:23 -04:00
Joan JosepGitHubAnuken
 		d029c85ec5 Add Catalan to available languages and start its localisation. (#7076) 
* Add Catalan to available languages and start its localisation.

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update Catalan.properties

* Update Catalan.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundles_ca.properties

* Update bundles_ca.properties

* Update bundle_ca.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-31 10:57:00 -04:00
Anuken a87aa75adb More misc cleanup 2022-07-30 23:06:59 -04:00
Anuken 7df2a7ad43 Fixed #7260 2022-07-30 23:03:54 -04:00
Anuken 55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
Anuken c1971cb5b1 Fixed #7241 2022-07-28 09:30:19 -04:00
Anuken 90e9d37a9a Fixed #7201 2022-07-19 10:59:07 -04:00
Anuken a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Anuken 4b0bc6fe5c Fixed Serpulo cores being used on Erekir 2022-07-17 21:48:33 -04:00
Anuken ebf9e82146 Crash fixes / Mod browser >=136 filter 2022-07-17 10:27:27 -04:00
Anuken c4d5126ac2 Minor bugfixes 2022-07-17 08:48:10 -04:00
Anuken 88e4ca4992 Fixed some portrait layout bugs 2022-07-16 15:30:02 -04:00
Anuken d3210a0831 Misc minor fixes 2022-07-15 20:25:42 -04:00
Anuken 926cf7e0fa Fixed some messed-up objectives 2022-07-15 16:56:34 -04:00
Anuken f1917fea3e Misc formatting 2022-07-15 16:18:11 -04:00