mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-11 07:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,067 Commits 4 Branches 160 Tags 2.1 GiB
bd0a6636e6
Commit Graph

5067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
dec6a1296b Better schematic previews, keep on game export 2019-10-17 22:57:37 -04:00
Anuken
44c8b07eb1 Things 2019-10-17 22:14:04 -04:00
Anuken
0095d89543 Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics 2019-10-17 21:58:55 -04:00
Anuken
4977f598fd Config drawing 2019-10-17 21:58:49 -04:00
Anuken
25cacbb28d Merge remote-tracking branch 'origin/master' 2019-10-17 17:00:49 -04:00
Anuken
a0c93ea7d3 Made incend bullets apply status instead of creating fire 2019-10-17 17:00:38 -04:00
Anuken
1921bc87a2 Dialog 2019-10-17 16:53:43 -04:00
Anuken
6437e6b878
Update ContentParser.java 2019-10-17 10:56:10 -04:00
Anuken
41284ac3bc Bugfix 2019-10-17 09:01:59 -04:00
Anuken
8cf0df7ac5 Crash fix 2019-10-17 08:40:11 -04:00
Anuken
b804f7fa6e Bugfixes 2019-10-16 23:08:07 -04:00
Anuken
95cda0d9ab no 2019-10-16 19:46:03 -04:00
Anuken
2dae3c4b4a Fixed sound loading 2019-10-16 19:19:08 -04:00
Anuken
fd12027873 Merge remote-tracking branch 'origin/master' 2019-10-16 14:37:31 -04:00
Anuken
ff4c7e4302 Multithreaded packing 2019-10-16 14:36:46 -04:00
Anuken
3939d1855d
Merge pull request #831 from Quezler/patch-2 
Fix loadout reset
 2019-10-16 12:27:20 -04:00
Patrick 'Quezler' Mounier
596d58b539
Fix loadout reset 2019-10-16 15:51:18 +02:00
Anuken
af3067c08b
Merge pull request #800 from laohuaji233/patch-23 
Update bundle_zh_CN.properties
 2019-10-15 18:30:57 -04:00
Anuken
d0006eaa26
Merge pull request #793 from 1RedOne/patch-2 
Adds Japanese menu items for Mods
 2019-10-15 18:21:04 -04:00
Anuken
52b2731a42
Merge pull request #785 from osoitz/patch-2 
Update bundle_eu.properties
 2019-10-15 18:19:11 -04:00
Anuken
08f3368766
Merge pull request #782 from Amon-Senpai/patch-2 
Update bundle_de.properties
 2019-10-15 18:17:30 -04:00
Anuken
86474484ae
Merge pull request #780 from PlayerBrasil13/patch-3 
Update bundle_pt_BR.properties
 2019-10-15 18:17:11 -04:00
Anuken
e31fb13378
Merge pull request #774 from dase1353/patch-1 
Update bundle_zh_TW.properties
 2019-10-15 18:15:44 -04:00
Anuken
c147389d25
Merge pull request #769 from Tunacan427/master 
Huge updates to Turkish translations
 2019-10-15 18:15:12 -04:00
Anuken
0581f500cc
Merge pull request #767 from mdtrooper/master 
Update bundle_es.properties
 2019-10-15 18:08:26 -04:00
Anuken
e5335e9a97
Merge branch 'master' into master 2019-10-15 18:08:21 -04:00
Anuken
5c0a338e6b
Merge pull request #765 from azureblue/azureblue-patch-1_bundle_pl 
Update bundle_pl.properties
 2019-10-15 18:07:52 -04:00
Anuken
73329ccaf2
Merge pull request #753 from clfer/feature/update_bundle_fr_FR 
Update bundle_fr.properties
 2019-10-15 18:05:09 -04:00
Anuken
8b5b7cf5fc
Merge pull request #759 from laohuaji233/patch-21 
Create achievements.vdf
 2019-10-15 18:01:35 -04:00
Anuken
799cdc716b
Create description.txt (#744) 
* Create description.txt

* Rename fastlane/metadata/steam/description.txt to fastlane/metadata/steam/Simplified Chinese/description.txt
 2019-10-15 17:54:23 -04:00
laohuaji233
6c4853a847 Create short-description.txt (#743) 
* Create short-description.txt

* Rename fastlane/metadata/steam/short-description.txt to fastlane/metadata/steam/Simplified Chinese/short-description.txt
 2019-10-15 17:54:09 -04:00
DeltaRays
bfe57b309a Update bundle_it.properties (#740) 2019-10-15 17:53:50 -04:00
eru_java
6715c43fc3 Update bundle_ja.properties (Steam Translate and Update) (#736) 
Translated STEAM.
Translated new features.
 2019-10-15 17:53:03 -04:00
Mengyang Li
f68348bde6 Update bundle_zh_CN.properties: fix minor typo (#725) 2019-10-15 17:47:00 -04:00
Anuken
121e27906c Fixed bullet parsing 2019-10-15 14:31:31 -04:00
Anuken
a1826763f5 Autotiling begins 2019-10-15 08:56:42 -04:00
Anuken
5a3e4f7fb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics 2019-10-15 08:52:48 -04:00
Anuken
f17766c8ce Fixed tests 2019-10-15 08:51:48 -04:00
Anuken
8556b7eef7 Block build visibility 2019-10-15 00:23:38 -04:00
Anuken
8e9b84f4f9 Minor position tweak 2019-10-14 23:50:07 -04:00
Anuken
6b1fd152e5 Merge remote-tracking branch 'origin/master' 2019-10-14 23:48:38 -04:00
Charlie Karniol
fab3fcb112 Vastly improved Estonian translation bundle (#737) 
* Minor user interface tweaks

* Vastly improved Estonian translation bundle
 2019-10-14 23:48:25 -04:00
Maxwelllondon92
a4b6b88b76 Update bundle_it.properties (#730) 
* Update bundle_it.properties

Minor corrections and mistypes.
added translation to armored conveyor, rally command
added Editor translation
added UI translation
Adjustment made to the tutorial instruction

* Update bundle_it.properties

correction for wrong name and description of pixelation setting

* Update bundle_it.properties

Minor corrections to keybind menu settings

* Update bundle_it.properties

Corrections: some mech pads were mistakenly translated as ship pads
 2019-10-14 23:46:11 -04:00
Maxwelllondon92
b1e99f07a2 Create achievements.vdf (#727) 2019-10-14 23:45:35 -04:00
Anuken
6bceb7311a Better display of broken stuff / 5x slower wall building 2019-10-14 23:43:13 -04:00
Mengyang Li
cbfc766e55 hud: show player position (#717) 
* hud: show player position

* hud: clean up old statement

* hug: address comments
 2019-10-14 23:42:03 -04:00
njwlgamer
d19c3daa67 Update bundle_nl.properties (#667) 2019-10-14 23:41:02 -04:00
ねらひかだ
86eb832446 Japanese Translations for Google Play (#713) 
* Copy descriptions for Google Play

* Update descriptions for Google Play

* Delete not need files

* Add contributors, fix some translations

* Very small changes

* Very small changes 2

* campaign...?

Japanese is not familiar with the word "campaign"
 2019-10-14 23:37:33 -04:00
AmateurPotion
ebb859238c Update bundle_ko.properties (#818) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2019-10-14 23:22:33 -04:00
Anuken
eb21d5ab67 Experimental schematics 2019-10-14 21:34:06 -04:00