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
blitzman
49bf40484d
Merge branch 'Ebag333-VoidBombs' into development
2016-12-11 23:27:40 -05:00
blitzman
07148f1e7f
Merge branch 'VoidBombs' of https://github.com/Ebag333/Pyfa into Ebag333-VoidBombs
...
Conflicts:
eos/effects/usemissiles.py
2016-12-11 23:27:30 -05:00
blitzman
8a6ef788b3
Merge branch 'Ebag333-UnicodePaths' into development
2016-12-11 23:06:23 -05:00
blitzman
d3e360b7c0
clean up path stuff
2016-12-11 23:03:09 -05:00
blitzman
b1bba74c5a
Merge branch 'UnicodePaths' of https://github.com/Ebag333/Pyfa into Ebag333-UnicodePaths
2016-12-11 23:01:08 -05: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
Ryan Holmes
cf91ae7627
Merge pull request #890 from Drezil/master
...
fixed parameters in call when adding neuts to structures.
2016-12-11 19:17:25 -05:00
Stefan Dresselhaus
0ba88d081a
wrong index in tuple.
...
Array looks normally so:
(RunTime, Value, etc., etc.)
("normal", -10, ..., ...)
I guess "RunTime" got added and this is an artifact as it is rarely
called.
Fixes Orca-Mining-Boost onto itself and other ships.
2016-12-11 21:56:17 +01:00
blitzman
b6420b9a4b
Get alpha clones in the database
2016-12-11 15:44:14 -05:00
Stefan Dresselhaus
4f77dff6dd
fixed parameters in call when adding neuts to structures.
2016-12-11 20:25:55 +01:00
blitzman
2b3e646213
bump dev
2016-12-11 14:18:48 -05:00
blitzman
e0e7478857
bump stable
2016-12-10 19:43:34 -05:00
Ryan Holmes
828d722be8
Merge pull request #807 from IndictionEve/ImportExportFighters
...
Fighters for export and import functions
2016-12-10 02:09:45 -05:00
Ryan Holmes
1ae55b34ee
Merge pull request #886 from Ebag333/T3DRebalance
...
Add ability to look at tactical mode item info
2016-12-10 02:08:18 -05:00
blitzman
c9bc2341d1
Clean up new tactical mode stats stuff
2016-12-10 02:04:51 -05:00
blitzman
eba98fec33
Merge branch 'T3DRebalance' of https://github.com/Ebag333/Pyfa into Ebag333-T3DRebalance
2016-12-10 01:37:44 -05:00
blitzman
70af2b0df7
fix for #871
2016-12-10 01:27:17 -05:00
blitzman
753b5c5339
Fix for #883
2016-12-10 01:11:38 -05:00
blitzman
9bb86b4ee4
fix a couple command effects
2016-12-10 01:00:14 -05:00
blitzman
2702193337
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2016-12-09 00:07:44 -05:00
blitzman
907196018b
Fixed a few issues with command bursts
2016-12-09 00:07:35 -05:00
Ebag333
5eb2fef89c
Implement fittingMode
2016-12-08 18:56:43 -08:00
Ebag333
9403a1fce9
Add logging, because why not
2016-12-08 17:31:04 -08:00
Ebag333
fd224d6781
Don't use try for fittingView, and don't show remove item for modes.
2016-12-08 16:59:26 -08:00
Ebag333
f5776a0cb2
Add ability to look at tactical mode item info.
2016-12-08 13:12:15 -08:00
Ebag333
5b62419520
Add requirements for getting this to work on Travis-Ci
2016-12-08 10:05:22 -08:00
Ebag333
b9e5a47924
Remove gnosis
2016-12-06 13:46:09 -08:00
Ryan Holmes
545c48266c
Merge pull request #880 from Ebag333/ECMTooltip
...
Fix tooltip order for ECM
2016-12-05 09:14:13 -05:00
Ebag333
61d1878494
Fix tooltip order
2016-12-04 22:36:22 -08:00
blitzman
4a95156e35
Revert "Remove effect files that are not used by any item"
...
This reverts commit b29fa2467a
2016-12-04 23:10:09 -05:00
Indiction
ab5f3488e7
Adding Fighter Support CREST
2016-12-04 19:56:42 +01:00
Ebag333
510492e5e9
More refactoring, elimited another recursive import
2016-12-03 17:12:16 -08:00
blitzman
b375d3cb6c
Bump dev, fix for #874
2016-12-03 18:28:48 -05:00
Ebag333
6ef57e735e
Missed imports. Fixed now.
2016-12-03 06:21:52 -08:00
blitzman
f160aede3e
bump release
2016-12-02 18:25:31 -05:00
Ebag333
ea8a4c01cb
Eliminate export calling fit.py (no need)
...
Except for 1 (clipboardXML), same number of lines of code in mainFrame,
lots of code gone from fit, and no more complicated. Also spotted an
import reference that got missed.
2016-12-02 12:50:49 -08:00
Ebag333
d963327ed4
Make it run again
2016-12-02 03:13:54 -08:00
