blitzmann
b57bede510
tox fixes
2018-07-15 02:51:53 -04:00
blitzmann
39f7ecdf5c
Merge branch 'mutaplasmids'
...
# Conflicts:
# eve.db
2018-06-21 00:22:57 -04:00
blitzmann
5c566bae73
Introduce special cases for cargo swapping when dealing with abyssal modules ( #1649 )
2018-06-16 21:50:18 -04:00
blitzmann
6fdcce12a3
Merge branch 'icons-1621' into v2.2.0b1
...
# Conflicts:
# eos/db/__init__.py
# eos/db/gamedata/__init__.py
# eos/db/gamedata/item.py
# eos/gamedata.py
# eve.db
2018-06-12 21:43:28 -04:00
blitzmann
b3acc8fd21
Get a slider interface going for the items stats. Starting to come together!
2018-06-04 02:21:52 -04:00
blitzmann
3670f3289c
Convert a module to an abyssal with a mutaplasmid - saving to and loading from database confirmed.
2018-06-03 19:50:50 -04:00
blitzmann
3fbd869821
Get some basic relationships added for mutaplasmids
2018-06-03 16:28:33 -04:00
blitzmann
18bbe49c49
support renders
2018-06-02 14:34:00 -04:00
blitzmann
59d56fc333
Remove clothing form the database
2018-06-02 14:04:34 -04:00
blitzmann
5388ba7a70
Remove need for Icon class, references to it's DB relationship, and remove from DB. Also, add the files. All the files.
2018-05-31 21:13:12 -04:00
blitzmann
3944545721
Support for Abyssal module loading base item attributes
2018-05-27 14:58:14 -04:00
blitzmann
d3bd52fe07
Get dynamic attributes JSON saved to the database... now for the tinkering to begin!
2018-05-25 19:18:51 -04: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
b55fcfaf04
cleanup
2017-07-11 02:06:09 -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
ff58648f94
start picking at strat cruiser update
2017-06-21 22:19:37 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
blitzmann
3de63c5ca5
flake8 fixes
2017-05-08 21:32:13 -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
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
blitzmann
622efb624d
Refactor how remote resistance works. We now check the resistance ID directly from the effect, and fall back to the remoteResistanceID attribute. See #1139
2017-05-02 22:19:58 -04:00
blitzmann
32f417ce5a
Created first iteration of "Recent Fits" view, in which a nav button is interacted with to show a list of the 100 most recently modified fits. Ship Broswer is littered with ToggleRecentShips() to reset the icon when not in "recent" mode. This should probably be fixed at some point.
...
Removed the FIT_CHANGED binding from FitItem - this was causing very odd issues when the object was destroyed (navigating to another "stage") such as the Fit Changed event for that fit no longer firing (or at least seemingly so)
To fix this, simply look at the active fit during FitItem.Refresh()
Also creates a new query to get a list of items from the DB, although it's not used (was gonna use it, decided against it, but didn't want to delete the code - could prove handy later)
2017-04-26 18:51:39 -04:00
blitzmann
5657438e3c
Change up effect classes for better efficiency
2017-04-24 19:04:07 -04:00
blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -04:00
blitzmann
da9816d1bd
Implement character skill searching
2017-04-13 23:39:00 -04:00
Ebag333
802e2afcc0
General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out
2017-04-05 15:47:19 -07:00
blitzman
1826122381
Clean up some syntax (use isinstance) and tox stuff
2017-02-26 14:17:46 -05:00
blitzmann
767cb46d40
Merge branch 'development' into More_Variations
...
Conflicts:
gui/builtinContextMenus/metaSwap.py
2017-02-26 02:24:38 -05:00
Ebag333
72633825cf
Formatting and layout changes
2017-02-08 23:32:51 -08:00
blitzman
84867c6e67
fix oops
2017-02-07 19:22:31 -05:00
blitzman
f7d7b3fe5e
Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development
...
Conflicts:
eos/db/gamedata/metaData.py
eos/db/gamedata/queries.py
eos/db/saveddata/queries.py
eos/saveddata/fleet.py
eos/types.py
eve.db
gui/builtinContextMenus/amount.py
gui/builtinViewColumns/ammo.py
gui/builtinViewColumns/ammoIcon.py
gui/builtinViewColumns/capacitorUse.py
service/port.py
2017-02-07 19:22:26 -05:00
blitzman
ca311e5dec
Line endings again
2017-02-07 19:07:22 -05:00
blitzman
3ccd4ad2ca
Revert "Convert remaining files to CRLF"
...
This reverts commit a8ab876053
2017-02-07 19:05:45 -05:00
Ryan Holmes
a8ab876053
Convert remaining files to CRLF
2017-02-07 11:01:40 -05:00
Ebag333
be66ff1eec
Tox fixes
2017-02-05 15:39:07 -08:00
blitzman
1d69ed7584
Merge branch 'test_import' into development
...
Conflicts:
gui/builtinContextMenus/amount.py
gui/characterEditor.py
gui/itemStats.py
2017-01-27 20:39:54 -05:00
Ebag333
3774e3bca0
add variations for drones, fighters, boosters, and implants
2017-01-12 01:24:26 -08:00
Ebag333
3c31391ec9
Burn types with fire
2017-01-09 22:36:19 -08:00
Ebag333
28404cd8bb
bajillion pep8 fixes to pass tox
2016-12-13 23:31:39 -08:00
blitzman
a954759012
GUI implementation of alpha clone switching
2016-12-11 22:51:48 -05:00
blitzman
191a065de1
Get skill limits working
2016-12-11 20:26:30 -05:00
blitzman
b6420b9a4b
Get alpha clones in the database
2016-12-11 15:44:14 -05:00
Ebag333
d963327ed4
Make it run again
2016-12-02 03:13:54 -08:00
Ebag333
126fa7be29
remove trailing semicolon
2016-10-19 11:51:12 -07:00
Ebag333
feb83cf737
Revert "Revert "Reformatting eos.db.gamedata""
...
This reverts commit 0ff4aec400
2016-10-19 11:26:40 -07:00
Ebag333
0ff4aec400
Revert "Reformatting eos.db.gamedata"
...
This reverts commit e2944f6be7
2016-10-19 11:24:03 -07:00
Ebag333
e2944f6be7
Reformatting eos.db.gamedata
2016-10-19 11:19:24 -07:00
blitzman
5a5ab846c2
Fix for search
2016-08-12 20:05:22 -04:00
blitzmann
6141356754
Add Ice Products to search results ( #600 )
2016-05-30 22:43:31 -04:00
