mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 17:58:21 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,282 Commits 4 Branches 160 Tags 2.3 GiB
130f32f3cd
Commit Graph

12282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -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
Anuken
747c6186d4 DesktopLauncher -debug argument 2021-08-15 22:17:17 -04:00
Anuken
b3ef412368 Extra debug logging for mod pack 2021-08-15 21:59:57 -04:00
MrTnT 2.0
bfdcb971fc
Update servers_v6.json (#5748) 
* Update servers_v6.json

* Update servers_v6.json
 2021-08-15 21:26:19 -04:00
YellOw139
487bc1866a
[Bundle][RO] Update (#5668) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 5ca5025fb1
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Update bundle_ro.properties

* progress

* derelict

* typo

* Update bundle_ro.properties

* Update bundle_ro.properties

* teamwork

* []

* AI

* Агрессоры

* sector info

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties
 2021-08-15 21:24:27 -04:00
Thomas Widyantoko
0b99d71bd4
[ID] v7 prealpha translation (#5669) 
* Indonesian bundle update

lenum.controller description and Tar Fields map

* translation bundle sync

* Indonesian translation standardization

* healing status effect

* Indonesian translation for V7

bit confused on line 1611

* [ID] WIP polygonal core protection

* [ID] Updates Indonesian V7 translation

Logic wait & content look up instructions

* [ID] v7 prealpha translation

draft 1

* [ID] v7 prealpha translation part 2

Fixed a line and made changes to untranslated lines.
 2021-08-15 21:24:13 -04:00
Sharlotte
8d811550e2
Update bundle_ko.properties (#5680) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* They don't like unofficial properties h

* Update bundle_ko.properties

* translated b80129e17b (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 7e047ef726 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 1cf2bd4892 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), a5fe8970c6 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 1b0de739f9 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c)
* marged from https://github.com/Anuken/Mindustry/pull/5731
 2021-08-15 21:24:07 -04:00
JrTRinny
09486946fc
Update bundle_th.properties (#5694) 
* Update bundle_th.properties

* banned unit

* better environment block name

* craters fix + color

* name consistensies

* add new updates
 2021-08-15 21:23:56 -04:00
RebornTrack970
3f988cec72
TR Translate (#5770) 2021-08-15 21:23:18 -04:00
Anuken
c35dde5569 Fixed #5772 2021-08-15 21:17:16 -04:00
Anuken
79d757856e Merge remote-tracking branch 'origin/master' 2021-08-15 09:34:28 -04:00
Anuken
cd0c48985d Unconditional unit draw state reset 2021-08-15 09:34:23 -04:00
RebornTrack970
b2f35220e3
OmegaHub Server Update (#5769) 2021-08-15 09:30:34 -04:00
Anuken
d9ecaa701b Merge remote-tracking branch 'origin/master' 2021-08-14 23:19:34 -04:00
Anuken
9355496915 Correct SolidPump bar 2021-08-14 23:19:29 -04:00
Matthew Peng
79939db170
If it accepts payloads, then it shouldn't be blocked. (#5767) 2021-08-14 20:35:29 -04:00
Matthew Peng
24d3afca18
If a block doesn't rotate, then don't check if the payload conveyor is trying to input into the output side (#5766) 
* If a block doesn't rotate, then don't check if the payload conveyor is trying to input into the output side

* b l o c k

* h

* Revert "h"

This reverts commit 2860818e3f.
 2021-08-14 18:48:52 -04:00
Anuken
334b62b0a2 Misc scripting visibility changes 2021-08-14 09:49:25 -04:00
Anuken
16fb70b0ef Fixed #5762 / Fixed #5763 2021-08-14 09:21:02 -04:00
Anuken
c2fcffb0d8 Planet frustum culling 2021-08-13 23:49:47 -04:00
Anuken
681fc6de3d Misc bugfixes 2021-08-13 19:41:14 -04:00
Anuken
9640acfb74 Merge remote-tracking branch 'origin/master' 2021-08-13 19:07:19 -04:00
Anuken
94b12704dc Mobile text input fixes 2021-08-13 19:07:14 -04:00
buthed010203
74468855c2
Offset formations by 22.5 degrees when full (#5754) 
This stops the annoying "unit bumping" problem on servers (at least with full formations), removed the other 2 lines as they didnt actually do anything.

Before: https://mee6.is-terrible.com/56YkB59o8.webm
After: I really cant be bothered
 2021-08-13 17:45:12 -04:00
Anuken
031b1abe0a Allow animations without top regions 2021-08-13 14:14:58 -04:00