Commit Graph
6677 Commits
Author SHA1 Message Date
Athanasius bebf406e5b Release 4.2.7: appcast 2021-04-01 14:28:17 +01:00
Athanasius 23896a9a1f Merge branch 'stable' into releases 2021-04-01 14:26:40 +01:00
Athanasius d458034471 Release 4.2.7: appversion and changelog Release/4.2.7 2021-04-01 14:22:12 +01:00
Athanasius 64bc491224 Merge branch 'release-4.2.6' into release-4.2.7 2021-04-01 14:20:43 +01:00
Athanasius 7292f0ee50 Release 4.2.6: appcast 2021-04-01 13:18:22 +01:00
Athanasius ac056fa47d Merge branch 'stable' into releases 2021-04-01 13:11:04 +01:00
Athanasius 25fd5ffff9 Release 4.2.6: appversion & changelog Release/4.2.6 2021-04-01 11:37:18 +01:00
Athanasius 6196a17dd6 Merge pull request #962 from EDCD/fix/961/lagged-scan-bad-starpos
EDDN: Only add missing StarPos if for current system
2021-04-01 11:30:24 +01:00
Athanasius 96bb0959f5 EDDN: Only add missing StarPos if for current system
<https://github.com/EDCD/EDMarketConnector/issues/961>

It seems the game can report a Scan event *after* you've jumped to
another system.  So don't blindly set StarPos on Scan, check the
SystemAddress against where we think we are first.
2021-04-01 08:56:35 +01:00
Athanasius a494103ffd Release 4.2.5: appcast size 2021-03-29 16:12:23 +01:00
Athanasius dce3c32600 Release 4.2.5: appcast 2021-03-29 16:11:15 +01:00
Athanasius e938b2c003 Merge branch 'release-4.2.5' into releases 2021-03-29 16:09:32 +01:00
Athanasius f9cc742de4 Release 4.2.5: appversion and changelog Release/4.2.5 2021-03-29 16:02:17 +01:00
Athanasius a3fc24dd88 Merge pull request #953 from EDCD/fix/odyssey-alpha-gameversion
Use Odyssya JournalAlpha files
2021-03-29 15:53:07 +01:00
Athanasius f53d2cfb7c Remove "If it's not Fleet Carriers it's beta" check
Odyssey Alpha confirmed to have 'alpha' in gameversion.
2021-03-29 15:41:57 +01:00
Athanasius f8057925a5 Odyssey: Support JournalAlpha.<etc>.log files 2021-03-29 13:50:18 +01:00
Athanasius f58cd2fcdd Merge pull request #950 from EDCD/fix/export_ship-encoding-stable
Add try/except retry/paranoia to monitor.export_ship()
2021-03-29 10:51:14 +01:00
Athanasius 5fcafe52d3 Attempt writing new file if reading old one fails for any reason. 2021-03-29 10:15:52 +01:00
Athanasius fd03bf6427 Add try/except retry/paranoia to monitor.export_ship()
An old loadout might have been written before we made any attempt at
utf-8.

Even now, if someone is on sufficiently old Windows we might not be on
utf-8. If that's the case then no telling what will/won't work, but try
to read/write with utf-8 first, and fall back to default encoding if it
fails.
2021-03-29 09:05:17 +01:00
Athanasius 38d340f3fb Merge pull request #947 from EDCD/enhancement/old-config-fake-new-api
config.py: Compatibility layer for newer API calls.
2021-03-28 16:09:52 +01:00
Athanasius eed8db965a config.py: Compatibility layer for newer API calls.
This way a plugin updated for 5.0.0+ will work on next stable release.
2021-03-28 11:07:52 +01:00
Athanasius e089c567c5 Update coriolis-data/ in stable 2021-03-28 11:03:02 +01:00
Athanasius 15284a4a8e Release 4.2.4: appcast 2021-03-23 18:19:49 +00:00
Athanasius ac25e75a81 Merge branch 'main' into releases 2021-03-23 18:18:41 +00:00
Athanasius 4ca2fe1b05 Changelog: Korean translation updated. Release/4.2.4 2021-03-23 14:30:26 +00:00
Athanasius d01404b160 Release 4.2.4: appversion and changelog 2021-03-23 14:29:14 +00:00
Athanasius 6e2b8a7312 Translations: Small Korean update 2021-03-23 14:21:13 +00:00
Athanasius a627375c1e Merge pull request #933 from EDCD/enhancement/reduce-log-spam
Reduce some log spam:
2021-03-23 14:14:17 +00:00
Athanasius aab2a58a2d Reduce some log spam:
* Comment out the traceback in plugins/eddn.py, the return is enough.
* 'Called with no event_queue' can be TRACE.
* Don't care about "Everything was alright, the near-neutral status just
  wasn't stored." from Inara.
