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
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
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
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
blitzmann
4a79a4e4d9
Merge remote-tracking branch 'origin/master'
...
Conflicts:
gui/mainMenuBar.py
2016-06-18 23:14:23 -04:00
blitzmann
ac46d33a60
Fix CREST export ( #655 )
2016-06-18 23:10:01 -04:00
Ebag333
0f958bef81
Removed _init_ definition as it's redundant
2016-06-16 19:08:29 -07:00
Ebag333
b79009517e
Updated po-ta-toe to po-tah-toh
2016-06-16 14:46:22 -07:00
Ebag333
12ccc96f46
Updated as per Blitzmanns feedback
...
https://github.com/pyfa-org/Pyfa/pull/639#issuecomment-225749245
2016-06-15 23:42:38 -07:00
Ebag333
47828c38d2
Merged differences from master (more catching up)
2016-06-15 19:40:45 -07:00
blitzmann
afdae6a3d6
Added first iteration of item comparisons.
2016-06-15 22:26:48 -04:00
Ebag333
03d1d8f5a4
Merged changes from pyfa-org/master into branch
...
Merged changes to see if we can clear up the merge conflict warning
2016-06-15 18:24:40 -07:00
Ryan Holmes
cc4e4c0f13
Merge pull request #649 from Ebag333/ECM-Misc-Column-Improvements
...
Updated ECM to be more descriptive
2016-06-13 21:21:29 -04:00
Ebag333
2f6f14fef2
Update misc.py
2016-06-13 18:14:41 -07:00
Ryan Holmes
fb590ddfdd
Merge pull request #644 from Ebag333/Item-Attributes--Show-Base-Value
...
Added base column to item window
2016-06-13 20:44:15 -04:00
Ryan Holmes
a5e674cdc4
Merge pull request #650 from Ebag333/Group-Attribute-Overrides-Menu
...
Grouped Attributes override
2016-06-13 20:37:56 -04:00
blitzmann
e28883dd47
Merge branch 'default-database-profiles' of git://github.com/Ebag333/Pyfa
2016-06-13 20:01:35 -04:00
Ebag333
b4694dcf03
Implemented menu option to import default database values
...
Allows for existing databases to be updated with the current default
profiles. Can also be used to inject other defaults (maybe 0 and V
chars?)
2016-06-13 14:13:38 -07:00
Ebag333
4c05d9a687
Grouped Attributes override
...
Users are confused because they find the menu to edit attribute
overrides, change values, then do not see their values reflected. There
is an option that needs to be enabled under the edit menu to show the
users overrides.
Moved this option from the edit menu to the window menu (next to the
existing attributes override editor), and grouped them together.
Functionality is not changed, merely placement of the overrides toggle.
2016-06-13 13:54:15 -07:00
