Commit Graph
100 Commits
Author SHA1 Message Date
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
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