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
|
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 |
|
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
|
aeb28f67e4
|
Overlapping icon button casings will bother me no more
|
2018-12-13 16:46:45 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
iczero
|
8a582f8872
|
Check client version type against server version type (#367)
|
2018-12-05 15:43:13 -05:00 |
|