blitzmann
48a2963472
Merge branch 'issue/1433' into test-3
2018-02-24 23:40:26 -05:00
blitzmann
f245a02372
DNA export should respect Export Charges setting
2018-02-24 23:37:53 -05:00
blitzmann
78f632a4f6
Merge remote-tracking branch 'origin/master' into test-3
2018-02-24 02:03:29 -05:00
blitzmann
a9db667c9c
Do the same treatment to Target Resists as Damage Patterns
2018-02-24 02:01:23 -05:00
blitzmann
f442632fbc
Fix importing damage profiles which included overwriting existing ones and then performing a delete on one of them. #1416
2018-02-24 01:49:09 -05:00
blitzmann
73d59569ff
Merge remote-tracking branch 'origin/master' into test-3
...
# Conflicts:
# gui/characterEditor.py
2018-02-23 23:28:33 -05:00
blitzmann
e85d144928
Migrate the Save Character As dialog tot he same dialog / validator as the Edit Character Name ( #1419 )
2018-02-23 23:25:11 -05:00
blitzmann
c5ba79cfbb
Merge branch 'master' into test-3
...
# Conflicts:
# .gitignore
2018-02-23 01:02:51 -05:00
blitzmann
5b2c5907ed
Skills needed export ( #1412 ): Need to encode the string before we gzip it
2018-02-23 00:23:45 -05:00
blitzmann
201fb4e241
Remove all encoding bits from fit importing. Might not work 100% of the time, but as 2.0 gets introduced to the community, we'll get reports of possible problems. #1410
2018-02-23 00:00:53 -05:00
blitzmann
a1aa78adc0
Remove some defunct items from market service
2018-02-18 23:28:17 -05:00
blitzmann
42ccc53166
bit of clean up for reload setting
2018-02-18 20:35:46 -05:00
blitzmann
72efef818f
Fix version stuff
2018-02-17 13:59:19 -05:00
blitzmann
82e3db1ffb
Centralize version string getting. Still trying to work out how we should handle automatic version increments so we don't have to modify files all the time. Remove version file from repo (should only be a thing when building binaries)
2018-02-17 11:10:42 -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
5f0ce58c29
Merge branch 'master' into test-3
...
# Conflicts:
# gui/builtinShipBrowser/fitItem.py
# service/port.py
2018-02-11 21:29:17 -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
8a0f8ae609
Add module renames from singularity
2018-02-05 22:52:24 -05:00
burnsypet
b103f0df7e
Include service modules in EFT export
...
Change to service/port.py to include Slot.SERVICE in export
Also fixes a crash when attempting to export citadel with service
modules to CREST
2018-01-26 13:53:07 +00: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
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
fcdf55632f
working commit to try to clean up pyfa.py and re-implement version checking
2017-11-26 01:08:02 -05:00
blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -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
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
f0baba10df
Update effects
2017-11-22 23:04:32 -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
blitzmann
266398b1de
Get some things working for pyinstaller
2017-11-12 00:14:45 -05:00
blitzmann
cebca64e5e
Fix CREST stuff
2017-11-05 01:43:39 -05:00
blitzmann
ce3b94696a
Make sure getModifiedItemAttr always returns an int, unless otherwise wanting None
...
In py2, you could compare None to an int and it would always be less than. Unfortunately in py3, this is no longer the case. Returning getModifiedItemAttr as 0 allows us to not do a huge refactor.
2017-11-04 18:20:00 -04:00
blitzmann
266b3ce985
Set Victor and Virtuso to not published, and fix bug which allowed user fits to return in search even if ship isn't published ( #1310 )
2017-10-28 19:25:19 -04:00
Ryan Holmes
fd6e318ae3
Release/v1.33.0 ( #1319 )
...
* update database file to SISI 1202899
* Effect and group renaming
* Add civilian modules (#1308 )
* Add new effects
* update effect headers
* update database to tq - lifeblood (1203953)
* Update renders
* Update icons
* bump version
* fix tox errors
* change up tox config to ignore E722
* more tox ignores
* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.
* Try this
* more testing
* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
2017-10-25 23:33:05 -04:00
Ryan Holmes
da5aaf2f78
Feature/evemarketdata ( #1297 )
...
* Add preliminary support for eve market data
* Break out market sources into their own classes and register them onto the price service. Create preference option to select which source user wants. Default to eve central
* fix tox stuff
2017-09-23 19:39:38 -04:00
blitzmann
821ede8579
Do the same thing for damage patterns as we did for character for global setting
2017-09-22 02:08:53 -04:00
blitzmann
592f9a2298
Trigger a recalc on fit switching if the characters are not the same and the global character flag is set.
2017-09-22 02:01:27 -04:00
Ryan Holmes
ee392e07c4
Fixes ( #1288 )
...
* Provide correct text formatting index
* Fix remove item context menu in projected pane
2017-09-19 19:20:10 -04:00
blitzmann
d19486ce15
cleanup
2017-07-11 02:30:26 -04:00
blitzmann
30fe7930a9
Remove log spam
2017-07-11 01:10:55 -04:00
blitzmann
1305a1f2b6
Do not get variations by "group" unless the item is part of a set of hard-coded categories. #1232
2017-07-10 00:11:54 -04:00
blitzmann
f5108c34db
Do not kill the entire XML import if one fitting fails ( #1231 )
2017-07-09 19:08:46 -04:00
Ebag333
d553c60b65
Fix errors caused by importing a few "skinned" ships. Patch by ebag. See #1231
2017-07-09 19:08:06 -04:00
blitzmann
496b28226d
Merge branch 'feature/booster-side-effects' into development
2017-07-09 18:26:38 -04:00
Ryan Holmes
7ae41b71b2
Fix some deprecated things and a bug or two
2017-07-02 23:26:44 -04:00
Ryan Holmes
57783fe80f
More work on character editor
2017-07-02 15:28:42 -04:00
Ryan Holmes
f24c2ddd22
Get skill list in character editor showing. Mostly doesn't work still
2017-07-02 14:12:00 -04:00
