mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 11:29:48 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,656 Commits 4 Branches 160 Tags 2.3 GiB
e38d2a8380
Commit Graph

4656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tunacan427
e38d2a8380 Merge branch 'master' of https://github.com/Tunacan427/Mindustry 2019-09-25 23:46:51 +03:00
Tunacan427
2220af3ac4 Even more translations 2019-09-25 23:46:46 +03:00
Kemal
f92a988612
More translation. 2019-09-25 22:29:35 +03:00
Tunacan427
7683fdb9cb Resolve merge conflict that I have no idea why happened 2019-09-25 20:06:12 +03:00
Tunacan427
d621b5a77e More translations 2019-09-25 19:58:30 +03:00
Tunacan427
02cb07f170
more translation (#4) 
yes
 2019-09-25 17:33:04 +03:00
Tunacan427
228a3f67e1 Update language files to include new stuff and a bit more translations 2019-09-25 00:31:48 +03:00
Tunacan427
4fc0a93a1f Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-09-25 00:16:13 +03:00
Anuken
ecd73dcc2c Various bugfixes / Added new blocks to tech tree 2019-09-24 17:02:34 -04:00
Tunacan427
7f43c4377c Merge branch 'master' of https://github.com/Tunacan427/Mindustry 2019-09-24 23:29:24 +03:00
Kemal
ab998e87f8
Translated some words. 
Not much.
 2019-09-24 23:21:47 +03:00
Tunacan427
6c53aaf67f
Fork project and edit a bit 
Nothing too much
 2019-09-24 23:00:11 +03:00
Anuken
b6e97c4261 Added armored conveyors 2019-09-22 15:12:15 -04:00
Anuken
a2750c8aff Default linear filtering on desktop 2019-09-22 12:35:53 -04:00
Anuken
2c0372f680 Power graph capacity display 2019-09-22 11:38:13 -04:00
Anuken
2dceb8927c Votekick after being offline / Votekick button 2019-09-22 11:28:32 -04:00
Anuken
e5cf2161d4 spaghetti eradicated 2019-09-22 01:37:50 -04:00
Anuken
b2bae64215 extreme confusion 2019-09-22 00:01:48 -04:00
Anuken
552dc254da spgashfetiti 2019-09-21 23:41:56 -04:00
Anuken
dc51afdc60 Fixed sprites 2019-09-21 20:24:07 -04:00
Anuken
3f293190cf Merge branch 'master' of https://github.com/Anuken/Mindustry into messages 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites5.png
 2019-09-21 18:59:49 -04:00
Synray
7f299869c5 Add ability to rotate each block in a line (#688) 
* Add ability to rotate each block in a line

* New behavior only when placing straight lines

* Code style
 2019-09-21 18:03:05 -04:00
Anuken
c45805e703 no 2019-09-21 17:51:44 -04:00
Anuken
d062d8081a Bugfixes 2019-09-21 16:44:47 -04:00
Anuken
5955ecefd3 Bugfixes 2019-09-21 15:54:34 -04:00
Anuken
0d25d83651 Better Android keyboard support 2019-09-21 15:35:59 -04:00
Anuken
1957b6aa12 Removed unused rally point block 2019-09-21 13:06:09 -04:00
Anuken
4fa173f0f5 Don't auto-increment build version 2019-09-21 11:04:35 -04:00
Anuken
fed3bcd79d Cleanup 2019-09-20 23:21:43 -04:00
Anuken
dda1f18f67 Unit enemy spawnpoint camping 2019-09-20 23:09:11 -04:00
Anuken
025386af53 New pathfinding implementation on separate thread 2019-09-20 22:01:27 -04:00
Anuken
bd1ea41c0d Merge remote-tracking branch 'origin/master' 2019-09-19 23:46:34 -04:00
Anuken
5d729c1e8d Bugfixes 2019-09-19 23:46:27 -04:00
Anuken
1fac4c59a3 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/io/anuke/mindustry/editor/MapEditorDialog.java
 2019-09-19 23:00:42 -04:00
Anuken
0e9296913c Fixed iOS build issues 2019-09-19 22:59:44 -04:00
Anuken
50d379d94d Merge remote-tracking branch 'origin/master' 2019-09-19 19:02:05 -04:00
Anuken
d6a4149175 Testing iOS file chooser 2019-09-19 19:01:48 -04:00
Anuken
5a0669d437 SAF is terrible 2019-09-18 19:24:49 -04:00
Anuken
0d29d94800 Bugfixes 2019-09-18 15:18:59 -04:00
Anuken
1e667946b3 Bugfixes 2019-09-18 12:46:11 -04:00
Anuken
c6a4bf69ee Fixed turret cooling 2019-09-18 08:49:48 -04:00
Anuken
5d0cfc3599 Workshop tweaks 2019-09-17 22:39:58 -04:00
Anuken
2424afa1fb Workshop implementation progress 2019-09-17 21:55:57 -04:00
Anuken
69944a2b63 Crash fixes 2019-09-17 19:29:38 -04:00
Anuken
0ceb58a105 Bugfixes 2019-09-17 19:25:37 -04:00
Anuken
5e8da856e7 Conclusively fixed status effect null issue 2019-09-17 18:54:30 -04:00
Anuken
ee412e1994 passbackback 2019-09-17 17:39:20 -04:00
Anuken
02736524bd
Update Tutorial.java 2019-09-17 12:27:18 -04:00
Anuken
c357b97b3b
Update Control.java 2019-09-17 11:00:57 -04:00
Anuken
dbe7251c6b
Update Statuses.java 2019-09-17 10:59:40 -04:00