Commit Graph

7874 Commits

Author SHA1 Message Date
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
ballgamer56
f0c5c98633
Merge branch 'master' into patch-2 2020-10-20 20:23:15 +07: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
ballgamer56
8e164269cc
Formated to the newest update
Updated to commit 2ff749bd17
2020-10-20 20:02:41 +07: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
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
GlennFolker
cae66a1e6d
allow mods to easily load icon region 2020-10-19 19:13:06 +07:00
Ilya246
ad5d3581f6
armor defined twice in mega 2020-10-19 10:09:39 +04:00
Petr Gašparík
538c198113 Czecg translation up to commit 46ec457 2020-10-19 07:48:57 +02:00
Petr Gašparík
8f4ac642d1 Merge branch 'master' of https://github.com/Anuken/Mindustry into v107 2020-10-19 07:34:10 +02: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
Summet
8ceb155e38
:) 2020-10-19 00:14:40 +03:00
Leonwang4234
db3db47ca1 Add wall stats + other changes 2020-10-18 13:35:20 -07:00
Anuken
97fd9abd8c Merge remote-tracking branch 'origin/master' 2020-10-18 15:46:24 -04:00
Anuken
00d6997b5a Hex/bin logic number support 2020-10-18 15:46:20 -04:00
Anuken
58ff6c60aa
Merge pull request #3012 from summetdev/typo
Grammatical fix
2020-10-18 14:57:26 -04:00
Anuken
7fc2d6be18
Merge pull request #3010 from summetdev/units-payload
Units payload.
2020-10-18 14:43:23 -04:00
summetdev
bd6aebb961 fixed a typo in comment 2020-10-18 21:38:01 +03:00
summetdev
801eca5ca3 prevent sending extra packets 2020-10-18 21:26:32 +03:00
summetdev
12e35b643c sync fix 2020-10-18 20:24:09 +03:00
Anuken
563e99aded Fixed #3009 2020-10-18 13:02:55 -04:00
summetdev
8625ef09cc Units payload 2020-10-18 19:54:10 +03:00
Anuken
ce6292cc53 Recipe display for reconstructors 2020-10-18 11:53:36 -04:00
Anuken
14c42c5652 Removed issue workaround from README 2020-10-18 09:29:49 -04:00
Anuken
c1c41a19c8 Cleanup 2020-10-18 09:08:47 -04:00
키에르
48885a814c
Update bundle_ko.properties 2020-10-18 13:56:55 +09:00
YellOw139
2ff6630e23
Bumped up a couple of commits 2020-10-18 05:39:38 +03:00
Anuken
521d44714d Disabled spawnpoints during ongoing attack maps 2020-10-17 19:49:13 -04:00
Anuken
4ab0c8a1ca Merge remote-tracking branch 'origin/master' 2020-10-17 18:37:57 -04:00
Anuken
7349af4753 Various small tweaks 2020-10-17 18:37:54 -04:00
Anuken
55a8ae083b
Merge pull request #2992 from DeltaNedas/planetdraw
allow modded planets to customize drawing
2020-10-17 17:56:12 -04:00
Anuken
e9131b4631 Minor payload acceptor fixes 2020-10-17 17:05:34 -04:00
Anuken
5d9beb4c28 Fixed #2582 2020-10-17 14:37:51 -04:00
Anuken
a47432c20b Merge remote-tracking branch 'origin/master' 2020-10-17 13:03:03 -04:00
Anuken
8043c09e2b Breaking logic change: Coordinates are now tile-based 2020-10-17 13:02:57 -04:00
DeltaNedas
091593c84d
Merge branch 'master' into planetdraw 2020-10-17 16:59:28 +00:00
Anuken
1324e75eea
Merge pull request #2996 from DeltaNedas/universe
add universe draw events
2020-10-17 12:52:26 -04:00
Anuken
c99873c823 Added bool to enable editor cliff button 2020-10-17 11:02:48 -04:00
DeltaNedas
ef2bf2e129 add universeDraw event 2020-10-17 15:38:12 +01:00
Anuken
46ec457819 Cleanup 2020-10-17 10:37:28 -04:00
DeltaNedas
35a86a1aac add universe draw events 2020-10-17 15:34:00 +01:00
Anuken
3a7ee50db3 Merge remote-tracking branch 'origin/master' 2020-10-17 10:10:34 -04:00
Anuken
be394c4b33 Checks to prevent uncaptureable sectors 2020-10-17 10:10:29 -04:00
Anuken
41dcf7a6f2
Merge pull request #2817 from ThePythonGuy3/patch-7
Some typo fixes and various stuff for spanish bundle.
2020-10-17 09:19:05 -04:00
Anuken
c3d0819cc1 Fixed #2988 2020-10-17 09:17:16 -04:00
DeltaNedas
8e0c5023c9 hh 2020-10-17 12:28:46 +01:00
DeltaNedas
54b0d308be h 2020-10-17 12:16:47 +01:00
DeltaNedas
05b77d787e hide orbits of hidden planets 2020-10-17 12:10:52 +01:00
Anuken
962d0729d6 Merge remote-tracking branch 'origin/master' 2020-10-16 20:09:55 -04:00
Anuken
fc1b03f322 Various tweaks 2020-10-16 20:09:48 -04:00
Anuken
91b4fb1c97
Merge pull request #2979 from DeltaNedas/planet
PlanetGrid stuff
2020-10-16 19:46:05 -04:00
DeltaNedas
0fa947bfaa make calc stuff pkg private again 2020-10-16 23:22:39 +01:00
DeltaNedas
060152fc29 make calc stuff pkg private again 2020-10-16 23:06:46 +01:00
DeltaNedas
97b0461d7f allow modded planets to customize drawing 2020-10-16 23:00:06 +01:00
DeltaNedas
fd54c66726 make ptile/edge/corner mutable 2020-10-16 22:26:50 +01:00
Anuken
e00daffe6d Bugfixes 2020-10-16 15:27:30 -04:00
DeltaNedas
bddcdc0aa2 make planet stuff public, constructor protected 2020-10-16 19:57:13 +01:00
Anuken
1fbced0433 Corrected loadout placement function 2020-10-16 14:09:29 -04:00
Anuken
d6c5d2bc10 Merge remote-tracking branch 'origin/master' 2020-10-16 12:56:51 -04:00
Anuken
b0ea725142 Sector tweaks 2020-10-16 12:56:48 -04:00
Anuken
8be6eabec9
Merge pull request #2974 from abomb4/patch-homing-delay
New feature request: bullet homing delay
2020-10-16 12:44:51 -04:00
Anuken
f391e7a5ac Sector production bugfixes 2020-10-16 12:16:00 -04:00
abomb4
83756a6ea0
New feature: bullet homing delay 2020-10-17 00:05:19 +08:00
Prosta4okua
a8f45b464c
Update bundle_uk_UA.properties 2020-10-16 18:57:13 +03:00
Anuken
f5decdaa1c Disabled spawner radius/warning when waves off 2020-10-16 11:27:17 -04:00
Anuken
2f54edf34f Sector refactoring, invasions and cleanup 2020-10-16 11:02:24 -04:00
Anuken
5ee4101ba4 Moved some static regions 2020-10-15 16:33:51 -04:00
Anuken
45b87ec615 fixed some sector things, broke more things 2020-10-15 15:41:09 -04:00
Anuken
988e1add82 Merge remote-tracking branch 'origin/master' 2020-10-15 13:44:29 -04:00
Anuken
86c2fe8805 too many things to list 2020-10-15 13:44:20 -04:00
Sharlotte
fa2cdb752a
changed private -> public of checkRadius method
when i try to change color of forceField by using draw method , the Mindustry is crashed because of that private method.
2020-10-15 20:46:29 +09:00
Anuken
2b435c2600 UnitType serializer set 2020-10-14 09:13:29 -04:00
Anuken
d630110396 JITPack version check 2020-10-14 09:08:03 -04:00
Anuken
f96552a1a1 Merge remote-tracking branch 'origin/master' 2020-10-14 08:49:09 -04:00
Anuken
6b4a7d025b Fixed #2938 / Fixed #2936 2020-10-14 08:49:05 -04:00
Prosta4okua
592708811b
Update bundle_uk_UA.properties 2020-10-14 14:54:21 +03:00