Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,742 Commits 4 Branches 180 Tags
0b6194cfc95b570f5fe23bc2c43c94dcc0ee5674
Commit Graph
2931 Commits
Author SHA1 Message Date
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
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
Anuken cf4f912cef Cleanup 2020-11-11 14:55:16 -05:00
Anuken 0f61e8cfd9 arc 2020-11-11 13:42:30 -05:00
DeltaNedas a3d4c239d1 nothing 2020-11-11 18:28:42 +00:00
Anuken 529bae8972 Fixed #3344 2020-11-11 12:45:30 -05:00
Anuken d909683f1d Fixed #3342 2020-11-11 11:45:50 -05:00
Anuken a4f5c1c55f Back to OGG 2020-11-11 10:55:19 -05:00
Anuken d1d793b16c Merge remote-tracking branch 'origin/master' 2020-11-11 09:28:28 -05:00
Anuken 12843af977 Cleanup 2020-11-11 09:28:17 -05:00
AnukenandGitHub d10960817d Merge pull request #3335 from DeltaNedas/error 
add more info to schematic errors
 2020-11-10 18:47:37 -05:00
DeltaNedas 6ba0bfe06a h 2020-11-10 23:33:53 +00:00
Anuken 887ce28fc2 Fix for render mocking 2020-11-10 18:16:18 -05:00
Anuken ac4f2cac32 Merge remote-tracking branch 'origin/master' 2020-11-10 18:13:53 -05:00
Anuken f089f2c2ff Bugfixes 2020-11-10 18:13:49 -05:00
DeltaNedas 71ae9e1274 add more info to schematic errors 2020-11-10 22:46:57 +00:00
buthed010203andGitHub c9670abff7 Fix bleeding edge updater 
The updater previously didn't update the original jar that was launched due to the use of the wrong function lol
 2020-11-10 16:19:07 -05:00
Anuken 2d7562255a More sector overview visual changes 2020-11-10 14:54:07 -05:00
Anuken ddc2cc7098 New preset / Indication of vulnerable sectors 2020-11-10 13:47:55 -05:00
Anuken f0c4ebfd31 Removed LCategory 2020-11-10 08:57:30 -05:00
Leonwang4234 3a27e6e94e Merge remote-tracking branch 'upstream/master' into unit-stats 2020-11-09 21:52:42 -08:00
Anuken 5eb4d25fe9 Fixed #3320 2020-11-09 19:15:37 -05:00
Anuken 89589c3258 Converted music to mp3 / New tracks / Minor cleanup 2020-11-09 17:02:36 -05:00
Anuken fe27ac6aec Testing mp3 sounds + hiding servers 2020-11-09 14:33:28 -05:00
Anuken 43e6da0fed Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-09 12:45:34 -05:00
Anuken 548dc79fb0 Beginning work on grouped servers 2020-11-09 12:34:34 -05:00
SkatandGitHub f84e780f3b Merge branch 'master' into cleanup-2 2020-11-09 20:21:01 +04:00
Anuken acb14a0986 Bugfixes 2020-11-09 10:40:02 -05:00
Anuken 2d4f4015b1 Fixed mono presence "corrupting" older saves 2020-11-08 20:24:31 -05:00
Leonwang4234 e9c00d8a9f remove unused imports 2020-11-08 17:23:05 -08:00