Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,280 Commits 4 Branches 180 Tags
18fcc6e596b67f0757622ff874774308da2da998
Commit Graph

3280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
832582caa9 Cleanup 2018-12-15 20:59:28 -05:00
Timmeey86
828661e9de More efficient way of retrieving ConsumePower subclasses 2018-12-15 23:49:46 +01:00
Baltazár Radics
52f78ee4ed Merge pull request #15 from Timmeey86/baltitenger 
Baltitenger
 2018-12-15 09:11:14 +01:00
Anuken
6029b6d67f Updated smooth UI 2018-12-14 22:07:43 -05:00
Anuken
9d744580a1 Merge 2018-12-14 21:48:34 -05:00
Anuken
b295f51c29 Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework 2018-12-14 19:11:50 -05:00
Anuken
5c6aea0d50 Merge remote-tracking branch 'origin/master' 2018-12-14 19:11:05 -05:00
Anuken
99bf50ee52 Core recipe tweak 2018-12-14 19:10:58 -05:00
Timmeey86
f48a19a3bc Merged master into branch 2018-12-15 00:49:38 +01:00
Timmeey86
fed11db92e Buffered consumers now fill instantly 2018-12-15 00:47:47 +01:00
Timmeey86
23fb15fe78 Buffered consumers will no longer have their buffer reset when being unlinked 2018-12-14 21:14:19 +01:00
Prosta4okua
7a533f6053 Update bundle_uk_UA.properties 2018-12-14 18:28:40 +02:00
Prosta4okua
a292ff4287 Update bundle_uk_UA.properties 2018-12-14 18:24:06 +02:00
BasedUser
29329383e4 Update bundle_ru.properties (#377) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-12-14 11:14:30 -05:00
Anuken
fefdad5335 Minimap switched to container 2018-12-14 10:27:23 -05:00
Anuken
982f9ce8fb Padding fix 2018-12-14 00:12:08 -05:00
Anuken
5c6d4b9ac2 Fixed extremely strange join dialog server padding 2018-12-14 00:09:44 -05:00
Anuken
49954f5c07 Merge remote-tracking branch 'origin/master' 2018-12-13 18:02:05 -05:00
Anuken
0b837925a2 Build script reformatting / 'Fixed' all unchecked warnings 2018-12-13 18:01:51 -05:00
Clarence "Sparr" Risher
54dd67a435 Center sectors map on most recently saved (played and not abandoned) sector (#375) 2018-12-13 17:35:24 -05:00
Anuken
18ddc040d1 Merge remote-tracking branch 'origin/master' 2018-12-13 16:46:50 -05:00
Anuken
aeb28f67e4 Overlapping icon button casings will bother me no more 2018-12-13 16:46:45 -05:00
CrazyBearTR
54b892cd29 Incomplete update for turkish translation (#272) 
Its incomplete. Still needed to work on it.
 2018-12-13 15:58:06 -05:00
Anuken
2e28525c4b Typo fix 2018-12-13 08:37:05 -05:00
Anuken
8aa8de570f Fixed editor UI bug 2018-12-12 22:19:46 -05:00
Anuken
6723479c32 Removed sound config 2018-12-12 20:13:21 -05:00
Anuken
e318b6a113 Fixed #374 (temporary workaround) 2018-12-12 13:17:11 -05:00
Anuken
df44f82198 Drownable tar and lava 2018-12-12 10:10:15 -05:00
Anuken
97d54868e9 Grid mode tweak 2018-12-11 17:48:55 -05:00
Anuken
65e65ba308 Formatting cleanup / Bugfix 2018-12-11 17:29:13 -05:00
Anuken
2056d5e350 Merge branch 'master' of https://github.com/Anuken/Mindustry 2018-12-11 17:24:14 -05:00
indielm
8b3b72243f Gridmode and eyedropper select (#372) 
* Gridmode

Adds keybindings to category and block selection

* bugfixes and comments

* more keybind

* Update PlacementFragment.java

* Update PlacementFragment.java

* eyedropper crashfix

* formatted with default.xml
 2018-12-11 17:24:05 -05:00
Baltazár Radics
814146f227 Merge pull request #13 from Timmeey86/baltitenger 
Merged master changes and fixed conflicts
 2018-12-11 06:56:49 +01:00
Timmeey86
511983e1ea Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-11 00:17:15 +01:00
Anuken
13e5df62c9 Removed fog classes 2018-12-10 14:12:50 -05:00
Anuken
8debf8caf8 Message cleanup / Player target reset 2018-12-10 14:10:54 -05:00
William So
eab90cac05 [Completed] Translate the rest of bundle_zh_TW.properties (#370) 
* Translate unit strings

* Translate tutorial strings

* Translate walls', projecters', and turrents' strings

* Translate recently added strings

* Translate strings to the part before power

* Translate strings to the part before containers

* Translate containers', drills', and mechs' strings

* Translate factories' strings

* Translate everything else untranslated
 2018-12-10 10:47:40 -05:00
VizardAlpha
ce401b01b6 Updates bundle_fr_BE.properties (#373) 2018-12-10 10:39:14 -05:00
Anuken
271dcd46bc Bugfixes 2018-12-10 10:38:09 -05:00
Anuken
c1a7b452e0 Misc cleanup 2018-12-09 23:28:36 -05:00
Timmeey86
e50ff6b0a5 Merged current master and fixed conflicts 2018-12-09 22:40:33 +01:00
Anuken
34ddb92e4d Merge remote-tracking branch 'origin/master' 2018-12-09 14:42:25 -05:00
Anuken
35b16c7292 New placement unit tests / Placing bugfix 2018-12-09 14:42:22 -05:00
Anuken
931fc93b4b Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework 2018-12-09 11:16:39 -05:00
BasedUser
aacd9dc62c Update bundle_ru.properties (#369) 2018-12-09 00:05:09 -05:00
Anuken
061c55614b Balancing / Tau mech mobile block repair 2018-12-08 20:11:15 -05:00
Timmeey86
41c6887f33 Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-08 20:07:45 +01:00
Anuken
b427185fac 'Added' attack mode / Core inventory sharing 2018-12-07 19:32:44 -05:00
Anuken
6fa14accfe Added proper core blocks / Murdered snek 2018-12-07 15:19:14 -05:00
Baltazár Radics
1b8933cd84 Merge pull request #12 from Timmeey86/baltitenger 
More power changes
 2018-12-07 19:42:27 +01:00