blitzman
a24e247f1b
Merge branch 'master' into development
...
Conflicts:
eos/effects/usemissiles.py
eos/saveddata/fit.py
2016-12-18 09:24:39 -05:00
blitzman
0f05b60c20
Fix for #901
2016-12-18 05:47:56 -05:00
blitzman
936b746954
update headers
2016-12-16 21:19:00 -05:00
blitzman
ef14bfac58
Merge branch 'Patch_1105543' of https://github.com/Ebag333/Pyfa into Ebag333-Patch_1105543
2016-12-16 21:16:07 -05:00
blitzman
291f73b661
fix for #905
2016-12-16 20:59:54 -05:00
blitzman
3d9dae0d52
fuuu
2016-12-16 20:50:36 -05:00
blitzman
017c37c4af
Fix for #892
2016-12-16 20:49:42 -05:00
blitzman
ee0c852ddb
Fix titan effects and issue in which all warefarebuffs may not get run (range too short). This should also shore up ( #897 )
2016-12-16 20:17:20 -05:00
blitzman
d63627a37b
More cleanup
2016-12-16 19:26:54 -05:00
blitzman
3ac2fd870f
clean up
2016-12-16 19:20:30 -05: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
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
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
0a28fb60df
oops
2016-12-12 00:27:36 -05:00
blitzman
7875c2acaa
Fix titan command effects
2016-12-12 00:24:50 -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
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
Stefan Dresselhaus
4f77dff6dd
fixed parameters in call when adding neuts to structures.
2016-12-11 20:25:55 +01: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
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
907196018b
Fixed a few issues with command bursts
2016-12-09 00:07:35 -05: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
blitzman
b375d3cb6c
Bump dev, fix for #874
2016-12-03 18:28:48 -05:00
blitzman
5a846c36ab
Merge branch 'T3CSubRemoteRepEffect' of https://github.com/Ebag333/Pyfa into Ebag333-T3CSubRemoteRepEffect
...
Conflicts:
eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
2016-12-02 01:02:17 -05:00
Ryan Holmes
b76e8df1bf
Merge pull request #689 from MrNukealizer/RAH-v3
...
RAH v3
2016-12-01 01:06:24 -05:00
blitzman
4d9c2898bf
Fix orca effects ( #866 )
2016-12-01 00:07:24 -05:00
blitzman
0e4e7525e1
Add runtimes to command effects (defaulting to normal)
2016-11-29 23:18:35 -05:00
blitzman
5259df2828
Quick hack to run command boosts inside the runtime. See #839
2016-11-29 22:58:33 -05:00
blitzman
b2cf4b8aa5
Delete broken references to in commandFits ( #844 )
2016-11-28 21:07:09 -05:00
Ryan Holmes
0d874f9ad1
Merge pull request #858 from Ebag333/RemoveIncorrectEffects
...
Remove Effects
2016-11-27 21:51:55 -05:00
blitzman
019b8e93b4
Remove effect files for effects that no longer exist
2016-11-27 21:33:47 -05:00
blitzman
b29fa2467a
Remove effect files that are not used by any item
2016-11-27 21:32:44 -05:00
blitzman
8b17cbfbc8
Fix effects that utilize old commandBonus attribute, and update headers
2016-11-27 21:22:28 -05:00
blitzman
a445509d75
Revert removal of skill check in effect
2016-11-27 20:48:38 -05:00
Ebag333
45480a0216
These 4 effects break processing, because the bonus gets set to 0
2016-11-27 13:35:56 -08:00
Ebag333
466b2ac706
Fix multiple issues with effect
2016-11-26 23:15:19 -08:00
blitzman
459d55c31a
fix burst jammers
2016-11-23 21:18:20 -05:00
blitzman
7e98d29de0
Fix T3Ds ( #835 )
2016-11-23 21:12:00 -05:00
blitzman
6500e6d467
Fix some drone effects ( #840 )
2016-11-23 20:01:56 -05:00
blitzman
abcce8879f
Fix #834
2016-11-22 23:25:13 -05:00
blitzman
0eed01811c
Conversion mappings
2016-11-22 20:36:52 -05:00
blitzman
96b3d5637a
Fix industrial core effect
2016-11-22 20:04:57 -05:00
blitzman
4a09cbcec9
Merge branch 'Acendency-IndustrialCoreEffect' of https://github.com/Ebag333/Pyfa into Ebag333-Acendency-IndustrialCoreEffect
2016-11-22 20:00:00 -05:00
