mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 04:09:07 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,306 Commits 4 Branches 160 Tags 2.3 GiB
946bba63d0
Commit Graph

12306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
946bba63d0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-19 23:52:06 -04:00
Anuken
3a3622bb58 Boss status color fix 2021-08-19 23:42:27 -04:00
Anuken
38ec05807a Disallow logic-building invalid blocks 2021-08-19 23:32:21 -04:00
Anuken
5d4ab9ecd7 Added max units field for wave editor 2021-08-19 23:26:39 -04:00
Anuken
efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken
148c95e1f2 Crash fix 2021-08-19 22:03:19 -04:00
Anuken
9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken
0ab5f5bb14 hide hidden units in menu 2021-08-19 21:29:50 -04:00
Anuken
f1207fd3f1 Disposable containers for unloaders 2021-08-19 20:45:48 -04:00
Anuken
90826b7064 Boiling point implementation 2021-08-19 20:39:49 -04:00
Anuken
4b14008080 Fixed #5812 2021-08-19 17:50:31 -04:00
Anuken
a39f2bd3a9 wip 2021-08-19 17:46:10 -04:00
Anuken
e23054d606 Better support for disabling omniMovement 2021-08-19 16:29:49 -04:00
Anuken
dc5ca76df0 Merge remote-tracking branch 'origin/master' 2021-08-19 14:20:22 -04:00
Anuken
a8b423836e Added unit decal system for mods/future units 2021-08-19 14:20:18 -04:00
Volas171
a4bd160995
omegahub ip change (last) (#5807) 2021-08-19 10:43:58 -04:00
Anuken
558ee579e1 BlockIndexer null team fix 2021-08-19 09:37:12 -04:00
Anuken
a67b7a6e77 Liquid puddle draw override 2021-08-19 09:21:25 -04:00
Anuken
53eba2fb6a Asteroid clip size fix 2021-08-18 21:39:51 -04:00
Anuken
41829b8660 Fixed #5803 2021-08-18 20:10:14 -04:00
Anuken
1d32680ab2 sprite tweaks 2021-08-18 20:09:59 -04:00
Anuken
b8eaabe0de Fixed #5802 2021-08-18 18:55:36 -04:00
Anuken
a94735c5a5 Remote unlock tweaks 2021-08-18 17:52:59 -04:00
Anuken
130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -04:00
Anuken
ba48373bbc Game stats cleanup 2021-08-18 16:39:20 -04:00
Anuken
f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Anuken
512b65a592 Merge remote-tracking branch 'origin/master' 2021-08-18 13:50:05 -04:00
Anuken
103ee371bd Fixed #5800 2021-08-18 13:49:59 -04:00
buthed010203
179f44cd37
// (#5798) 2021-08-18 12:52:12 -04:00
Anuken
1bf173b1ee Merge remote-tracking branch 'origin/master' 2021-08-18 11:41:44 -04:00
Anuken
356c2cfa80 Fixed #5797 2021-08-18 11:41:38 -04:00
kituta
5b61a183cd
Update bundle_ja.properties (#5376) 
* Update bundle_ja.properties

* Update bundle_ja.properties

Minor corrections and additions

* Update bundle_ja.properties

* Update bundle_ja.properties

Add 2 lines

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update bundle_ja.properties

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>
 2021-08-18 10:45:39 -04:00
Xasmedy
d5e1b47b52
Adding M.D.N. Hub (#5795) 2021-08-18 10:25:46 -04:00
Anuken
63795d9df8 public AI fields 2021-08-17 22:06:29 -04:00
Anuken
8e179552ec pointless casts begone 2021-08-17 21:45:13 -04:00
Sunny Kim
d1271f3e4b
Boss (Guardian) Status Sprite (#5773) 
* boss status

* almost forgot

* Update bundle_ko.properties
 2021-08-17 18:00:00 -04:00
buthed010203
24e6f5b841
remove stray newline (#5788) 
its ugly
 2021-08-17 17:59:15 -04:00
Alexander397172YT
7118c972a8
Update servers_v6.json (#5790) 2021-08-17 17:54:29 -04:00
Anuken
e4742133ca Made various fields/methods public 2021-08-17 17:23:02 -04:00
Anuken
ada6ef229c Merge remote-tracking branch 'origin/master' 2021-08-17 11:39:03 -04:00
Anuken
f0c0900770 Lambda memory allocation optimizations 2021-08-17 11:38:57 -04:00
Michael McMahon
a4a6eb6cee
Command-line-tools link (#5789) 
Link specifically to the `Command line tools only` section instead of the complete Android Studio package.
 2021-08-17 08:27:36 -04:00
RebornTrack970
362c7d38a6
Omega Hub Server Update 2 (#5782) 
Every Server (exept Rush and expansion) is fixed
 2021-08-16 20:22:13 -04:00
Anuken
7b4d488b11 UI cleanup 2021-08-16 20:06:50 -04:00
Anuken
0c5f781702 Sector wave spawning fixes 2021-08-16 13:15:14 -04:00
Anuken
ff5c48a2a0 Merge remote-tracking branch 'origin/master' 2021-08-16 10:34:53 -04:00
Anuken
1a55f19ab2 Fixed #5774 2021-08-16 10:34:48 -04:00
JrTRinny
59456b67a1
payload source and void descriptions (#5778) 2021-08-16 08:22:03 -04:00
buthed010203
1a12510081
Closes #5777 (#5779) 
I did a dumb
 2021-08-16 08:15:20 -04:00
Anuken
d83f48891a Fixed #5774 2021-08-15 22:23:31 -04:00