blitzmann
|
96c3363edc
|
Merge branch 'master' into feature/alphaclones
Conflicts:
eve.db
|
2017-01-26 19:39:13 -05:00 |
|
blitzman
|
468a4644d6
|
Merge branch 'development'
Conflicts:
eos/db/saveddata/queries.py
|
2017-01-10 22:42:01 -05:00 |
|
blitzman
|
5cbffcf3ac
|
Handle counting number of fits per ship category more efficiently (see #819)
|
2017-01-03 01:32:12 -05:00 |
|
blitzman
|
a0ec13d2ed
|
More tweaks
|
2017-01-02 18:45:08 -05:00 |
|
Ebag333
|
3313b7421f
|
Move query logic into own function in queries. Tighten up flow in DB repair. Catch null values.
|
2017-01-02 13:41:39 -08:00 |
|
blitzman
|
a76ee6b2fc
|
more tweaks
|
2017-01-02 12:07:15 -05:00 |
|
Ebag333
|
c1ead5fe27
|
change method for retreiving count
|
2017-01-02 00:29:44 -08:00 |
|
blitzman
|
85a89339a7
|
Cleaned up database corruption stuff
|
2017-01-02 00:58:54 -05:00 |
|
Ebag333
|
cef5842344
|
Database validation and cleanup
|
2016-12-26 21:54:52 -08:00 |
|
blitzman
|
16505b30bf
|
working commit
|
2016-12-12 00:43:42 -05:00 |
|
blitzman
|
95b3f0a21c
|
Merge branch 'Remove-Command-Boosts' of https://github.com/Ebag333/Pyfa into Ebag333-Remove-Command-Boosts
Conflicts:
eos/db/saveddata/fleet.py
eos/db/saveddata/queries.py
gui/additionsPane.py
|
2016-12-12 00:41:47 -05: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 |
|
blitzman
|
b2cf4b8aa5
|
Delete broken references to in commandFits (#844)
|
2016-11-28 21:07:09 -05:00 |
|
blitzman
|
0eed01811c
|
Conversion mappings
|
2016-11-22 20:36:52 -05:00 |
|
Ryan Holmes
|
91f87b02cc
|
Merge branch 'EffectTest' of https://github.com/Ebag333/Pyfa into Ebag333-EffectTest
Conflicts:
eos/saveddata/fit.py
eos/saveddata/module.py
|
2016-11-22 12:34:10 -05:00 |
|
Ebag333
|
3aa60ac669
|
Make Effects Togglable
|
2016-11-21 22:02:16 -08:00 |
|
blitzman
|
cb225eabb3
|
Get a working migration for command fits.
|
2016-11-20 22:06:26 -05:00 |
|
blitzman
|
72245d8ebe
|
Fix bad merge
|
2016-11-20 21:53:49 -05:00 |
|
Resin Neublem
|
78cbed516a
|
Adds a new notes pane for each fit
This allows users to save text notes for each fit. They may do this for history, or usage, etc.
|
2016-11-20 14:11:42 -05:00 |
|
Ebag333
|
b6c5183d40
|
Removed actual fleet files. Cleaned up __init__.py that had references.
|
2016-11-06 16:38:21 -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
|
cd28375019
|
Put some imports back. Prooooobably not needed but vOv
|
2016-10-19 13:32:57 -07:00 |
|
Ebag333
|
7cf4134a73
|
SQLAlchemy doesns't like is, requires ==
Oops.
|
2016-10-19 13:32:35 -07:00 |
|
Ebag333
|
44c76f0b98
|
Even more PEP8 cleanup
|
2016-10-19 12:29:33 -07:00 |
|
Ebag333
|
69a122a271
|
more PEP8 cleanup
|
2016-10-19 12:26:03 -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
|
126fa7be29
|
remove trailing semicolon
|
2016-10-19 11:51:12 -07:00 |
|
Ebag333
|
574d575cad
|
Reformatting eos.db
|
2016-10-19 11:37:28 -07:00 |
|
Ebag333
|
5e10339c20
|
Reformatting eos.db.saveddata
|
2016-10-19 11:33:29 -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 |
|
Ebag333
|
481619101b
|
Reformatting for PEP8 standards
|
2016-10-19 11:09:13 -07:00 |
|
Ebag333
|
ef9bd3edc8
|
Change class method from self to cls
Better match coding standards
|
2016-10-19 08:33:28 -07:00 |
|
Ebag333
|
45f88a92dc
|
Use list literal
|
2016-10-19 08:27:29 -07:00 |
|
Ebag333
|
c73b446482
|
Comparison with None performed iwth equality operators
|
2016-10-19 08:17:34 -07:00 |
|
Ebag333
|
699276ca58
|
Add __init__ to classes missing it
Mostly just to shut pyCharm up, but it's good practice.
|
2016-10-19 08:15:36 -07:00 |
|
Ebag333
|
35b5002eca
|
Add T2 resists and 90% resist profile
|
2016-09-25 22:52:11 -07:00 |
|
Ebag333
|
c30190f63e
|
Revert "Revert "Purging fleet bonuses from code base""
This reverts commit 6e54d6788c.
|
2016-09-15 15:27:30 -07:00 |
|
Ebag333
|
6e54d6788c
|
Revert "Purging fleet bonuses from code base"
This reverts commit 68f45706ab.
|
2016-09-15 15:27:10 -07:00 |
|
Ebag333
|
68f45706ab
|
Purging fleet bonuses from code base
|
2016-09-15 15:07:59 -07:00 |
|
blitzman
|
ed24ef2615
|
Delete projected modules from citadels
|
2016-08-28 20:22:30 -04:00 |
|
blitzman
|
64b75303af
|
Quick fix for override window crashing trying to load items that no longer exist (#706)
|
2016-08-26 21:52:56 -04:00 |
|
blitzman
|
5a5ab846c2
|
Fix for search
|
2016-08-12 20:05:22 -04:00 |
|
Ebag333
|
b79009517e
|
Updated po-ta-toe to po-tah-toh
|
2016-06-16 14:46:22 -07:00 |
|
Ebag333
|
12ccc96f46
|
Updated as per Blitzmanns feedback
https://github.com/pyfa-org/Pyfa/pull/639#issuecomment-225749245
|
2016-06-15 23:42:38 -07:00 |
|
Ebag333
|
53da2f9bb2
|
Many updates
Redid all the values, especially updated target resist profiles.
Re-implemented the _init_ on service\damagePattern.py to check for
default values.
|
2016-06-13 13:49:56 -07:00 |
|