2021-03-23 13:48:44 +00:00
Athanasius 6764cab36f Merge pull request #932 from EDCD/enhancement/odyssey-version-paranoia
Extra paranoia about game version for forthcoming Odyssey Alpha
2021-03-23 13:20:25 +00:00
Athanasius 83f8f4f547 Clean up "not Fleet Carriers" gameversion check
1. No need for the () on the if.
2. Log when we force is_beta = True from this.
2021-03-23 12:44:12 +00:00
Athanasius c722a1cada Extra paranoia: Don't pick up 'JournalAlpha...' for now
It's possible FDev will use JournalAlpha, but forget to change the
gameversion string.
2021-03-23 12:40:28 +00:00
Athanasius f9034076d8 Extra paranoia about game version for forthcoming Odyssey Alpha
1. Pick up 'JournalAlpha' files if they ever are a thing.
2. Pick up 'alpha' in gameversion to set is_beta = True.
3. For now any gameversion without 'Fleet Carriers Update' is considered
   a beta.
2021-03-23 12:37:05 +00:00
Athanasius 274b25b5ca Merge pull request #928 from EDCD/fix/926/replaylog-no-index-0
Add Paranoia check in sendreplay()
2021-03-22 11:51:11 +00:00
Athanasius b4d928246e Adjust logging to include type (and not strictly False). 2021-03-22 11:48:52 +00:00
Athanasius 34c0536a7e Paranoia check in sendreplay().
See #926
2021-03-22 11:43:44 +00:00
Athanasius 03774cd891 Update main copy of edmarketconnector.xml to match releases.
Principally this updates `master` -> `main` mentions.
2021-03-21 11:08:13 +00:00
Athanasius c4d82dadbc appcast: Update stale 'master' link to 'main' 2021-03-21 11:07:34 +00:00
Athanasius a13946efd9 PLUGINS.md: Update old master branch link to main
Closes #924
2021-03-21 11:02:33 +00:00
Athanasius 46703b2349 Release 4.2.3: appcast 2021-03-18 19:02:49 +00:00
Athanasius aeffb64a82 Merge branch 'release-4.2.3' into releases 2021-03-18 19:01:37 +00:00
Athanasius 22811adf30 Release 4.2.3: appversion and changelog Release/4.2.3 2021-03-18 12:14:10 +00:00
Athanasius 8acbff739b Merge pull request #920 from EDCD/fix/909/auth-handle-edmc-arg
Allow 'edmc' argument to .exe to work (and add Korean language)
2021-03-18 12:05:49 +00:00
Athanasius 2e9f37cef2 Add new .bat file to build/install. 2021-03-18 11:39:45 +00:00
Athanasius fdee660881 Add .bat file for using --force-localserver-for-auth 2021-03-18 11:26:56 +00:00
Athanasius 07566dbfec Translations: Add Korean to installer
* Added L10n/ko.strings file.
* Added Korean (ko, decimal 12) to installer languages.
2021-03-18 10:22:29 +00:00
Athanasius 9bcba49416 docs/Translations.md: Fix typo of .string(s) 2021-03-18 10:17:38 +00:00
Athanasius 2ddea7d4f1 Log when we detect edmc:// arg and attempt ShellExecute()
This is the code path for when something ignores the ddeexec registry
key and instead invokes EDMarketConnector.exe with the edmc://...
argument directly.

Our response is to try ShellExecute() to invoke the DDE path instead.
If the DDE path isn't set up (registry key
`Computer\HKEY_CLASSES_ROOT\edmc\shell\open\ddeexec` not present and
correct), then this will cause a loop of repeatedly invoking
EDMarketConnector.exe.

That key is inserted by the installer.  The only reasons for it to not
be there would be something blocking the installer from creating it or
something removing it after install.
2021-03-18 10:13:15 +00:00
Athanasius d6e7cbce16 Suppress already_running_popup() if we have args.edmc 2021-03-18 09:54:24 +00:00
Athanasius 6ba01c7bc2 Translations: Add Korean 2021-03-18 09:42:54 +00:00