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,753 Commits 4 Branches 160 Tags 2.3 GiB
1959ada854
Commit Graph

9753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bohaska
eaf76b5513
Knockback for Spectre 
just made knockback for spectre on par with water.
 2020-11-13 19:52:34 +08:00
Bohaska
bda5393a74
Knockback for Spectre 
Suggested in https://github.com/Anuken/Mindustry-Suggestions/issues/1170
 2020-11-13 19:10:34 +08:00
BasedUser
388374aa24
Update servers_v6.json 2020-11-13 10:13:47 +03:00
BasedUser
8eedb5f610
Formation of CAMS 2020-11-13 10:11:55 +03:00
Anuken
4e7d6e9a9d Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-12 18:46:24 -05:00
Anuken
6eaec7d505 Bugfixes + Binary and 2020-11-12 18:46:20 -05:00
Anuken
d9d4360b49
Merge pull request #3372 from L0615T1C5-216AC-9437/patch-2 
Add Chaotic Neutral's name and new attack server
 2020-11-12 18:28:49 -05:00
Anuken
d1d3ef0c67 Sound framework improvements 2020-11-12 18:07:26 -05:00
L0615T1C5-216AC-9437
addcf350b2
Add Chaotic Neutral's name and new attack server 2020-11-12 14:55:36 -05:00
Leonwang4234
636fffc750 scaling(Scaling.fit) 
Untested
 2020-11-12 08:37:38 -08:00
Anuken
d163cacb6a Merge remote-tracking branch 'origin/master' 2020-11-12 09:41:54 -05:00
Anuken
e847a74a25 Fixed #3362 2020-11-12 09:41:49 -05:00
Anuken
c2aa655d87
Merge pull request #3365 from younggam/patch-4 
little java mod support
 2020-11-12 09:35:52 -05:00
younggam
f03c022db8
Update Pump.java 2020-11-12 20:52:23 +09:00
genNAowl
21a8a39344
Merge branch 'master' into unit-stats 2020-11-11 16:50:37 -08:00
Leonwang4234
14ee997a76 Merge remote-tracking branch 'upstream/master' into unit-stats 2020-11-11 16:49:29 -08:00
Anuken
b1b84fe380 Minor sound changes 2020-11-11 18:11:38 -05:00
Anuken
536a8f6085 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-11 17:13:26 -05:00