Commit Graph

237 Commits

Author SHA1 Message Date
Anton Vorobyov
b8a58fc7a6 Merge pull request #2590 from huangzheng2016/master
Update the SSO Login for Serenity and Singularity server's player
2024-02-26 23:35:31 +04:00
DarkPhoenix
b04c521805 Make sure not to crash character editor during SSO init when char editor is opened 2024-02-27 01:18:01 +06:00
正汰
be85080d8d Merge branch 'pyfa-org:master' into master 2024-01-12 11:00:13 +08:00
DarkPhoenix
d105748348 When importing skills, import their prerequisites as well 2023-12-22 03:43:47 +06:00
DarkPhoenix
f965497186 Fix tooltip 2023-12-21 10:03:06 +06:00
DarkPhoenix
be2cc523c2 Fix skill level suffix 2023-11-29 23:03:32 +06:00
DarkPhoenix
bafaed1d81 Fix character editor search crash 2023-10-30 23:33:35 +06:00
blitzmann
dc997f0dc4 Various updates to support server-aware calls per character 2022-05-07 12:35:16 -04:00
blitzmann
adba55eb7d Ensure that the token error dialog spawns n the three most used API calls that might trigger token refresh: fetch skills, fetch fits, and export fit 2021-10-24 14:07:04 -04:00
zhaoweny
038b7ce931 i18n: fix 'Level Not learned' issue in #2202 (comment) 2020-06-30 15:15:15 +08:00
zhaoweny
d33976a2ad i18n: more annotation for context menus, stats view tooltips 2020-06-23 15:55:28 +08:00
zhaoweny
889e901cbd i18n: improve string literal annotations
1. annotate more strings for statsViews, itemStats
2. fix raw title and description for preferences
3. fix crash on opening AttributeEditor, characterEditor
2020-06-22 17:55:58 +08:00
zhaoweny
4eda1a1d66 i18n: minor tweaks for easier translation
1. tweaks for characterEditor.py and patternEditor.py according to PR discussion.
2. fix for "Recent Fits" label not translated
2020-06-21 17:11:58 +08:00
blitzmann
9b73f1c221 Final conversion of _t() 2020-06-20 15:13:33 -04:00
zhaoweny
a05e7dbad1 i18n/zh_CN: add more UI translation 2020-06-20 17:42:52 +08:00
blitzmann
8e83adf7db Merge tag 'v2.22.1' into i18n
# Conflicts:
#	gui/esiFittings.py
2020-06-19 21:51:45 -04:00
DarkPhoenix
62d1d6a06d Avoid crash when nothing is selected 2020-06-18 06:04:23 +03:00
DarkPhoenix
27d3bea8d8 Merge branch 'ammo_graph' into singularity
# Conflicts:
#	gui/targetProfileEditor.py
2020-06-09 19:04:20 +03:00
blitzmann
5177768962 Start working through the files, adding translation strings 2020-05-16 14:42:29 -04:00
DarkPhoenix
f259df85cd Fix editors 2020-04-25 17:27:29 +03:00
Soeren Roerden
b22887dfad automatically create a character for a new sso character and add button to retrieve all chars directly linked to existing sso characters 2020-04-10 21:12:38 +02:00
DarkPhoenix
543089bcd9 Add context menu support for predefined implant sets 2020-04-06 22:20:28 +03:00
DarkPhoenix
4ba948c6f9 Merge branch 'master' into ammo_graph
# Conflicts:
#	gui/builtinMarketBrowser/itemView.py
#	service/market.py
2020-02-04 01:43:52 +03:00
DarkPhoenix
9ddfcc894f Make sure not to catch keyboard interrupts and system exits 2020-02-03 16:12:41 +03:00
DarkPhoenix
2f4a5a4830 Fix improper use of operator "is" when comparing to literal values 2020-01-31 18:16:36 +03:00
DarkPhoenix
400d0aaa22 Rework graph ammo picker to be dialog instead of frame 2019-11-25 16:54:25 +03:00
DarkPhoenix
8652a2891b Do not attempt to change skill levels of built-in all0/5 chars 2019-11-22 15:46:29 +03:00
DarkPhoenix
a09af0a9eb Propagate keys to upper windows if they were not processed in here 2019-11-22 15:45:01 +03:00
Sasha
745c0db530 Add keyboard shortcuts to character level editor 2019-11-21 18:10:56 -08:00
DarkPhoenix
18d8ed6558 Take modifier key info from event where possible 2019-10-08 20:50:14 +03:00
DarkPhoenix
ed1f52a114 Show implant description in tooltip of implant editor 2019-09-23 15:25:58 +03:00
DarkPhoenix
0269a64ae1 Add maximize button to resizeable windows and make character editor resizeable 2019-08-26 12:59:00 +03:00
DarkPhoenix
4ca737281d Fix background color of auxiliary windows on Windows 2019-08-20 18:29:29 +03:00
DarkPhoenix
bcdefdc4ac Rework more windows to rely on auxiliary frame 2019-08-12 14:41:41 +03:00
DarkPhoenix
fc65cb6000 More windows to auxiliary frame 2019-08-11 15:52:51 +03:00
DarkPhoenix
817e99a05d Change the way we close character editor 2019-08-10 02:42:19 +03:00
DarkPhoenix
a028ebe198 Rework how we handle all modal dialogs 2019-08-10 01:56:43 +03:00
DarkPhoenix
01371f227c Change the way we handle dialogs 2019-08-09 20:09:31 +03:00
DarkPhoenix
77ae235385 Offload actual set adding logic to windows calling the context menu 2019-07-30 22:01:33 +03:00
DarkPhoenix
2aa274f56f Remove character editor implant set context menu hack as it's no longer needed 2019-07-30 19:20:14 +03:00
DarkPhoenix
cd20164d7a Pass calling window to context menu 2019-07-30 19:12:45 +03:00
DarkPhoenix
3a09f4b45c Rework FitChanged command to avoid refreshing graph multiple times in certain cases 2019-07-07 14:25:27 +03:00
DarkPhoenix
6580734dc7 Print full connection exception in case of failure in debug mode 2019-05-28 16:03:25 +03:00
DarkPhoenix
5b52da737a Do not trigger esc when modifier keys are pressed 2019-05-12 17:08:41 +03:00
DarkPhoenix
dbef3b8c84 Unfuck character editor context menus 2019-04-30 22:39:38 +03:00
DarkPhoenix
c03d000c45 Pass item which is considered to be clicked item to context menus 2019-04-22 15:45:37 +03:00
DarkPhoenix
72fc560241 Make all secondary windows closable by ESC 2019-04-21 19:34:14 +03:00
Ryan Holmes
f95420d7bf Fix character editor context menu on Linux (#1895) 2019-03-24 20:59:40 -04:00
Ryan Holmes
a9a9fd1b1a Clean up another context menu 2019-03-24 19:08:31 -04:00
Ryan Holmes
d107156341 Fix for sill name getting cutoff on gtk (#1886) 2019-03-19 09:15:09 -04:00