blitzman
|
7115cd178c
|
Merge branch 'development' into LogBook_v2
Conflicts:
config.py
eos/saveddata/fit.py
gui/bitmapLoader.py
gui/graphFrame.py
gui/utils/exportHtml.py
pyfa.py
service/crest.py
service/price.py
service/server.py
|
2017-02-25 18:21:07 -05:00 |
|
blitzman
|
4ba11d832a
|
Tox fixes, because it's a thing we do now
|
2017-02-16 23:12:25 -05:00 |
|
blitzman
|
66d78fed2c
|
Add indication in character name of alpha status
|
2017-02-16 23:09:27 -05:00 |
|
Ebag333
|
3b185e1bcb
|
Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers
|
2017-02-11 11:51:53 -08:00 |
|
Ebag333
|
3562577521
|
Tox fix, and catch an extra shadowing
|
2017-02-10 12:06:23 -08:00 |
|
Ebag333
|
2b45a16872
|
Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.
|
2017-02-10 11:50:04 -08:00 |
|
Ebag333
|
64070a0798
|
Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later.
|
2017-02-09 09:36:16 -08:00 |
|
Ebag333
|
7865219164
|
Add a ton of default values
|
2017-02-09 00:56:33 -08: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 |
|
Ebag333
|
3c31391ec9
|
Burn types with fire
|
2017-01-09 22:36:19 -08:00 |
|
blitzman
|
a954759012
|
GUI implementation of alpha clone switching
|
2016-12-11 22:51:48 -05:00 |
|
blitzman
|
90c1033437
|
add clone grades to the client extraction list
|
2016-12-11 20:27:27 -05:00 |
|
blitzman
|
191a065de1
|
Get skill limits working
|
2016-12-11 20:26:30 -05:00 |
|
Ebag333
|
870e333605
|
Rebase from pyfa.org/master
# Conflicts:
# eos/effects/boosterarmorhppenalty.py
# eos/effects/boosterarmorrepairamountpenalty.py
# eos/effects/boostercapacitorcapacitypenalty.py
# eos/effects/boostermaxvelocitypenalty.py
# eos/effects/boostermissileexplosioncloudpenaltyfixed.py
# eos/effects/boostermissileexplosionvelocitypenalty.py
# eos/effects/boostermissilevelocitypenalty.py
# eos/effects/boostershieldcapacitypenalty.py
# eos/effects/boosterturretfalloffpenalty.py
# eos/effects/boosterturretoptimalrangepenalty.py
# eos/effects/boosterturrettrackingpenalty.py
# eos/saveddata/character.py
# eos/saveddata/drone.py
# eos/saveddata/fighter.py
# eos/saveddata/mode.py
# eos/saveddata/module.py
|
2016-11-21 22:21:25 -08:00 |
|
Ebag333
|
3aa60ac669
|
Make Effects Togglable
|
2016-11-21 22:02:16 -08:00 |
|
Ebag333
|
a3dfa3b5ba
|
Make Effects Togglable
|
2016-11-09 00:46:19 -08:00 |
|
Ebag333
|
ad76104033
|
Revert "Create variables before they are referenced. "
1dc15936ed
This is a problem for us. See #794 for more details.
|
2016-11-04 14:18:18 -07:00 |
|
Ebag333
|
0c0eb327f7
|
lots of PEP8 cleanup
|
2016-10-19 12:25:31 -07:00 |
|
Ebag333
|
1dc15936ed
|
Create variables before they are referenced.
Resolves attribute reference validation errors in pyCharm
|
2016-10-19 12:08:35 -07:00 |
|
Ebag333
|
f9f53a13c0
|
Reformatting eos.saveddata
|
2016-10-19 11:42:45 -07:00 |
|
Ebag333
|
c1dfd676e1
|
Simplified boolean check
|
2016-10-19 08:08:50 -07:00 |
|
blitzmann
|
10c79ac812
|
More work on restrictions
|
2016-07-04 11:01:08 -04:00 |
|
blitzmann
|
fe8c3a4957
|
Disable fit add on pages based on context (ship vs citadel)
|
2016-07-04 10:30:04 -04:00 |
|
blitzmann
|
fb2e6e5c17
|
Restrict skills being applied to citadels. The effect must be of type "structure" for it to apply. Fix issue with agility
|
2016-07-03 14:52:00 -04:00 |
|
blitzmann
|
4607dd788c
|
Implement ewar resists (#597)
|
2016-05-22 15:15:21 -04:00 |
|
blitzmann
|
fe9139ae93
|
Fix issue with adding multiples of the same skill to character via character import (#563)
|
2016-04-29 23:32:22 -04:00 |
|
blitzmann
|
a3d9d5cca8
|
Migrate character editor to use new entity editor.
|
2016-03-29 21:19:20 -04:00 |
|
blitzmann
|
65483309ab
|
Clear character implants during recalculation
|
2016-03-22 23:17:05 -04:00 |
|
blitzmann
|
938e2a871d
|
Merge branch 'master' into charImplants
Conflicts:
gui/characterEditor.py
|
2015-11-08 21:19:04 -05:00 |
|
blitzmann
|
f17fb82ce7
|
Fix issue with ship bonuses not applying when fit is projected (#374)
|
2015-10-05 18:10:39 -04:00 |
|
blitzmann
|
d0ec17feba
|
Some syntax
|
2015-09-25 14:13:33 -04:00 |
|
blitzmann
|
05b9d1e607
|
Fixed some bugs, added character action buttons on editor
|
2015-09-25 12:13:17 -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
|
61614553a2
|
Fix bug with char copy, and added char revert and save as (unfinished)
|
2015-09-24 19:03:30 -04:00 |
|
blitzmann
|
3ea4439b8d
|
Allow changing all 5 and 0 from editor
|
2015-09-18 11:59:52 -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
|
b8d01d5ecb
|
Fix a few things
|
2015-09-13 16:59:59 -04:00 |
|
blitzmann
|
1584586fd2
|
Try a different approach to temp skill levels
|
2015-09-13 16:51:36 -04:00 |
|
blitzmann
|
4663270067
|
Since we now have a list of skills by default on our character, remove the iterSkills iterator which helped fetch skills that were not previously loaded
|
2015-09-12 11:06:21 -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
|
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 |
|
Ryan Holmes
|
01db1efdf7
|
Merge pull request #336 from blitzmann/regSkills
Register skills when applying ship bonuses
|
2015-07-23 15:58:07 -04:00 |
|
blitzmann
|
e74e2615ad
|
Merge remote-tracking branch 'origin/projections'
|
2015-07-23 15:46:32 -04:00 |
|
blitzmann
|
182104a010
|
Fix #109
|
2015-07-19 16:20:42 -04:00 |
|
blitzmann
|
d6199a58c2
|
Separate projected fits from list of affectors. Also, show when affected module is projected. Still need to clean up affector tree stuff
|
2015-07-16 23:59:37 -04:00 |
|
blitzmann
|
0060f58e3d
|
Support evemon character imports.
|
2015-07-11 10:17:02 -04:00 |
|
DarkPhoenix
|
e81f7eb765
|
Change validator requirement for owner ID
This fixes bug related to sqlalch 1.0
|
2015-05-27 14:54:37 +03:00 |
|