Commit Graph
100 Commits
Author SHA1 Message Date
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
AnukenandGitHub b435c83fb6 Merge pull request #3377 from Bohaska/patch-1
Knockback for Spectre
2020-11-13 10:47:36 -05:00
AnukenandGitHub 1da52d2e42 Merge pull request #3374 from BasedUser/patch-6
Formation of the CAMS
2020-11-13 10:34:49 -05: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
AnukenandGitHub 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
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
AnukenandGitHub c2aa655d87 Merge pull request #3365 from younggam/patch-4
little java mod support
2020-11-12 09:35:52 -05: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 6cb22dd190 arc 2020-11-11 17:13:19 -05:00
Anuken 538f1d7330 Fixed #3352 / Fixed #3355 / Quad sounds 2020-11-11 17:12:42 -05: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 988fdb0c9b Fixed impact0078 missing wave 2020-11-11 14:08:57 -05:00
Anuken f86984b5fc Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-11 13:42:35 -05:00
Anuken 0f61e8cfd9 arc 2020-11-11 13:42:30 -05:00
AnukenandGitHub a0e2fc3a67 Updated servers to new format 2020-11-11 13:27:27 -05:00
Anuken 112b91469b arc 2020-11-11 13:19:57 -05: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 eba559d0ff But does the iOS version need MP3s now? 2020-11-11 11:22:41 -05:00
Anuken f5ffee54ac arc 2020-11-11 10:57:36 -05:00
Anuken d266227827 Merge remote-tracking branch 'origin/master' 2020-11-11 10:55:32 -05:00
Anuken a4f5c1c55f Back to OGG 2020-11-11 10:55:19 -05:00
AnukenandGitHub 2990972130 Merge pull request #3271 from DaGamerFiles/patch-3
Update bundle_in_ID.properties
2020-11-11 09:48:13 -05:00
AnukenandGitHub ec956ae5f3 Merge pull request #3332 from jimmy927/master
Better and more complete swedish translations.
2020-11-11 09:42:15 -05:00
AnukenandGitHub da3572a900 Merge pull request #3315 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-11-11 09:42:03 -05:00
AnukenandGitHub e48dc2ea5e Merge pull request #3259 from YellOw139/patch-1
[Bundle][RO] Translation Update
2020-11-11 09:41:24 -05:00
Anuken 4f4f8f08bb arc 2020-11-11 09:28:28 -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
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
AnukenandGitHub 9822b6c67a Merge pull request #3334 from buthed010203/patch-2
Small grammar fix
2020-11-10 17:37:34 -05:00
AnukenandGitHub dbd677efed Merge pull request #3333 from buthed010203/patch-1
Fix bleeding edge updater
2020-11-10 17:04:33 -05:00
Anuken 8d3df82f81 arc 2020-11-10 14:54:49 -05:00
Anuken 002265f911 arc 2020-11-10 14:54:46 -05:00
Anuken 2d7562255a More sector overview visual changes 2020-11-10 14:54:07 -05:00
Anuken e68eda3e58 Merge remote-tracking branch 'origin/master' 2020-11-10 13:48:05 -05:00
Anuken ddc2cc7098 New preset / Indication of vulnerable sectors 2020-11-10 13:47:55 -05:00
AnukenandGitHub 26d8fe0a56 Update gradle.yml 2020-11-10 09:47:49 -05:00
Anuken f0c4ebfd31 Removed LCategory 2020-11-10 08:57:30 -05:00
Anuken ebdced5c6c Merge remote-tracking branch 'origin/master' 2020-11-09 19:15:51 -05:00
Anuken 5eb4d25fe9 Fixed #3320 2020-11-09 19:15:37 -05:00
AnukenandGitHub eeb540409a Merge pull request #3319 from MEEPofFaith/patch-1
Add Movement Lightning to bundle
2020-11-09 18:51:15 -05:00
AnukenandGitHub e1541b8c06 Merge pull request #3275 from PAP6/patch-1
New 6.0 server(Now with DDNS)
2020-11-09 18:44:23 -05:00
Anuken 89589c3258 Converted music to mp3 / New tracks / Minor cleanup 2020-11-09 17:02:36 -05:00
Anuken 29c6d7fe6c arc 2020-11-09 14:41:35 -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
AnukenandGitHub 2ae9be6335 Merge pull request #3284 from skykatik/cleanup-2
Cleanup
2020-11-09 12:38:02 -05:00
Anuken 548dc79fb0 Beginning work on grouped servers 2020-11-09 12:34:34 -05: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
Anuken 23403d0c51 Fixed #3300 2020-11-08 19:54:27 -05:00
Anuken ccfc1f57cc Unit prefRotation / Class unification (monos will vanish) 2020-11-08 18:52:09 -05:00
Anuken 84c4e0d74c Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-08 17:50:30 -05:00
Anuken cbfb703cfb prefRotation for units 2020-11-08 17:50:27 -05:00
AnukenandGitHub 58c3af4291 Merge pull request #3286 from DeltaNedas/fast
type.speed -> speed()
2020-11-08 17:50:04 -05:00
Anuken a35f62d181 Merge remote-tracking branch 'origin/master' 2020-11-08 16:40:36 -05:00
Anuken 28dfe2b1f7 More sound fixes 2020-11-08 16:40:32 -05:00
AnukenandGitHub b40c39b4e2 Merge pull request #3299 from summetdev/patch-8
[readme] Better Discord Badge.
2020-11-08 16:28:47 -05:00
Anuken 7bb23c3384 Some new sounds 2020-11-08 15:58:23 -05:00
Anuken 99d32b9903 arc 2020-11-08 13:55:27 -05:00
Anuken a211fceab4 SFX changes 2020-11-08 13:55:09 -05:00
Anuken 0a67576133 Fixed #3291 2020-11-08 08:49:49 -05:00
Anuken e636059ddf Corvus shoot SFX 2020-11-07 21:14:41 -05:00
Anuken 8910a9d537 Basic weather sounds, other tweaks 2020-11-07 20:57:49 -05:00
Anuken ae1965a5c7 Sound echo fixes + minor tweaks 2020-11-07 19:19:16 -05:00
Anuken 2ab897ef69 arc 2020-11-07 14:23:04 -05:00
Anuken 846f3a29eb Sound fixes 2020-11-07 14:13:35 -05:00
Anuken 65990ad817 max sound fix 2020-11-07 12:12:13 -05:00
AnukenandGitHub d11a03e7d8 Merge pull request #3163 from summetdev/logic-bounded
"Controlled" property for logic
2020-11-07 12:04:43 -05:00
Anuken de7a99aee4 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-07 11:48:14 -05:00
Anuken 94dd1416ee Testing filters + new natives 2020-11-07 11:48:04 -05:00
AnukenandGitHub 29b8db0a85 Merge pull request #3282 from DeltaNedas/master
use realSpeed in input stuff
2020-11-06 21:35:40 -05:00
Anuken 78af4e2120 Fixed iOS sharing 2020-11-06 21:02:08 -05:00
Anuken c51fcd3839 Export last log with crashes 2020-11-06 20:36:04 -05:00
Anuken 7e45d9b5b4 revert 2020-11-06 20:04:03 -05:00
Anuken 8c3577c55a ??? 2020-11-06 19:45:56 -05:00
Anuken 325800caab arc 2020-11-06 18:17:12 -05:00
Anuken 7c228f6c10 rc 2020-11-06 18:10:51 -05:00
Anuken 0f31eb7d23 Changed arc sound backend 2020-11-06 18:09:08 -05:00
Anuken fda2ed8b41 Cleanup 2020-11-06 13:34:57 -05:00
AnukenandGitHub e7d7be2f57 Merge pull request #3277 from MEEPofFaith/patch-1
Tractor Beam Status Effects
2020-11-06 13:25:58 -05:00