blitzmann
0456cb2f96
Merge remote-tracking branch 'origin/master' into test-3
2018-02-16 22:26:10 -05:00
blitzmann
cafd92f169
add a todo
2018-02-16 22:26:02 -05:00
blitzmann
05f08970c9
fix character editor not spawning on OSX
2018-02-16 20:40:51 -05:00
blitzmann
636ee1de23
Get new Standup fighters working
2018-02-15 22:26:42 -05:00
blitzmann
da0f89ef91
Merge commit 'refs/tags/v1.35.0^{}' into test-3
2018-02-14 22:25:45 -05:00
blitzmann
89b6e8f8c3
fix tox stuff
2018-02-14 22:15:48 -05:00
blitzmann
c6e715aa5c
Merge branch 'master' into test-3
2018-02-14 22:07:33 -05:00
blitzmann
649ba9f3e4
Merge branch 'master' into singularity
2018-02-14 21:31:54 -05:00
blitzmann
33618f12f7
Fix issue when error happens before wx is even initialized traceback is never set
2018-02-11 23:22:37 -05:00
blitzmann
5f0ce58c29
Merge branch 'master' into test-3
...
# Conflicts:
# gui/builtinShipBrowser/fitItem.py
# service/port.py
2018-02-11 21:29:17 -05:00
blitzmann
d94d49f0a9
Add misc column to booster panel, and show booster duration
2018-02-10 20:45:26 -05:00
blitzmann
0f30ea554d
Fix for #1377 - group up support fighters and modify the bonus based on amount active
2018-02-10 14:14:31 -05:00
blitzmann
50dd74dbe8
Add packaging requirement, and use it's PEP 440 version parsing for version comparisons.
2018-02-10 00:59:25 -05:00
blitzmann
2d7eed4aac
Fix for #1355 - we were not properly deleting the fit from the list being passed into the Import event (which the history functionality piggy backs on). This also fixes the same bug with the import list.
2018-02-06 00:36:57 -05:00
blitzmann
3179016aed
Enhance the update modal to show a web view with html-rendered markdown of release ntoes
2018-02-01 21:58:29 -05:00
blitzmann
9f7e4e0dc0
Fix issue with market search (None / int comparison)
2018-01-10 21:39:50 -05:00
blitzmann
29d175c7b3
Fix for error that happens when switching to/from firepower/mining
2018-01-10 00:51:21 -05:00
blitzmann
40ce7b7c0b
Merge branch 'master' into test-3
...
# Conflicts:
# .gitignore
# eos/saveddata/character.py
# service/network.py
# service/price.py
2017-12-10 22:36:15 -05:00
blitzmann
531721ef5e
Merge branch 'master' into development
2017-12-10 16:25:20 -05:00
blitzmann
2936b88c3d
code cleanup
2017-11-27 21:05:06 -05:00
blitzmann
c000b19986
Finish pulling all the cruft out of pyfa.py relating to logging and error handling. All that is now done in separate areas.
...
Also finally did some major reworking on the error dialog. Now it doesn't spawn a new wxApp and wxFrame for each and every error - attaches to MainFrame and sticks around, having exceptions append to it rather than spawn a new one. In the case that an error happens before MainFrame is available, it spins up a new wxApp. Yay cleanup!
2017-11-26 03:57:00 -05:00
blitzmann
1da127c898
Working commit to better handle errors
2017-11-26 01:54:36 -05:00
blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -05:00
blitzmann
7d46d7e22d
fix crash dealing with CREST fitting window's cache timer
2017-11-25 17:31:19 -05:00
blitzmann
b3157303cd
Reenable error dialog and remove versioning info - want to look into a more uniform way of doing this if possible, and the requirements are all changing.
2017-11-25 13:49:48 -05:00
blitzmann
65e17119af
Deprecation fix
2017-11-25 13:12:26 -05:00
blitzmann
f7b509f9a9
code styling
2017-11-25 04:04:13 -05:00
blitzmann
dea775058d
* Try other price sources if user's preferred fails ( #1342 )
...
* Handle cached prices better when eve-marketdata returns 0 for lack of price data (#1334 )
2017-11-25 02:50:46 -05:00
blitzmann
3c405f51d8
Remove platform-specific CREST checks (add for mac-deprecated client)
2017-11-24 17:27:44 -05:00
blitzmann
337f0a9c8a
Fix stretchspacers
2017-11-24 17:23:04 -05:00
blitzmann
53936a3e66
Fix additional panel note toggling correctly
2017-11-24 12:44:00 -05:00
blitzmann
30a6e29b39
Fix slight sizing issue with toggle panel header arrow
2017-11-24 12:30:46 -05:00
blitzmann
f3dc3bc654
Fix tabs not disabling. It was primarily an issue with event propagation not being handled correctly, as well as some missing helper code in chrome_tabs
2017-11-24 12:22:21 -05:00
blitzmann
0a935cf149
fix gtk warnings
2017-11-24 02:02:09 -05:00
blitzmann
e032c9c5b1
fix item stats dialog
2017-11-23 22:48:37 -05:00
blitzmann
46b0aded03
fixes
2017-11-23 22:43:41 -05:00
blitzmann
5e0a5da6d5
more post-merge work
2017-11-23 12:51:43 -05:00
blitzmann
6e112b9ed5
Fix issues with merge
2017-11-23 11:38:08 -05:00
blitzmann
b30b3fcbf1
Merge branch 'master' into test-3
...
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
2017-11-23 11:19:05 -05:00
blitzmann
bd181559ed
Don't show Side Effects menu if there are no side effects (eg: Synths)
2017-11-22 23:19:03 -05:00
blitzmann
5fa43138b3
Merge branch 'master' into development
...
Conflicts:
config.py
2017-11-22 23:06:36 -05:00
Ryan Holmes
b596447095
Fix issue with deleting a fit while having certain other fits open ( #1339 ) ( #1340 )
...
Also, bump dev version
2017-11-22 21:44:15 -05:00
blitzmann
4a33365195
Add some debug and fix indentation issue causing fit deletion to crash open fittings views
2017-11-22 01:45:31 -05:00
blitzmann
5d5646df79
Fix BlankPage having binding issue
2017-11-22 01:45:06 -05:00
blitzmann
4138088d4a
Do not create a new fitting view every time we switch fits.
2017-11-21 23:46:50 -05:00
blitzmann
d4df989427
Remove handlers from unbind (see https://github.com/wxWidgets/Phoenix/issues/624 )
2017-11-21 23:04:51 -05:00
blitzmann
0f94557699
Use wx.AutoBufferedPaintDC instead of wx.BufferedPaintDC (helps with drawing on linux)
2017-11-21 00:05:52 -05:00
blitzmann
a52b9e58e9
Testing some stuff out
2017-11-18 19:01:05 -05:00
blitzmann
d956cb7861
use a different image to denote changed skills
2017-11-16 01:31:28 -05:00
blitzmann
e848cec815
Fix dirty skill indicator (* instead of blue text). Need to get a different icon working for those. Remove debugging prints()
2017-11-16 01:20:38 -05:00
