mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,774 Commits 4 Branches 160 Tags 2.3 GiB
f9580c7864
Commit Graph

9774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
f9580c7864
Merge pull request #3421 from MEEPofFaith/fix-absorbing-lasers 
Lasers cannot and should not collide with anything.
 2020-11-16 15:41:36 -05:00
MEEP of Faith
361ed26907 Lasers cannot and should not collide with anything. 2020-11-16 12:24:36 -08:00
Anuken
80130c69e4 arc 2020-11-16 14:21:44 -05:00
Anuken
3b47cb03bc Merge remote-tracking branch 'origin/master' 2020-11-16 14:21:39 -05:00
Anuken
8577eb9484 New sector display UI 2020-11-16 14:21:30 -05:00
Anuken
272a7af1ae
Merge pull request #2575 from Voz-Duh/team-colors-for-payload-distributions 
Team Colors For Payload Conveyor and Router
 2020-11-16 12:35:27 -05:00
Anuken
33e8489f42 Bugfixes 2020-11-16 09:18:53 -05:00
Anuken
bdee65e925 Sector preset display 2020-11-15 23:09:40 -05:00
Anuken
b7b6ddf69a arc 2020-11-15 21:03:18 -05:00
Anuken
bf79e1a3d7 Map fixes 2020-11-15 20:34:02 -05:00
Anuken
bedf93f0e0 Cleanup 2020-11-15 20:20:37 -05:00
Anuken
a172c12e5d Auto-destruction of enemies after attack sector capture 2020-11-15 18:59:23 -05:00
Anuken
7bd05ad9ad New campaign map / Fixed #3414 2020-11-15 17:11:52 -05:00
Anuken
9928b0f788 #3412 but not broken 2020-11-15 15:29:31 -05:00
Anuken
c95872e992 #3413 but better 2020-11-15 15:05:34 -05:00
Anuken
c0786b31be Merge remote-tracking branch 'origin/master' 2020-11-15 12:52:33 -05:00
Anuken
d53b074760 Tutorial removed / Logic block group 2020-11-15 12:52:29 -05:00
Anuken
18cb0eeec6
Merge pull request #3323 from DeltaNedas/files 
add file picker interface for mods
 2020-11-15 11:51:50 -05:00
Anuken
1959ada854 Merge remote-tracking branch 'origin/master' 2020-11-15 11:40:20 -05:00
Anuken
fca1cacb30 Fixed #3411 / Fixed unit tests 2020-11-15 11:40:17 -05:00
Anuken
3870c64b60
Merge pull request #3388 from younggam/patch-5 
protected->public for mod supports
 2020-11-15 11:07:48 -05:00
Anuken
aebd3f959f Fixed #3402 / Fixed #3403 / Fixed #3401 / Fixed #3404 / Disabled derelict updates 2020-11-15 10:54:09 -05:00
Anuken
49e4aaa49b Bugfixes 2020-11-14 19:49:11 -05:00
Anuken
135c780f35 Fixed #3400 2020-11-14 19:06:21 -05:00
Anuken
6c2541491f More campaign water 2020-11-14 17:34:35 -05:00
Anuken
4975def352 Cleanup 2020-11-14 17:00:12 -05:00
Anuken
0c050a3ef4 Merge remote-tracking branch 'origin/master' 2020-11-14 15:02:51 -05:00
Anuken
bd4badc274 More campaign tweaks 2020-11-14 15:02:47 -05:00
Anuken
21b1a0aedf
Merge pull request #3387 from MEEPofFaith/patch-1 
Remove extra Omura cannon image.
 2020-11-14 14:28:54 -05:00
Anuken
87050b6c56
Merge pull request #3396 from DeltaNedas/master 
add mining/mineX/mineY sensors
 2020-11-14 13:37:47 -05:00
Anuken
c96f4609d0 Research system changes, unfinished 2020-11-14 13:36:43 -05:00
DeltaNedas
9bde0dc18a multiple inheritance h 2020-11-14 18:18:52 +00:00
DeltaNedas
b66294b50a add mining/mineX/mineY sensors 2020-11-14 18:09:46 +00:00
younggam
bfc2b08bcc
ammo protectd->public 2020-11-14 14:56:47 +09:00
younggam
4d66d63da2
requirements protected->public 2020-11-14 14:55:59 +09:00
younggam
4ee4e39518
constructor protected->public 2020-11-14 14:54:22 +09:00
MEEP of Faith
659be11b7d
Remove extra omura cannon image. 
It has the `-heat` prefix, so the game is using this instead of its actual heat sprite to draw heat.
 2020-11-13 19:00:21 -08:00
Anuken
7559996227 Bugfixes / New campaign map 2020-11-13 19:03:27 -05:00
Anuken
04c465c8f0 Bugfixes 2020-11-13 17:33:32 -05:00
Anuken
cf71356bdb Merge branch 'genNAowl-unit-stats' 2020-11-13 14:42:58 -05:00
Anuken
a9756aefad Cleanup of weapon stats 2020-11-13 14:42:46 -05:00
Anuken
e0b4eb7f8f Merge branch 'unit-stats' of git://github.com/genNAowl/Mndstry into genNAowl-unit-stats 2020-11-13 14:14:38 -05:00
Anuken
ad620971d9 Cleanup 2020-11-13 14:14:29 -05:00
Anuken
648150df65 Fixed #3380 2020-11-13 12:57:49 -05:00
Anuken
3b3b1520f9 Apparently every base part had a base tier of 0 this whole time 2020-11-13 12:40:23 -05:00
Anuken
0d015a4dfc arc 2020-11-13 11:33:50 -05:00
Anuken
75df515234 Merge remote-tracking branch 'origin/master' 2020-11-13 11:33:45 -05:00
Anuken
0908176079 Campaign changes 2020-11-13 11:33:31 -05:00
Anuken
b435c83fb6
Merge pull request #3377 from Bohaska/patch-1 
Knockback for Spectre
 2020-11-13 10:47:36 -05:00
Anuken
1da52d2e42
Merge pull request #3374 from BasedUser/patch-6 
Formation of the CAMS
 2020-11-13 10:34:49 -05:00