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
blitzmann
96c3363edc
Merge branch 'master' into feature/alphaclones
...
Conflicts:
eve.db
2017-01-26 19:39:13 -05:00
blitzman
85131e6166
oh god this isn't gonna work
...
Merge branch 'ebag_importchanges' into test_import
Conflicts:
config.py
eos/db/saveddata/queries.py
eos/effects/chargebonuswarfarecharge.py
eos/effects/elitebonuscommandshipinformationhiddencs3.py
eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
eos/effects/energydestabilizationnew.py
eos/effects/iceharvestingdroneoperationdurationbonus.py
eos/effects/miningforemanstrengthbonus.py
eos/effects/modulebonuswarfarelinkarmor.py
eos/effects/modulebonuswarfarelinkinfo.py
eos/effects/modulebonuswarfarelinkmining.py
eos/effects/modulebonuswarfarelinkshield.py
eos/effects/modulebonuswarfarelinkskirmish.py
eos/effects/moduletitaneffectgenerator.py
eos/effects/remotehullrepair.py
eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
eos/effects/shipmodesmallmissiledamagepostdiv.py
eos/effects/structureenergyneutralizerfalloff.py
eos/effects/structuremoduleeffectstasiswebifier.py
eos/effects/structurerigmaxtargets.py
eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
eos/effects/techtwocommandburstbonus.py
eos/saveddata/fighter.py
eos/saveddata/fit.py
eos/saveddata/module.py
eve.db
gui/bitmapLoader.py
gui/builtinContextMenus/itemStats.py
gui/builtinStatsViews/miningyieldViewFull.py
gui/builtinViewColumns/misc.py
gui/builtinViews/__init__.py
gui/builtinViews/fittingView.py
gui/contextMenu.py
gui/graphFrame.py
gui/itemStats.py
gui/mainFrame.py
gui/marketBrowser.py
service/__init__.py
service/character.py
service/fit.py
service/port.py
service/prefetch.py
service/pycrest/eve.py
service/settings.py
2017-01-23 21:06:12 -05:00
Ebag333
f4761e099b
Don't let people rename built in chars
2017-01-01 13:17:39 -08:00
Ebag333
be3696deba
Add some sanity checks and validation of incoming data
2017-01-01 12:47:28 -08:00
Ebag333
4fb07cc1d0
Bunch of pep8 and inspection cleanup
2016-12-15 12:43:19 -08:00
Ebag333
be53dedb18
Large pep8 compliance to make work for Tox
2016-12-13 21:23:01 -08:00
Ebag333
57f930c83e
Cherry pick commits from @a-tal
2016-12-13 20:35:03 -08:00
a-tal
d3b6bc1c93
so many pep8 fixes
...
(cherry picked from commit bee125d)
2016-12-13 20:16:44 -08:00
blitzman
a954759012
GUI implementation of alpha clone switching
2016-12-11 22:51:48 -05:00
Ebag333
510492e5e9
More refactoring, elimited another recursive import
2016-12-03 17:12:16 -08:00
Ebag333
d963327ed4
Make it run again
2016-12-02 03:13:54 -08:00
Ryan Holmes
7331c158b6
Merge pull request #756 from MrNukealizer/FighterFixes
...
Fixed a few fighter/carrier bugs:
2016-10-08 23:07:01 -04:00
Mr. Nukealizer
5467a58b04
Fixed a few fighter/carrier bugs:
...
* Omnidirectional Tracking Link overheat applies to explosion radius/velocity bonuses.
* Networked Sensor Array affects fighters' sensor strengths.
* Long range heavy fighters no longer appear to require Bomb Deployment.
* Carriers and supercarriers are no longer capped at 300km lock range.
2016-09-30 20:25:55 -07:00
blitzman
c1179ddb40
Fix issue with fighter bomber charges causing skill requirement warnings
2016-08-30 23:45:21 -04:00
blitzmann
5a5e77414a
Remove rigs from prereq checking
2016-05-02 21:10:29 -04:00
blitzmann
f524591327
Fix prereq skill checking for fighters
2016-05-02 20:58:35 -04:00
blitzmann
87a354a314
Add SerializableUriCharacter to EVEMon import check ( #557 )
2016-04-29 23:15:30 -04:00
blitzmann
a3d9d5cca8
Migrate character editor to use new entity editor.
2016-03-29 21:19:20 -04:00
blitzmann
80e47d5157
Add some functionality to implantSet service, and get editor working correctly with implant editor view
2016-03-20 12:49:29 -04:00
blitzmann
6f1872fb94
Disable implants for read-only characters
2016-03-19 22:10:09 -04:00
blitzmann
dc55dbdf36
Polish some events
2015-09-25 14:48:05 -04:00
blitzmann
1d51e86c1c
Added individual skill save to context menu
2015-09-25 12:16:11 -04:00
blitzmann
2a88e3114b
Skill color goes back to normal when saving/reverting skill.
2015-09-25 11:15:08 -04:00
blitzmann
a0f9fb6ad6
Enable/disable edit menu options, and add color to character editor to show which skills are edited
2015-09-24 22:11:31 -04:00
blitzmann
b844bdf986
Add save character as dialog
2015-09-24 20:46:07 -04:00
blitzmann
61614553a2
Fix bug with char copy, and added char revert and save as (unfinished)
2015-09-24 19:03:30 -04:00
blitzmann
bd53785667
Allow all 5 and 0 to change skills from affecting skill menu
2015-09-14 20:35:36 -04:00
blitzmann
f2b4400834
Do auto-save when editing in character editor.
2015-09-14 20:30:12 -04:00
blitzmann
9ae5cfbab2
Revert "Fix API stuff. This should theoretically work, but it's untested."
...
This reverts commit 1402ceec63 .
2015-09-13 16:57:22 -04:00
blitzmann
045031e8ae
Revert "Fix character rename, delete, and copy."
...
This reverts commit c72f049ccd .
Conflicts:
service/character.py
2015-09-13 16:55:32 -04:00
blitzmann
1584586fd2
Try a different approach to temp skill levels
2015-09-13 16:51:36 -04:00
blitzmann
1402ceec63
Fix API stuff. This should theoretically work, but it's untested.
2015-09-12 13:15:59 -04:00
blitzmann
0b9cdaa944
Change the way skills are loaded. We now load all skills when character is created, instead of just creating character and loading skills on demand. This fixes a bug in which new characters were not saving their skills to the database.
2015-09-12 10:59:44 -04:00
blitzmann
89c011d37e
Minor modifications.
2015-09-12 10:30:51 -04:00
blitzmann
c72f049ccd
Fix character rename, delete, and copy.
2015-09-09 23:12:59 -04:00
blitzmann
ca34217f3b
Added character saving.
...
Deleting characters is broken for now due to using wrong session, but I believe creating character works. Further tests needed
2015-09-09 20:33:15 -04:00
blitzmann
182104a010
Fix #109
2015-07-19 16:20:42 -04:00
blitzmann
0060f58e3d
Support evemon character imports.
2015-07-11 10:17:02 -04:00
blitzmann
1c3f9ccf5b
Fix #240
2014-12-31 19:57:10 -05:00
blitzmann
18c86daea6
Do not include rigs in skill requirement checks
2014-12-30 21:08:55 -05:00
blitzmann
fa5edbb804
Fix reference to old eveapi
2014-08-14 22:52:55 -04:00
blitzmann
ed1b9854a0
Modify eveapi to work with pyfa service, move all character API calls from EOS to Character service and use new network service
2014-08-14 11:44:50 -04:00
blitzmann
df046769ff
Add GUI support for changing affected skills
2014-05-27 16:26:14 -04:00
blitzmann
4dc4679d03
Fix for refresh API button
...
This fix enables and disabled the API refresh button on main view.
Button is disable by default, and only enabled when both of the
following are true:
- Character is user created (no All 0/All 5), and
- Character has api data in database (including default character),
otherwise it obviously wouldn't work
2013-08-10 01:22:39 -04:00
blitzmann
7dce615933
Improvements to Character API
...
This commit adds default character and characters retrieved from API to
the DB, opening the door for "quick update" of API data (we now have api
details and character to update).
2013-08-06 13:01:30 -04:00
Martin Falatic
f53e6f8533
Added the character import enhancement (reads native EVE CCP XML)
...
Character class inherits from 'object' now for consitency
(as fit class does)
Strings updated for consistency (e.g., 'EvE' -> 'EVE')
Minor cleanup of the previous skills exporter enhancement
Moved character change/update event bindings to globalEvents (as fit changes are) for better re-use
2013-06-22 18:24:04 -07:00
Martin Falatic
fa64ed904d
Fixed skills exporter to remove duplicates that confuse EVEMon
2013-06-20 00:44:19 -07:00
Martin Falatic
67ed8818d8
Cleaned up. Supports txt, xml and emp (gzipped xml)
2013-06-15 17:50:53 -07:00
Martin Falatic
961fbaef69
Fix broken commit with better parameter passing; cleanup
2013-06-15 16:29:26 -07:00