mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 08:00:04 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,061 Commits 4 Branches 160 Tags 2.3 GiB
3ccf2ecc24
Commit Graph

6035 Commits

Author SHA1 Message Date
Anuken
3ccf2ecc24 Projector visualization 2020-04-28 13:15:40 -04:00
Anuken
2504fd536b Autopack sprites when running 2020-04-27 17:35:10 -04:00
Anuken
a4d49f5d17 Automatic assignment of entities 2020-04-27 01:31:41 -04:00
Anuken
2f3c098b50 Unit status cleanup 2020-04-26 23:24:05 -04:00
Anuken
f6bf229b0a Cleanup 2020-04-26 21:59:49 -04:00
Anuken
1941b0fa8a Merge remote-tracking branch 'origin/master' 2020-04-26 11:24:56 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Patrick 'Quezler' Mounier
5fc8901e0b
Fix plastanium conveyor icon generation (#1920) 2020-04-26 11:08:27 -04:00
Lapis
02fbc56137
Update bundle_ja.properties (#1917) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-26 11:08:05 -04:00
Anuken
fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
Anuken
08f8323465 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets-raw/sprites/units/phantom-cell.png
 2020-04-25 22:49:38 -04:00
Anuken
9b74b69950 Unit tweaks 2020-04-25 22:49:30 -04:00
MEEP of Faith
46762ab0e1
New power cells for everything (#1915) 
* Ground Unit Power Cells

* Flying Unit Cells

* Player/Mech Cells
 2020-04-25 22:48:58 -04:00
Anuken
8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -04:00
MEEP of Faith
c7c638caa6
Copy code from UnitType.java (#1916) 
Support custom bottom region without scripting.
 2020-04-25 21:10:36 -04:00
Anuken
c875bb3f55 Merge remote-tracking branch 'origin/master' 2020-04-25 17:34:39 -04:00
Anuken
ceee1d36e6 Bugfixes 2020-04-25 17:34:35 -04:00
Gdeft
9260cdee95
Update in bundle_in_ID.properties (#1913) 
Translated few words to Bahasa and revised some of them too so they sound more standard.
 2020-04-25 13:38:06 -04:00
Lapis
d97d971cf6
Update bundle_ja.properties (#1908) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties
 2020-04-25 13:38:00 -04:00
Anuken
30d8737f67 Bugfixes 2020-04-25 12:49:19 -04:00
Anuken
9e0af97cee Merge remote-tracking branch 'origin/master' 2020-04-25 12:30:22 -04:00
Anuken
838e12cc0a stop 2020-04-25 12:30:18 -04:00
sk7725
02394973b0
Fix inconsistencies in Korean Translation (#1912) 
For block, the national institute of korean language(https://www.korean.go.kr/front/onlineQna/onlineQnaView.do?mn_id=216&qna_seq=81761) specifies that the correct translation is 블록, not 블럭. Both translations, despite 블럭 being the wrong translation, are being used. All 블럭 have been changed to 블록.
 2020-04-25 12:24:56 -04:00
Patrick 'Quezler' Mounier
14c9050103
Remove power usage from phase bridge endpoints (#1910) 2020-04-25 10:32:00 -04:00
Anuken
81af481d3a Removed sleep 2020-04-25 10:12:37 -04:00
Anuken
2e2c8ceab4 Bugfixes 2020-04-25 00:04:14 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken
21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken
32a182cd01 Unit parsing cleanup 2020-04-24 15:45:57 -04:00
Anuken
6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Anuken
5d4ca753a7 Light cleanup 2020-04-24 11:08:02 -04:00
Anuken
1b2e10d355 Cleanup, re-implementations 2020-04-24 11:01:17 -04:00
Anuken
018fe5dea2 Added lights for laser turret projectiles 2020-04-24 09:50:40 -04:00
Anuken
eeb88df5f6 Bugfixes 2020-04-23 17:45:12 -04:00
Patrick 'Quezler' Mounier
cf186e0219
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites2.png
 2020-04-23 21:15:11 +02:00
Patrick 'Quezler' Mounier
39266d23c8
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
 2020-04-23 21:10:48 +02:00
Anuken
cafd076f9c Fixed water animation conflict 2020-04-23 15:08:32 -04:00
Anuken
87ed405916 Bugfixes 2020-04-23 14:50:30 -04:00
Anuken
7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
Anuken
b68b3a1837 Layer tweaks 2020-04-23 14:04:31 -04:00
Anuken
2aa05f989b Merged in sprite sorting 2020-04-23 14:00:55 -04:00
Anuken
cec5c24d69 progress 2020-04-23 13:58:06 -04:00
Anuken
c738dcb42e progress 2020-04-23 12:52:16 -04:00
Anuken
1bf5b19889 progress 2020-04-23 12:35:49 -04:00
laohuaji233
37240478b8
Update bundle_zh_CN.properties (#1900) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2020-04-23 11:08:33 -04:00
Anuken
c6e4bf1fa4 progress 2020-04-23 11:06:58 -04:00
Anuken
71e8c088a6 progress 2020-04-23 11:01:14 -04:00
Anuken
989ee895e8 Functional sorting 2020-04-23 10:25:46 -04:00
Anuken
2538273402 progress 2020-04-23 00:41:18 -04:00
Anuken
18b68fefed how did this compile 2020-04-23 00:16:41 -04:00