mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 01:07:16 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,799 Commits 4 Branches 160 Tags 2.3 GiB
7091cad704
Commit Graph

6799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rayfulrand
9e8dae8cd6
Update summary (#1901) 
more accurate translation of Tower Defence genre
 2020-04-23 11:07:06 -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
Anuken
362846bd68 progress 2020-04-23 00:03:03 -04:00
Anuken
6cf422eebf progress 2020-04-22 17:23:30 -04:00
Álvaro Manzanas
cf69fa1d7c
Update bundle_es.properties (#1899) 
* Update bundle_es.properties

* Update bundle_es.properties
 2020-04-22 16:20:07 -04:00
Anuken
fc4f8619f8 progress (purge) 2020-04-22 16:17:43 -04:00
Anuken
c5f93139bd progress 2020-04-22 16:06:26 -04:00
Anuken
9beb23b0e4 progress 2020-04-22 15:19:39 -04:00
Anuken
d154361e75 Merge branch '6.0' of https://github.com/Anuken/Mindustry into sprite-sorting 2020-04-22 14:34:34 -04:00
Anuken
67d87f023b Cleanup 2020-04-22 14:22:33 -04:00
Anuken
da7c393096 progress 2020-04-22 12:47:29 -04:00
Anuken
b3f936acb8 Fixed tests not compiling 2020-04-22 11:18:19 -04:00
Anuken
2ca62831e3 Revert "Cleaned up tests" (wrong branch) 2020-04-22 11:17:47 -04:00
Anuken
cb601b729e Merge remote-tracking branch 'origin/master' 2020-04-22 10:48:54 -04:00
Anuken
cc4e9c5ba1 Cleaned up tests 2020-04-22 10:48:50 -04:00
Anuken
a592144291 Catching of schematic preview errors / Fixes #1886 2020-04-22 09:49:04 -04:00
Kaio Duarte Costa
390b5e3b60
Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725
05cfe7a80a
Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Anuken
58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Anuken
c5c63c24d5
Update bug_report.md 2020-04-16 17:00:07 -04:00
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Anuken
2f3a842f2e isValid() workaround 2020-04-16 14:26:09 -04:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Corby
15750b5eb0
Korean localization fixes and changes. (#1874) 2020-04-16 13:33:38 -04:00
Anuken
c6bbdfdc9b Fixed compilation 2020-04-16 11:35:35 -04:00
Anuken
713dbccf74 Bugfixes 2020-04-16 11:30:42 -04:00
Anuken
a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Anuken
256f805754 Payload fixes 2020-04-16 09:55:57 -04:00
Anuken
ea0358d570 Merge remote-tracking branch 'origin/6.0' into 6.0 2020-04-16 09:44:36 -04:00
Anuken
42f227195c Better payload framework 2020-04-16 09:44:31 -04:00
Ali-C-Ila
7d6e8fdcd1
Update bundle_zh_TW.properties (#1876) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-04-16 09:14:36 -04:00
Patrick 'Quezler' Mounier
7254204ae5
[6.0] fix build requirement check for sandbox (#1873) 
* Fix not being able to start building in 6.0 sandbox

* Make 〃 more logical
 2020-04-16 09:11:23 -04:00
Anuken
8a01b87c99 Cleanup 2020-04-15 23:12:18 -04:00
Anuken
79c8548171 Better conveyor animations 2020-04-15 19:05:18 -04:00
Anuken
a234949b8c Visual tweaks 2020-04-15 13:03:37 -04:00
Anuken
0eaf9bc9c6 Various prototypes 2020-04-15 12:44:53 -04:00
Prosta4okua
305632c002
Update bundle_uk_UA.properties (#1871) 2020-04-15 10:36:38 -04:00
Anuken
51226d6c88 Arc compat 2020-04-14 20:29:59 -04:00