Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,698 Commits 4 Branches 180 Tags
6bf5e8ae1e58d6ef9c170e4662b6d4a1c1120caf
Commit Graph

1223 Commits

Author SHA1 Message Date
Anuken
6bf5e8ae1e WIP logic particle effect instruction 2023-08-02 22:15:44 -04:00
Anuken
660c38db43 Fixed #8887 2023-08-02 21:20:28 -04:00
Anuken
09d00b30e9 Fixed incorrect consumption rate in booster stats 2023-07-29 09:51:58 -04:00
Anuken
7850e61672 Misc bugfixes 2023-07-26 10:31:18 -04:00
Anuken
4998abfe01 Merge remote-tracking branch 'origin/master' 2023-07-23 16:30:49 -04:00
Anuken
636ce4ca94 Better implementation of #8810 2023-07-23 16:30:44 -04:00
Mythril382
bfdd7ecc3a the camper (#8806) 2023-07-23 16:28:50 -04:00
Anuken
ce43af9091 Fixed #8827 2023-07-23 15:59:19 -04:00
Anuken
788fa66a91 Fixed #8819 2023-07-23 15:56:36 -04:00
Anuken
e78fb11c48 Merge remote-tracking branch 'origin/master' 2023-07-23 15:19:31 -04:00
Anuken
135874b922 Fixed #8787 2023-07-23 15:19:21 -04:00
Anuken
3e5898fff1 Disabled team switch outside of sandbox/PvP 2023-07-02 11:06:55 -04:00
Anuken
f17719f08e Fixed #8777 2023-06-29 09:48:26 -04:00
Anuken
ac5526e785 Fixed #8757 2023-06-25 20:04:02 -04:00
Anuken
f74293b878 Merge remote-tracking branch 'origin/master' 2023-06-23 22:51:58 -04:00
Anuken
0e31103b21 Cleanup output stream 2023-06-23 22:51:53 -04:00
router
591c31fd29 Add priority servers, update servers_v7.json (#8720) 
* Update servers_v7.json

* Add priority server outlining and bumping

* a

* chore: A little bit of cleanup :)

* json

* fixed no-server issue

* removed cursed duplication

---------

Co-authored-by: phinner <62483793+Phinner@users.noreply.github.com>
 2023-06-23 14:00:00 -04:00
Anuken
f65edb3468 Fixed #8735 2023-06-20 17:32:38 -04:00
Anuken
a2dd2c88a2 Fixed #8733 2023-06-20 13:09:50 -04:00
Anuken
974d19fb75 Fixed #8729 2023-06-19 13:50:33 -04:00
Anuken
6ed336ad95 Misc fixes 2023-06-17 17:40:29 -04:00
Даркнесс#3729
4e5475f0ed Team improvements (#8704) 
* Update Team.java

* Update ServerControl.java

* better

* kill me please

* kill me please

* kill me please

* Update bundle_ca.properties

* kill me please

* Update bundle_da.properties

* kill me please

* kill me please

* Update bundle_et.properties

* Update bundle_eu.properties

* Update bundle_fi.properties

* Update bundle_fil.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_id_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_lt.properties

* Update bundle_nl.properties

* Update bundle_nl_BE.properties

* Update bundle_pl.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_PT.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_sr.properties

* Update bundle_sv.properties

* Update bundle_th.properties

* Update bundle_tr.properties

* Update bundle_tk.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update World.java

* Update CustomRulesDialog.java

* skill issue

* skill issue x2

* skill issue x3
 2023-06-13 18:54:10 -04:00
Anuken
1928c6db83 Fixed #8710 2023-06-13 16:02:24 -04:00
Anuken
7389a5de7f Cleanup 2023-06-11 23:22:54 -04:00
Anuken
4b0824a20c Admin player team switch + more trace info 2023-06-11 23:18:04 -04:00
Даркнесс#3729
ef0efc84cb Map improvements (#8682) 
* Update Map.java

* Update MapListDialog.java

* Update ServerControl.java
 2023-06-07 09:35:57 -04:00
Даркнесс#3729
ebe965ef40 Better votekick reason input (#8673) 
* Update bundle.properties

* Update PlayerListFragment.java

* Update bundle.properties

* Update bundle.properties
 2023-06-04 20:50:48 -04:00
Alex Gusev
32c146cdf1 Adapt interface to display notch of mac laptops (#8666) 
* Adapt interface to display notch of mac laptops

* `macNotchHeight` as a separate variable, and description for mac notch setting
 2023-06-04 12:43:07 -04:00
frieda666
70bb7aff54 Improvement on votekick (#8664) 
* Add test case for achievement

* Allow admins to cancel votekick & allow players to change vote

* Require reason to start votekick

* Require reason to start votekick

* Update message sent by votekick button
 2023-06-03 23:45:55 -04:00
Slotterleet
38b9027000 Dynamic selection of planet tech in rules dialog (#8487) 
* Dynamic selection of planets in rules dialog

* Code cleanup

* Do not let Anuken/Mindustry#8494 happen again

* Fixed inconsistency with campaign sectors
 2023-06-02 11:41:12 -04:00
JniTrRny
c84ec75c53 Improvements to the Schematics UI (#8605) 
* schematics UI improvements

* better edit tags UI

* visual tweaks

* cleanup

inline obsession
cleanup again...
another little bit of cleanup
a little bit of cleanup
minor cleanup
 2023-06-02 11:37:15 -04:00
Даркнесс#3729
e3ccd5cc2c Load content icons on a headless server (#8650) 
* Update build.gradle

* Update Fonts.java

* Update ServerLauncher.java

* Update ServerLauncher.java

* s stands for shiza

* Update build.gradle
 2023-05-29 13:09:56 -04:00
Anuken
dc63112915 Always hide content when isHidden() == true 2023-05-21 00:57:10 -04:00
Anuken
43d164d54b Map list fixes on phones 2023-05-18 12:21:45 -04:00
Anuken
29855243cb Base building AI is back 2023-05-16 17:24:41 -04:00
Anuken
1289e20990 Native (Zenity) file dialogs for Linux 2023-05-15 11:44:08 -04:00
GlennFolker
aa7ba6548c Move most planet rendering out of PlanetRenderer to Planet (#8608) 
* Planet speaks for itself

* Ok fine keep old Gradle version

* Planet grid mesh builder

* Inline
 2023-05-15 09:59:14 -04:00
Anuken
ccf85b81c8 Fixed map list dialog 2023-05-12 02:23:03 -04:00
Anuken
be751f5b28 Minor cleanup 2023-05-11 15:24:41 -04:00
Anuken
d34631458e Mobile rebuild button support 2023-05-11 13:41:45 -04:00
Anuken
9745c2b7fd Better utilization of JoinDialog UI space 2023-05-11 12:52:32 -04:00
Anuken
38de095a2e Fixed map alignment 2023-05-11 11:59:45 -04:00
Anuken
8c56568f23 Reverted name change to un-break mods 2023-05-11 11:51:57 -04:00
Anuken
d14c42d8ba Disabled annoying X scrolling in map dialogs 2023-05-11 11:39:49 -04:00
Anuken
b3e111ebbb Merged Custom/editor maps implementation 2023-05-11 11:24:42 -04:00
Anuken
c7ad9d0250 Cleanup 2023-05-10 13:05:49 -04:00
Anuken
c5cf6f0af6 Cleanup 2023-05-10 13:00:49 -04:00
xStaBUx
a3dbbe63c4 Better planet selection (#8572) 
* Better AboutDialog

* I'm there!

* New Planet Select UI

* fix

* Better Planet Selection

* no
 2023-05-10 12:54:18 -04:00
JniTrRny
bb06c3f1e9 Wave limit game rule in custom maps (#8550) 
* custom maps wave limit

* whoopsies
 2023-05-06 23:04:31 -04:00
Anuken
43922edac8 unitHealthMultiplier re-implemented 2023-05-03 18:38:50 -04:00