blitzmann
|
faed0ce159
|
Merge remote-tracking branch 'origin/master' into citadel
Conflicts:
config.py
|
2016-07-16 21:45:28 -04:00 |
|
blitzmann
|
23a6849fe3
|
Bump release
|
2016-07-07 19:40:21 -04:00 |
|
blitzmann
|
91c6e91023
|
Fix Cataclysmic Variable effects (#628)
|
2016-07-07 19:21:41 -04:00 |
|
blitzmann
|
8f64c91677
|
Update effect headers
|
2016-07-06 23:52:42 -04:00 |
|
blitzmann
|
842ee3d426
|
Fix Genolution implant set bonus (#672)
|
2016-07-06 23:50:31 -04:00 |
|
blitzmann
|
45d338ba3d
|
Add price to item compare (#673)
|
2016-07-06 22:30:31 -04:00 |
|
blitzmann
|
f141fac3a2
|
Add fighters to overall fitting price (#674)
|
2016-07-05 23:34:19 -04:00 |
|
blitzmann
|
7b2a89d66b
|
Add structure rig effects (untested)
|
2016-07-05 23:26:24 -04:00 |
|
blitzmann
|
4d158d99fd
|
Fix crash related to structure rigs not having meta level, and a traceback that might happen occasionally.
|
2016-07-05 23:23:55 -04:00 |
|
blitzmann
|
c3983a26c5
|
Add structure rigs
|
2016-07-05 00:21:08 -04:00 |
|
blitzmann
|
016854a292
|
Clean up effects
|
2016-07-04 23:31:41 -04:00 |
|
Ebag333
|
5d7252cbec
|
fixed referencec
|
2016-07-04 15:50:00 -07:00 |
|
Ebag333
|
0e0bcf51fc
|
Added Effects Files for Citadel Modules
|
2016-07-04 14:27:35 -07:00 |
|
blitzmann
|
f396077cd6
|
Remove stacking penalty from Asklepian implants
|
2016-07-04 13:52:25 -04:00 |
|
blitzmann
|
1c194b67f3
|
Restrict projected view after speaking with CCP Larrikin about mechanics
|
2016-07-04 11:18:47 -04:00 |
|
blitzmann
|
72e77d2264
|
Fix some wording
|
2016-07-04 11:05:50 -04:00 |
|
blitzmann
|
10c79ac812
|
More work on restrictions
|
2016-07-04 11:01:08 -04:00 |
|
blitzmann
|
fe8c3a4957
|
Disable fit add on pages based on context (ship vs citadel)
|
2016-07-04 10:30:04 -04:00 |
|
blitzmann
|
3734be21d6
|
Fix icons and script and version
|
2016-07-03 20:48:20 -04:00 |
|
blitzmann
|
8ae6ad879e
|
Add structure skill effects
|
2016-07-03 20:03:00 -04:00 |
|
blitzmann
|
92b2a35888
|
Fix omega implant
|
2016-07-03 17:42:12 -04:00 |
|
blitzmann
|
fb2e6e5c17
|
Restrict skills being applied to citadels. The effect must be of type "structure" for it to apply. Fix issue with agility
|
2016-07-03 14:52:00 -04:00 |
|
blitzmann
|
2212311a44
|
Add effects for Asklepian implant set
|
2016-07-03 14:25:05 -04:00 |
|
blitzmann
|
ef3791f845
|
bump dev
|
2016-07-03 01:11:28 -04:00 |
|
blitzmann
|
6e2878194c
|
Merge branch 'master' into citadel
Conflicts:
config.py
service/market.py
|
2016-07-03 01:10:26 -04:00 |
|
blitzmann
|
e7780485f1
|
Bump release
|
2016-07-03 00:41:21 -04:00 |
|
blitzmann
|
7831999563
|
Update effect headers
|
2016-07-03 00:40:10 -04:00 |
|
blitzmann
|
7020f4bda9
|
Fix compare when item doesn't have a meta (#667)
|
2016-07-03 00:38:22 -04:00 |
|
Ryan Holmes
|
dcd21bd165
|
Merge pull request #669 from Ebag333/VehementDPSEffectsFile
Fixed type of weapon
|
2016-07-03 00:26:58 -04:00 |
|
Ebag333
|
4a70028762
|
Fixed type of weapon
Used to be applied to Naglfar, but everyone knows that Vehement is the
new Naglfar, and never use projectiles after memorial day (only
hybrids).
|
2016-07-02 01:02:03 -07:00 |
|
blitzmann
|
9255a9e638
|
bump dev
|
2016-07-01 23:38:06 -04:00 |
|
blitzmann
|
02736ac92d
|
Bump version
|
2016-07-01 22:07:56 -04:00 |
|
blitzmann
|
2df01c7157
|
Merge branch 'singularity'
|
2016-07-01 22:04:25 -04:00 |
|
blitzmann
|
01a0745b9b
|
Update database and fix some icon related bugs
|
2016-07-01 22:03:51 -04:00 |
|
blitzmann
|
c7573ad4c3
|
Update icons / fix script
|
2016-07-01 00:44:17 -04:00 |
|
blitzmann
|
06f402bb9d
|
Add sde icon script
|
2016-06-28 23:34:39 -04:00 |
|
blitzmann
|
b9f0812b38
|
Fix issue with entity editor and wxPython 2.8
|
2016-06-28 23:24:01 -04:00 |
|
blitzmann
|
cdca8fe236
|
New effects
|
2016-06-28 22:00:18 -04:00 |
|
blitzmann
|
c8175d1191
|
Only compare attributes with display names (ones that don't have display names are normally internal attributes)
|
2016-06-23 23:19:08 -04:00 |
|
blitzmann
|
7a7a0f1eff
|
Merge branch 'feature/item-compare' into singularity
|
2016-06-23 22:57:09 -04:00 |
|
blitzmann
|
5176fe0366
|
Sort by meta level
|
2016-06-23 22:56:40 -04:00 |
|
blitzmann
|
b4bd6e7acd
|
Ensure we have an active fit when exporting to crest
|
2016-06-23 22:44:24 -04:00 |
|
blitzmann
|
bd4dbf45af
|
Beautify pyfa's CREST login message
|
2016-06-23 22:16:08 -04:00 |
|
blitzmann
|
d9fc3d436b
|
Allow EHP toggle to persist between fits (#641)
|
2016-06-19 23:50:42 -04:00 |
|
blitzmann
|
67143cbc0e
|
Fix for siege stacking penalty (#653)
|
2016-06-19 23:18:59 -04:00 |
|
blitzmann
|
ed3b2eb1bf
|
Fix energy warfare
|
2016-06-19 23:04:52 -04:00 |
|
blitzmann
|
7a5e4291a5
|
Handle renamed groups
|
2016-06-19 12:40:49 -04:00 |
|
blitzmann
|
d1c6810e1e
|
Update to SISI 1050133
|
2016-06-19 12:39:09 -04:00 |
|
blitzmann
|
faa9c0a2b9
|
Fix my merge fail
|
2016-06-18 23:29:53 -04:00 |
|
Ryan Holmes
|
0456973093
|
Merge pull request #639 from Ebag333/default-database-profiles
Default database profiles
|
2016-06-18 23:25:07 -04:00 |
|