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
e8b56b076b
Instantiate mutators when a mutated module is created / loaded from DB. Some bug fixes for a few things.
2018-06-10 01:10:53 -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
20f57146c4
Merge branch 'master' into mutaplasmids
...
# Conflicts:
# eve.db
2018-06-03 16:31:20 -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
e8efa22a95
Merge branch 'singularity'
2018-05-30 19:49:40 -04:00
blitzmann
8ab709e590
* Update database (unpublish Abyssal items, for now)
...
* Add eve data version and datetime to about window (temp measure until we can get a better about window implemented)
2018-05-29 19:37:55 -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
fabf759aa7
Start implementing support for mutaplasmids.
...
* There's a new table `mutators` that has an FK back to a module, and links to an attribute ID with it's new value
* Fixes an issue in the item state where the "base" value showed the literal base value for the attribute, regardless of override / mutators
* If there is an override and a mutated attribute, mutated value takes effect
2018-05-24 01:26:49 -04:00
blitzmann
f9e60a00f2
Remove the CREST table from a migration, since it no longer exist (was causing issues for some folks with very old databases)
2018-05-21 23:03:25 -04:00
blitzmann
eeb700c75d
Get back into tox's good graces
2018-05-15 01:41:32 -04:00
Ryan Holmes
8153b80d05
Work around for sso character not being delete from characters after sso deleted, some other minor tweaks
2018-03-15 19:58:17 -04:00
Ryan Holmes
b74654a5b3
Fix relationships for sso / characters
2018-03-15 02:58:58 -04:00
Ryan Holmes
4c6f68b07e
Move sso character stuff to character file (for now while I try to figure out how to properly delete these)
2018-03-14 18:46:49 -04:00
Ryan Holmes
9839efc2dc
Fix sso character relationship to not delete sso character (whoops)
2018-03-14 18:40:38 -04:00
blitzmann
be19b7414a
Make a relation between characters and sso chars
2018-03-11 19:39:58 -04:00
blitzmann
75f9a0252a
Start working on character to SSO character mapping
2018-03-11 17:38:51 -04:00
blitzmann
5560ef4d34
Merge branch 'test-3' into esi
...
# Conflicts:
# eos/saveddata/character.py
# service/character.py
# service/eveapi.py
# service/pycrest/eve.py
2018-03-10 15:32:21 -05:00
blitzmann
78f632a4f6
Merge remote-tracking branch 'origin/master' into test-3
2018-02-24 02:03:29 -05:00
blitzmann
362086cc83
Fix type in database default for damage types
2018-02-24 01:47:05 -05:00
blitzmann
33bf5234d0
Goodbye eveapi! You have served us well all these years!
...
Start stripping XML API stuff and implement ESI skill fetching.
2018-02-09 00:42:59 -05:00
blitzmann
5fbe623ae6
get fit deletion working. Need to be aware that we are still using cached fit listing...
2018-02-08 01:38:24 -05:00
blitzmann
c7360c8cc3
Get logging into EVE working and SSO characters saving, along with client hashes being stored alongside characters.
2018-02-07 00:44:37 -05:00
blitzmann
2376148380
Start ripping CREST stuff out, add new SSOCharacter stuff in. Long process ahead.
2018-02-02 02:05:49 -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
5697da7ec2
fix upgrade
2017-11-24 01:23:04 -05:00
blitzmann
46b0aded03
fixes
2017-11-23 22:43:41 -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
7058018aed
Fix alpha clones
2017-11-22 21:51:40 -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
Ryan Holmes
73d9dd60e6
Don't return None as a price, always return a float ( #1291 ) ( #1292 )
2017-09-21 21:13:05 -04:00
blitzmann
d19486ce15
cleanup
2017-07-11 02:30:26 -04:00
blitzmann
b55fcfaf04
cleanup
2017-07-11 02:06:09 -04:00
blitzmann
60e5085724
ohgodwhathaveidone.jpg
2017-07-11 01:50:54 -04:00
blitzmann
78e065feff
Apparently, my IDE settings changed from spaces to tabs. Changing this back :3
2017-07-11 01:13:25 -04:00
blitzmann
453054f6c7
Remove command fitting from the command fits context menu upon deletion ( #1244 )
2017-07-11 01:10:39 -04:00
blitzmann
231f9a91c2
Do not assume number of columns for damagePatterns, see #1238
2017-07-10 22:46:30 -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
496b28226d
Merge branch 'feature/booster-side-effects' into development
2017-07-09 18:26:38 -04:00
blitzmann
307ccd10e8
Implement migration for t3c configurations
2017-07-09 00:34:12 -04:00
blitzmann
826c73c903
Merge branch 'strat_cruisers' into singularity
2017-06-25 01:26:55 -04:00
blitzmann
ff58648f94
start picking at strat cruiser update
2017-06-21 22:19:37 -04:00