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
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
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
blitzmann
b6a28ae15f
Merge branch 'master' into development
...
Conflicts:
config.py
2017-06-25 01:23:08 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
blitzmann
c2cb5d763f
Implement selectable booster side effects and persist them to the database, very much based on the fighter ability code. Still need to name them and enable the effects.
...
This also removes the old boosterActiveSideEffect table definition (migration script to drop table still needs to be written)
2017-06-04 23:33:11 -04:00
Ryan Holmes
208148b670
Fix issue with fit deletion ( #1211 )
...
* bump dev
* Fix issue with deleted fit not being removed from database cache (#1207 ). Also, include some error handling around the our commit stuff
2017-06-02 00:30:58 -04:00
blitzmann
f77cd0b834
Merge branch 'master' into development
2017-06-01 00:32:06 -04:00
Ryan Holmes
45c3533501
Make some extra logging statements and stuff to troubleshoot fit deletion bugs ( #1199 )
2017-05-30 22:57:52 -04:00
petosorus
1781c6dcf0
total computation + settings
2017-05-24 16:27:32 +02:00
Ebag333
5a60cff9a1
Fixes EVEMon import. Security status was added, but wasn't handled in the EVEMon import. Also, default secstatus to 0 if it's somehow missing.
2017-05-22 00:29:29 -04:00
Ryan Holmes
18554e3186
Fix a bunch of item swapping mechanisms (see #1186 ) ( #1187 )
2017-05-21 20:31:12 -04:00
Ryan Holmes
da33a372cb
Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. ( #1168 )
2017-05-14 20:52:06 -04:00
blitzmann
3b23c9eacd
flake8
2017-05-14 01:41:15 -04:00
blitzmann
d4ce1ef3db
Fix issue with Delete key event on t3d mode causing exception ( #1160 ). Additionally, work around the fact that every module that is removed also recalculates the fit, allowing for a faster response time when deleting multiple modules at a time. This is somewhat ugly as the removeModule function was originally based on the assumption of removing only one module. Should clean it up at some point.
2017-05-14 01:37:49 -04:00
blitzmann
ffe840e245
Fix for #1161 . Can't reproduce, but I'm unsure what the root cause is (probably something firing in the wrong order). 9be4ae may also alleviate the root cause.
2017-05-13 23:28:51 -04:00
blitzmann
5e20d6973f
Fix situation in which deleting a fit that was both a command and projected fit for the same target threw an error
2017-05-13 23:28:49 -04:00
blitzmann
5392aaa27e
refresh command fits on boosted fits when the booster is deleted
2017-05-13 23:28:48 -04:00
Ryan Holmes
b39ec4f9b3
Do not commit price objects to database from within thread ( #1154 )
...
* Remove database commit in price worker, essentially bringing it back to the previous functionality (pass thread list of price objects, it modifies, calls back for main thread to commit). There's probably a better way to handle this for the future creating a scoped session or something, but for now this works
* E303 too many blank lines (2)
2017-05-11 01:15:07 -04:00
Ryan Holmes
de9b167242
Bump version and include fix for #1147 ( #1150 )
...
* bump dev
* Fix two issues with deleting fits (#1147 )
2017-05-10 18:48:33 -04:00
blitzmann
3de63c5ca5
flake8 fixes
2017-05-08 21:32:13 -04:00
blitzmann
dd09b3d951
Add fitting notes to the ship browser tooltips
2017-05-08 19:20:30 -04:00
blitzmann
f022c2474c
Restrict fit notes export to 400 character for CREST and XML export
2017-05-08 19:02:30 -04:00
blitzmann
249956689a
text tweaks
2017-05-08 18:26:44 -04:00
blitzmann
6b22bd189a
Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
...
Conflicts:
eos/config.py
gui/notesView.py
service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
83a7a854bb
Merge branch 'feature/recent' into dev
...
Conflicts:
eos/db/saveddata/character.py
eos/db/saveddata/fit.py
Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
1604ea1f2c
Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities.
2017-05-07 02:02:54 -04:00
blitzmann
4a9662c0f7
Merge branch 'feature/skill-filter' into dev
...
Conflicts:
gui/characterEditor.py
This implements a long-requested feature to be able to search skills in the character editor
2017-05-06 13:25:20 -04:00
blitzmann
47a683c44c
Merge branch 'feature/strictSkills' into dev
...
Conflicts:
service/character.py
Implements strict skill requirement handling
2017-05-06 13:13:50 -04:00
