Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,415 Commits 4 Branches 180 Tags
845b64945e0ce6a39deaa52d0074d54cd2965260
Commit Graph
10394 Commits
Author SHA1 Message Date
AnukenandGitHub 21b1a0aedf Merge pull request #3387 from MEEPofFaith/patch-1 
Remove extra Omura cannon image.
 2020-11-14 14:28:54 -05:00
AnukenandGitHub 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
Prosta4okuaandGitHub 4a25063a29 Update bundle_uk_UA.properties 2020-11-14 15:50:53 +02:00
Prosta4okuaandGitHub 6b2ba8b432 Update bundle_uk_UA.properties 2020-11-14 15:48:59 +02:00
Prosta4okuaandGitHub 6753ab7c6e Update bundle_uk_UA.properties 2020-11-14 15:33:53 +02:00
Felix CorvusandGitHub dbc446f400 11 new lines 
New:
threat.low
threat.medium
threat.high
threat.extreme
threat.eradication
sector.biomassFacility.name
sector.windsweptIslands.name
stat.weapons
stat.bullet
bullet.sapping
bullet.healpercent
 2020-11-14 12:20:28 +03:00
YellOw139andGitHub 3055485e17 Good stuff I can't even translate 2020-11-14 10:22:59 +02:00
younggamandGitHub bfc2b08bcc ammo protectd->public 2020-11-14 14:56:47 +09:00
younggamandGitHub 4d66d63da2 requirements protected->public 2020-11-14 14:55:59 +09:00
younggamandGitHub 4ee4e39518 constructor protected->public 2020-11-14 14:54:22 +09:00
MEEP of FaithandGitHub 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
YellOw139andGitHub bd992b4612 Unit stats look threatening 2020-11-14 00:01:17 +02:00
Prosta4okuaandGitHub ea41e38706 Оновлення 
Залишилось перевіти десь зо 30 рядків
 2020-11-13 23:59:24 +02: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 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
BohaskaandGitHub eaf76b5513 Knockback for Spectre 
just made knockback for spectre on par with water.
 2020-11-13 19:52:34 +08:00
BohaskaandGitHub bda5393a74 Knockback for Spectre 
Suggested in https://github.com/Anuken/Mindustry-Suggestions/issues/1170
 2020-11-13 19:10:34 +08:00
DeltaNedasandGitHub e9bcf9e8b8 Merge branch 'master' into files 2020-11-13 07:10:39 +00:00
Anuken 6eaec7d505 Bugfixes + Binary and 2020-11-12 18:46:20 -05:00
DeltaNedas 6da6c9426d add file picker interface for mods 2020-11-12 23:21:49 +00:00
Anuken d1d3ef0c67 Sound framework improvements 2020-11-12 18:07:26 -05:00
VanguardandGitHub 4a1300f789 1 changed line 
mods.reloadexit
 2020-11-12 21:48:39 +03: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
younggamandGitHub f03c022db8 Update Pump.java 2020-11-12 20:52:23 +09:00
genNAowlandGitHub 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
Anuken 538f1d7330 Fixed #3352 / Fixed #3355 / Quad sounds 2020-11-11 17:12:42 -05:00
Leonwang4234 4d3c6879b5 Fix many things 2020-11-11 13:27:03 -08:00
AnukenandGitHub 9ef57c0366 Merge pull request #3345 from DeltaNedas/nothing 
nothing
 2020-11-11 15:01:36 -05:00
Prosta4okuaandGitHub c263a1e52f Добридень 2020-11-11 21:58:39 +02:00
Anuken cf4f912cef Cleanup 2020-11-11 14:55:16 -05:00
YellOw139andGitHub 56fece1a30 [Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit ddc2cc7098
- Typo fixes & various other improvements
 2020-11-11 21:51:00 +02:00
Anuken 988fdb0c9b Fixed impact0078 missing wave 2020-11-11 14:08:57 -05:00
Anuken 0f61e8cfd9 arc 2020-11-11 13:42:30 -05:00
DeltaNedas a3d4c239d1 nothing 2020-11-11 18:28:42 +00:00