Commit Graph
100 Commits
Author SHA1 Message Date
Anuken a0f1f52a8b CI cleanup 2020-11-19 19:44:49 -05:00
Anuken b1ace4a7c9 CI cleanup 2020-11-19 19:39:40 -05:00
Anuken 8214188215 CI cleanup 2020-11-19 19:32:27 -05:00
Anuken 07ddf806ac CI cleanup 2020-11-19 19:27:21 -05:00
Anuken 8bd2b9b45c CI cleanup 2020-11-19 19:26:10 -05:00
Anuken 4e9b07d8e2 CI cleanup 2020-11-19 18:54:28 -05:00
Anuken a7aad1a1f9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.github/workflows/gradle.yml
2020-11-19 18:53:15 -05:00
Anuken f71b726877 Testing Github Actions CI 2020-11-19 18:53:02 -05:00
AnukenandGitHub ffcda6d246 Merge pull request #3470 from Quezler/patch-58
Allow for plugins to trigger the same alerts as sectors and guardians
2020-11-19 16:17:04 -05:00
AnukenandGitHub 4d113a6aac Merge pull request #3472 from DeltaNedas/buildpr
upload pr jar
2020-11-19 15:13:58 -05:00
Anuken 15ef32447c Merge remote-tracking branch 'origin/master' 2020-11-19 13:31:03 -05:00
Anuken aef6ac4335 Made RepairAI only move toward ally buildings 2020-11-19 13:30:59 -05:00
AnukenandGitHub d63efb1ff0 Merge pull request #3467 from Quezler/patch-57
Give some techtree brackets a new line
2020-11-19 12:45:05 -05:00
AnukenandGitHub f4c69372c9 Merge pull request #3468 from skykatik/patch-6
Remove space in ban message & added @ for argument
2020-11-19 12:44:52 -05:00
Anuken c468bdef6d Merge remote-tracking branch 'origin/master' 2020-11-19 12:31:31 -05:00
Anuken 97c3d36bae Re-added preloading of ground enemy path / Core unit casing FX 2020-11-19 12:31:27 -05:00
AnukenandGitHub 9033683e15 Merge pull request #3466 from Quezler/patch-55
Remove leading space from console kick message
2020-11-19 12:22:49 -05:00
Anuken 7612a22480 Implemented legacy (V5) research loading 2020-11-19 11:55:46 -05:00
AnukenandGitHub bbc8c05f93 Merge pull request #3354 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-11-19 10:39:15 -05:00
AnukenandGitHub bfbb082fd8 Merge pull request #3393 from Prosta4okua/patch-8
Ukrainian translation
2020-11-19 10:37:05 -05:00
Anuken 89ef2ac4d3 Naval research requirements for final sector 2020-11-19 10:23:46 -05:00
Anuken 506175212c Merge remote-tracking branch 'origin/master' 2020-11-19 10:14:49 -05:00
Anuken b57b1966a7 Switched to ALSA Soloud backend / Fixed sound muffling at start 2020-11-19 10:14:44 -05:00
AnukenandGitHub 08a50edb23 Merge pull request #3456 from DeltaNedas/mapsize
add @mapx/y to logic processor
2020-11-19 10:12:32 -05:00
Anuken 95c242a2e1 Fixed final sector missing waves / Fixed audio not working on Android 2020-11-19 09:43:15 -05:00
Anuken 72d5a8a768 Added "Launching From" info 2020-11-18 20:05:45 -05:00
Anuken 8692639e62 Fixed foreshadow coolant stat roundoff error 2020-11-18 19:08:26 -05:00
Anuken 1ef264d560 Added final campaign map (WIP, untested) 2020-11-18 18:58:54 -05:00
Anuken 63d4428527 Fixed #3453 2020-11-18 18:29:31 -05:00
Anuken 2758e65e19 Fixed typo 2020-11-18 13:30:35 -05:00
Anuken 129d76ad7e Fixed #3449 2020-11-18 13:20:23 -05:00
Anuken f4a7288633 Fixed #3447 2020-11-18 09:26:31 -05:00
Anuken adc7b30eab Limited all logic strings/symbols to 30 characters 2020-11-17 21:01:25 -05:00
Anuken 527be41e32 Merged Unit & Builder components / Cleanup 2020-11-17 19:40:18 -05:00
Anuken 8280166485 Cleanup 2020-11-17 16:06:02 -05:00
Anuken e453c6033a Cleanup 2020-11-17 15:05:24 -05:00
Anuken 40ae2e64c8 Merge remote-tracking branch 'origin/master' 2020-11-17 11:23:54 -05:00
Anuken 78ae6dde4f Fixed deconstruction area not being queued [Mobile] 2020-11-17 11:23:50 -05:00
AnukenandGitHub 2071bad22d Merge pull request #3426 from MEEPofFaith/continuous-weapon-recoil
Begin reloading continuous weapons  after the bullet finishes.
2020-11-17 11:05:17 -05:00
Anuken 054f0b2128 Fixed server not compiling 2020-11-17 10:26:50 -05:00
Anuken 1e2b593152 Added more validaiton for sector capture events 2020-11-17 10:20:57 -05:00
Anuken b46676014b Fixed #3431 / Fixed #3432 / Fixed #3429 / Fixed #3435 / Fixed #3434 2020-11-17 10:18:08 -05:00
Anuken 3c36749990 Implemented automatic co-op sector change sync 2020-11-17 09:39:28 -05:00
Anuken 280e345faf Cleanup 2020-11-16 19:50:15 -05:00
Anuken f296d23cfa Bugfixes 2020-11-16 19:43:56 -05:00
Anuken 3b609f698a Fixed #3422 2020-11-16 17:41:42 -05:00
Anuken 242109f34e Mobile font border fix 2020-11-16 17:00:14 -05:00
Anuken 4b733fe244 Merge remote-tracking branch 'origin/master' 2020-11-16 16:32:10 -05:00
Anuken 74f083b897 Better sector icons 2020-11-16 16:31:55 -05:00
AnukenandGitHub 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
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
AnukenandGitHub 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
AnukenandGitHub 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
AnukenandGitHub 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
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
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