blitzman
|
9df87f61cd
|
bump dev
(cherry picked from commit 2b3e646)
|
2016-12-14 12:22:17 -08:00 |
|
blitzman
|
4186e19c65
|
bump stable
(cherry picked from commit e0e7478)
|
2016-12-14 12:22:10 -08:00 |
|
blitzman
|
57edc32a4b
|
Clean up new tactical mode stats stuff
(cherry picked from commit c9bc234)
|
2016-12-14 12:21:00 -08:00 |
|
blitzman
|
9cfa0748ac
|
fix for #871
(cherry picked from commit 70af2b0)
|
2016-12-14 12:20:42 -08:00 |
|
blitzman
|
df859a2132
|
Fix for #883
(cherry picked from commit 753b5c5)
|
2016-12-14 12:19:54 -08:00 |
|
blitzman
|
52257d60ac
|
fix a couple command effects
(cherry picked from commit 9bb86b4)
|
2016-12-14 12:18:46 -08:00 |
|
blitzman
|
96ddb0bbff
|
Fixed a few issues with command bursts
(cherry picked from commit 9071960)
|
2016-12-14 12:18:41 -08:00 |
|
Ebag333
|
b529a28715
|
Implement fittingMode
(cherry picked from commit 5eb2fef)
|
2016-12-14 12:18:34 -08:00 |
|
Ebag333
|
ea3a374ced
|
Add logging, because why not
(cherry picked from commit 9403a1f)
|
2016-12-14 12:17:55 -08:00 |
|
Ebag333
|
2eacadf08f
|
Don't use try for fittingView, and don't show remove item for modes.
(cherry picked from commit fd224d6)
|
2016-12-14 12:17:13 -08:00 |
|
Ebag333
|
1a127bb1a6
|
Add ability to look at tactical mode item info.
(cherry picked from commit f5776a0)
|
2016-12-14 12:16:51 -08:00 |
|
Ebag333
|
edfa130939
|
Fix tooltip order
(cherry picked from commit 61d1878)
|
2016-12-14 12:15:09 -08:00 |
|
blitzman
|
7fbd89392a
|
Revert "Remove effect files that are not used by any item"
This reverts commit b29fa2467a.
(cherry picked from commit 4a95156)
|
2016-12-14 12:14:39 -08:00 |
|
Indiction
|
9f4b31979c
|
Adding Fighter Support CREST
(cherry picked from commit ab5f348)
|
2016-12-14 12:14:11 -08:00 |
|
blitzman
|
9ecfc475e3
|
Bump dev, fix for #874
(cherry picked from commit b375d3c)
|
2016-12-14 12:13:55 -08:00 |
|
blitzman
|
84dc93ac54
|
bump release
(cherry picked from commit f160aed)
|
2016-12-14 12:13:02 -08:00 |
|
Ebag333
|
7532bcda08
|
Clean up some stuff left over from cherry picks
|
2016-12-14 10:42:04 -08:00 |
|
Ebag333
|
08b5abc7ad
|
Handle unicode, utf8, and windows-1252
(cherry picked from commit 0d4f24a)
|
2016-12-14 10:38:56 -08:00 |
|
Indiction
|
38bf143704
|
Fighters for export and import functions
(cherry picked from commit 04c30e7)
|
2016-12-14 10:24:45 -08:00 |
|
Ebag333
|
a440ed3b37
|
Drop unicode
(cherry picked from commit 7fe7056)
|
2016-12-14 10:20:57 -08:00 |
|
Ebag333
|
39b7d9fdeb
|
Change to shorthand unicode
(cherry picked from commit ab32a3a)
|
2016-12-14 10:20:53 -08:00 |
|
Ebag333
|
dfa728a486
|
Handle Lockbreaker, Void, and Focused Void Bombs
(cherry picked from commit ea3e5e2)
|
2016-12-14 10:20:48 -08:00 |
|
Ebag333
|
7bd8ca5a55
|
Removed actual fleet files. Cleaned up __init__.py that had references.
(cherry picked from commit b6c5183)
|
2016-12-14 10:20:20 -08:00 |
|
Ebag333
|
627977ab51
|
Purging fleet bonuses from code base
(cherry picked from commit 68f4570)
|
2016-12-14 10:18:19 -08:00 |
|
Ebag333
|
e3b592977a
|
Make some imports more explicit
|
2016-12-13 23:49:37 -08:00 |
|
Ebag333
|
622a734405
|
remove lazy import. Fix test
|
2016-12-13 23:35:29 -08:00 |
|
Ebag333
|
28404cd8bb
|
bajillion pep8 fixes to pass tox
|
2016-12-13 23:31:39 -08:00 |
|
Ebag333
|
be53dedb18
|
Large pep8 compliance to make work for Tox
|
2016-12-13 21:23:01 -08:00 |
|
blitzman
|
8ab6e26def
|
Start refactoring the command burst effects in a way that's not complete and total shit (only slightly shit)
|
2016-12-13 23:55:56 -05:00 |
|
Ebag333
|
b2a5a20650
|
Travis and CodeCov files
|
2016-12-13 20:37:52 -08:00 |
|
Ebag333
|
57f930c83e
|
Cherry pick commits from @a-tal
|
2016-12-13 20:35:03 -08:00 |
|
a-tal
|
b4dd65cf3e
|
dont use built-in function format as a var name
(cherry picked from commit 74dd6cf)
|
2016-12-13 20:19:27 -08:00 |
|
a-tal
|
4a9b1df9b4
|
pep8 fixes
(cherry picked from commit 5dc43b2)
|
2016-12-13 20:18:57 -08:00 |
|
a-tal
|
874bfb3305
|
missed a type
(cherry picked from commit f416c77)
|
2016-12-13 20:18:04 -08:00 |
|
a-tal
|
ab9c925c47
|
non-standard - use forces coding declarations
(cherry picked from commit 6e17d88)
|
2016-12-13 20:17:56 -08:00 |
|
a-tal
|
d3b6bc1c93
|
so many pep8 fixes
(cherry picked from commit bee125d)
|
2016-12-13 20:16:44 -08:00 |
|
Ebag333
|
cd7d25e4e1
|
Add skill bonus
|
2016-12-13 14:28:43 -08:00 |
|
Ebag333
|
1e5e9122ae
|
Change gate to handle missiles with 0 values
|
2016-12-13 14:09:56 -08:00 |
|
Ebag333
|
506c7d31ca
|
Update DB. Add defender missile effect.
|
2016-12-13 13:48:58 -08:00 |
|
Ryan Holmes
|
54cc5abf21
|
Delete implants.py
This also shouldn't have been committed.
|
2016-12-13 13:49:19 -05:00 |
|
Ryan Holmes
|
18e913d9ba
|
Delete iconIDs.yaml
this shouldn't have been commited. whoops
|
2016-12-13 13:48:47 -05:00 |
|
Ryan Holmes
|
180de97893
|
Merge pull request #738 from Ebag333/Remove-Command-Boosts
Purging fleet bonuses from code base
|
2016-12-12 00:54:06 -05:00 |
|
blitzman
|
f198ff1773
|
more clean up
|
2016-12-12 00:49:47 -05:00 |
|
blitzman
|
55c13d1ad0
|
Merge branch 'master' into Ebag333-Remove-Command-Boosts
|
2016-12-12 00:43:52 -05: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
|
6adcfc52cd
|
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
|
2016-12-12 00:27:41 -05:00 |
|
blitzman
|
0a28fb60df
|
oops
|
2016-12-12 00:27:36 -05:00 |
|
Ryan Holmes
|
2bab1464ee
|
Merge pull request #811 from Ebag333/requirements.txt
Requirements for Pyfa
|
2016-12-12 00:25:32 -05:00 |
|
blitzman
|
7875c2acaa
|
Fix titan command effects
|
2016-12-12 00:24:50 -05:00 |
|