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

3103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Timmeey86
e6261a6bf8 Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-07 19:40:10 +01:00
Timmeey86
0a76647175 ForceProjector should now work properly 2018-12-07 19:38:14 +01:00
Timmeey86
787706b1f7 Set default minimum power to 50% and set four blocks to 100% 2018-12-07 19:37:51 +01:00
Anuken
94665e8055 Formatting / Removed mobile map screenshots due to crashes 2018-12-07 13:10:25 -05:00
Anuken
b24770629e Merge remote-tracking branch 'origin/master' 2018-12-07 12:12:09 -05:00
Anuken
a09bd09a0e Removed tank chaining 2018-12-07 12:11:58 -05:00
Prosta4okua
988df8742c
Update bundle_uk_UA.properties 2018-12-07 10:27:11 +02:00
Prosta4okua
10c41bf443
Update bundle_uk_UA.properties 2018-12-07 10:16:21 +02:00
Prosta4okua
bb30876557
From Ber and 2018-12-07 10:13:22 +02:00
Anuken
81c24b3de1 Fixed file chooser style / Fixed sector save invisibility 2018-12-06 22:27:39 -05:00
Anuken
4e1f734af7 Merge remote-tracking branch 'origin/master' 2018-12-06 19:57:31 -05:00
Anuken
2f726cf7f2 (2) 2018-12-06 19:57:26 -05:00
Timmeey86
e726d16094 Removed power bars from direct consumers 2018-12-06 19:49:49 +01:00
Timmeey86
5bda5124e6 Merged current master to branch 2018-12-06 19:48:01 +01:00
Anuken
1a66b7c4c3 Graphical fix 2018-12-06 11:41:05 -05:00
Anuken
da86dee981 Freezing armor multiplier 2018-12-06 09:30:41 -05:00
Anuken
6caf0fc1cc Merge remote-tracking branch 'origin/master' 2018-12-05 19:00:18 -05:00
Anuken
8d28976b0d Misc cleanup 2018-12-05 19:00:10 -05:00
Prosta4okua
26e972314e
Update bundle_uk_UA.properties 2018-12-05 22:44:03 +02:00
iczero
8a582f8872 Check client version type against server version type (#367) 2018-12-05 15:43:13 -05:00
Anuken
ca04504573 Renamed internal 'noWaves' mode / Fixed text encoding issues 2018-12-05 15:38:32 -05:00
Anuken
80360214df Bar re-scaling 2018-12-05 13:33:03 -05:00
Baltazár Radics
c69eae486e
Merge pull request #11 from Timmeey86/baltitenger 
Fixes requested by Anuke
 2018-12-05 19:09:14 +01:00
Timmeey86
57bebd3fb6 Removed file which was not supposed to be commited 2018-12-05 18:57:52 +01:00
Timmeey86
329dac77ee Consumers only draw power when all other required inputs are valid 2018-12-05 18:56:07 +01:00
Timmeey86
e5dabc63c2 Removed power bars from producers 2018-12-05 18:03:50 +01:00
Anuken
f652135e19 Merge remote-tracking branch 'origin/master' 2018-12-04 18:31:02 -05:00