blitzmann
|
d19486ce15
|
cleanup
|
2017-07-11 02:30:26 -04:00 |
|
blitzmann
|
3da0b8bc29
|
Effect header update
|
2017-07-11 01:31:02 -04:00 |
|
blitzmann
|
f2e8506ea7
|
Merge remote-tracking branch 'origin/singularity' into development
|
2017-07-10 01:39:32 -04:00 |
|
blitzmann
|
496b28226d
|
Merge branch 'feature/booster-side-effects' into development
|
2017-07-09 18:26:38 -04:00 |
|
blitzmann
|
78b273455d
|
Fix up some effects
|
2017-07-09 14:44:57 -04:00 |
|
blitzmann
|
de35692666
|
Fix a few things with affected by tab (indentation issue, overwriting modifier incorrectly)
|
2017-07-09 13:18:28 -04:00 |
|
Wenda Zhou
|
afee4469f0
|
fix loki effects to apply correctly
|
2017-07-07 00:26:38 -04:00 |
|
blitzmann
|
e9c691575f
|
Fix RR effect
|
2017-07-05 23:48:44 -04:00 |
|
blitzmann
|
27236feec3
|
Add new effects
|
2017-07-03 22:24:27 -04:00 |
|
blitzmann
|
58a242f753
|
update effect headers
|
2017-06-27 21:03:16 -04:00 |
|
blitzmann
|
5c2cf6dd15
|
Add last bit of t3 effects from sisi data
|
2017-06-27 21:02:27 -04:00 |
|
blitzmann
|
287f3bc510
|
Fix some broken effects (due to effect renames)
|
2017-06-25 02:54:14 -04:00 |
|
blitzmann
|
ad0d55faed
|
update effect headers
|
2017-06-25 01:21:37 -04:00 |
|
blitzmann
|
910ae6315d
|
More work on subsystems
|
2017-06-25 01:19:48 -04:00 |
|
blitzmann
|
25b4d3a45b
|
More work on strat cruiser updates
|
2017-06-25 00:33:36 -04:00 |
|
blitzmann
|
f355cb3a72
|
Update effect headers
|
2017-06-25 00:18:06 -04:00 |
|
blitzmann
|
ff58648f94
|
start picking at strat cruiser update
|
2017-06-21 22:19:37 -04:00 |
|
blitzmann
|
47fcbefe8b
|
Finish off user-selectable booster side effects - effects are applied correctly now and each has their own display name. Implements #642
|
2017-06-05 00:18:36 -04:00 |
|
blitzmann
|
38e6e7d5ed
|
Add missing Dagon effect
|
2017-05-08 22:58:25 -04:00 |
|
blitzmann
|
3de63c5ca5
|
flake8 fixes
|
2017-05-08 21:32:13 -04:00 |
|
blitzmann
|
0507a55731
|
Get resists working with more things, and fix bug in which we were still looking at an effect info (which doesn't exist anymore)
|
2017-05-07 19:59:25 -04:00 |
|
blitzmann
|
622efb624d
|
Refactor how remote resistance works. We now check the resistance ID directly from the effect, and fall back to the remoteResistanceID attribute. See #1139
|
2017-05-02 22:19:58 -04:00 |
|
blitzmann
|
50965244c0
|
Merge branch 'bug/1139' into bug/resist-effects
|
2017-05-02 20:41:54 -04:00 |
|
Ryan Holmes
|
bedd6efff2
|
Fix for #1137 - industrial command skill was applying to incorrect attribute (#1138)
|
2017-04-26 20:25:35 -04:00 |
|
blitzmann
|
66a8669c64
|
Implement CONCORD ship sec status bonus.
|
2017-04-18 01:21:08 -04:00 |
|
blitzmann
|
99b0322289
|
Merge branch 'singularity' into sisi-dev
|
2017-04-18 00:03:58 -04:00 |
|
blitzmann
|
53cab4b1ab
|
Merge branch 'master' into development
Conflicts:
requirements.txt
|
2017-04-17 21:41:44 -04:00 |
|
blitzmann
|
6d176c0010
|
Merge branch 'master' into singularity
|
2017-04-17 21:41:02 -04:00 |
|
blitzmann
|
9d1c77f5b7
|
Damn you effects...
|
2017-04-17 21:19:51 -04:00 |
|
blitzmann
|
9c406a0a44
|
Fix for #1128 - these modifiers are in their own pen-group
|
2017-04-16 23:53:19 -04:00 |
|
blitzmann
|
81160e9e72
|
Fix effects (don't need level for ship bonuses x_x)
|
2017-04-16 22:50:19 -04:00 |
|
blitzmann
|
7bfd19dca4
|
Update effect headers
|
2017-04-16 22:24:32 -04:00 |
|
blitzmann
|
8ff244d509
|
Add new effects to support new hulls
|
2017-04-16 22:11:28 -04:00 |
|
blitzmann
|
e2061a25c2
|
Update effects for logi
|
2017-04-16 21:06:28 -04:00 |
|
blitzmann
|
272201c0fc
|
Update for renamed attribute
|
2017-04-16 20:34:58 -04:00 |
|
blitzmann
|
54930d7d50
|
Rename effects.
|
2017-04-16 20:20:57 -04:00 |
|
blitzman
|
e7de57fc7a
|
tox fixes
|
2017-03-26 14:39:45 -04:00 |
|
blitzman
|
d928df9c69
|
Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now
|
2017-03-26 14:28:13 -04:00 |
|
blitzman
|
b18bb200a9
|
Merge branch 'development' into MorePreferences
|
2017-03-26 13:52:59 -04:00 |
|
Ebag333
|
9da485da55
|
Cleaning up tox errors that crept in by the pep8 gremlins.
|
2017-03-08 21:02:57 -08:00 |
|
blitzman
|
9befaf7c91
|
Test implementation of eos settings
|
2017-03-05 02:01:10 -05:00 |
|
Ebag333
|
d67573f83a
|
Add more functionality to preferences window.
|
2017-02-27 12:05:38 -08:00 |
|
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
|
6f733394f7
|
Fix ICS / Mining Boost skill bonus (#892)
|
2017-02-16 00:26:11 -05:00 |
|
blitzman
|
de50bbb16f
|
Update effect files
|
2017-02-15 21:14:40 -05:00 |
|
blitzman
|
e835cb7f8c
|
update database
|
2017-02-15 21:12:05 -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 |
|
Ryan Holmes
|
25182de365
|
Merge branch 'master' into development
Conflicts:
gui/builtinViewColumns/baseName.py
|
2017-02-08 13:58:37 -05:00 |
|
Ryan Holmes
|
752f9e77f5
|
Merge pull request #971 from Ebag333/ToxFixes2
Some additional Tox tweaks
|
2017-02-07 23:28:42 -05: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 |
|