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
9,172 Commits 4 Branches 160 Tags 2.1 GiB
80bd1daea4
Commit Graph

9172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Summet
80bd1daea4
typo 2020-10-21 23:34:38 +03:00
Anuken
a80d0cc457 Fixed #3053 2020-10-21 14:10:28 -04:00
Anuken
87dda1ba4b Merge remote-tracking branch 'origin/master' 2020-10-21 11:37:48 -04:00
Anuken
1cbcb742e9 Fixed #3052 2020-10-21 11:37:44 -04:00
Anuken
48f5be6623
Merge pull request #3051 from skykatik/patch-1 
var -> let
 2020-10-21 10:48:22 -04:00
Anuken
ee8f18796e Merge remote-tracking branch 'origin/master' 2020-10-21 10:37:07 -04:00
Anuken
3517da8214 Fixed #3049 2020-10-21 10:37:03 -04:00
Skat
aba001f499
var deprecated, use let or const 2020-10-21 16:05:36 +03:00
Anuken
0878becb33
Merge pull request #3013 from genNAowl/wall-stats 
Add Wall Stats
 2020-10-20 19:04:54 -04:00
Leonwang4234
54fd2e03b4 resolve conflicts 2020-10-20 15:57:48 -07:00
Leonwang4234
df37ce3cef Merge remote-tracking branch 'upstream/master' into wall-stats 2020-10-20 15:49:46 -07:00
Anuken
18e6a43a87 Added weather to some built-in maps 2020-10-20 17:24:51 -04:00
Anuken
8f58228317 More base parts 2020-10-20 15:43:06 -04:00
Anuken
30abfc0619 Fixed #3045 2020-10-20 14:02:10 -04:00
Anuken
82fe66b931 Titanium fuse ammo 2020-10-20 12:14:53 -04:00
Anuken
9a9b1d1a90 Fixed log level code 2020-10-20 11:41:54 -04:00
Anuken
03707ea6cf arc 2020-10-20 11:41:34 -04:00
Anuken
7731cee219 arc 2020-10-20 11:24:41 -04:00
Anuken
03c60a93f0 Merge remote-tracking branch 'origin/master' 2020-10-20 11:21:54 -04:00
Anuken
9ab272a01f Better server colors 2020-10-20 11:21:47 -04:00
Anuken
e68d28ef51
Merge pull request #3041 from summetdev/admin-chat 
Admin chat.
 2020-10-20 09:10:18 -04:00
Anuken
9060a9518a Fixed #3037 2020-10-20 09:05:41 -04:00
Summet
ffb94576ac
Better colors 
Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-10-20 15:04:03 +03:00
summetdev
0c1c0f9557 Admin -> A 2020-10-20 13:56:53 +03:00
summetdev
9f95aa035d Indents 2020-10-20 13:56:09 +03:00
summetdev
89fca49b91 Put admin color to Pal 2020-10-20 13:51:21 +03:00
summetdev
d3e26c7c16 Admin chat command 2020-10-20 13:33:28 +03:00
Anuken
c27251cfb0 Fog 2020-10-19 18:28:37 -04:00
Anuken
d5fb0e924a Merge remote-tracking branch 'origin/master' 2020-10-19 16:26:03 -04:00
Anuken
6e8732387b Better weather classes 2020-10-19 16:25:59 -04:00
Anuken
ef0376371d
Merge pull request #3030 from sk7725/patch-21 
remove final from item.color (and liquid too)
 2020-10-19 12:20:14 -04:00
Sunny Kim
3c2e12621e
rainbow liquid 2020-10-20 01:01:45 +09:00
Sunny Kim
efb42296cf
remove final 2020-10-20 00:57:08 +09:00
Anuken
cab08de1f7 Merge remote-tracking branch 'origin/master' 2020-10-19 11:34:59 -04:00
Anuken
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Anuken
073b82b70f
Merge pull request #3029 from abomb4/patch-mod-environment 
Json in Mod should be able to define OreBlock type
 2020-10-19 10:43:53 -04:00
abomb4
9e79ed8a26
Json in Mod should be able to define OreBlock type 
That in mindustry.world.blocks.environment package
 2020-10-19 22:34:52 +08:00
Anuken
59e1fd1eb6 typo 2020-10-19 10:04:30 -04:00
Anuken
d1d674cfc9 Merge remote-tracking branch 'origin/master' 2020-10-19 10:04:13 -04:00
Anuken
80f801db36 Fixed #3023 / Fixed #3020 2020-10-19 10:04:10 -04:00
Anuken
400d36609a
Merge pull request #3022 from Ilya246/patch-1 
armor defined twice in mega
 2020-10-19 09:41:06 -04:00
Ilya246
ad5d3581f6
armor defined twice in mega 2020-10-19 10:09:39 +04:00
Anuken
7f21d61078 Crash fix 2020-10-18 19:54:52 -04:00
Anuken
c7622198fd Cleanup 2020-10-18 19:21:59 -04:00
Anuken
3a52fb2afe Merge branch 'router' 2020-10-18 19:03:13 -04:00
Anuken
e63bbe6ac9 Merge remote-tracking branch 'origin/master' 2020-10-18 18:34:24 -04:00
Anuken
dac236b0e9 Better launch selection 2020-10-18 18:34:19 -04:00
Leonwang4234
1e0545c1ec Merge branch 'wall-stats' of https://github.com/genNAowl/Mndstry into wall-stats 2020-10-18 14:29:18 -07:00
Leonwang4234
cff2799c72 remove changes in description 2020-10-18 14:29:15 -07:00
genNAowl
7a7fa74e65
Update core/src/mindustry/world/blocks/defense/Wall.java 
Co-authored-by: Summet <summet.dev@gmail.com>
 2020-10-18 14:26:48 -07:00