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
Anuken
fcbad69b46
Merge pull request #3014 from summetdev/patch-6 
:)
 2020-10-18 17:20:25 -04: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
96996f8079 merge 2020-10-18 20:28:29 +03:00
summetdev
12e35b643c sync fix 2020-10-18 20:24:09 +03:00
Summet
2e0c1cd613
code style 
Co-authored-by: Anuken <arnukren@gmail.com>
 2020-10-18 20:07:46 +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
ef58111cc3 Merge remote-tracking branch 'origin/master' 2020-10-18 09:29:53 -04:00
Anuken
14c42c5652 Removed issue workaround from README 2020-10-18 09:29:49 -04:00
Anuken
4cd9c0194a
Merge pull request #3008 from abomb4/master 
Try fix 'Cannot attach to current VM' problem in IDEA
 2020-10-18 09:28:33 -04:00
abomb4
7f708a3f6c
Try fix 'Cannot attach current VM' problem in IDEA 
Seems add a 'fork' option to core module solves this problem
 2020-10-18 21:15:30 +08:00
Anuken
e6606ca17e
Update bug_report.md 2020-10-18 09:11:15 -04:00
Anuken
c1c41a19c8 Cleanup 2020-10-18 09:08:47 -04: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
e05ba886e8
Update README.md 2020-10-17 09:37:09 -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