blitzmann
6e2878194c
Merge branch 'master' into citadel
...
Conflicts:
config.py
service/market.py
2016-07-03 01:10:26 -04:00
blitzmann
2df01c7157
Merge branch 'singularity'
2016-07-01 22:04:25 -04:00
blitzmann
bd4dbf45af
Beautify pyfa's CREST login message
2016-06-23 22:16:08 -04:00
blitzmann
ed3b2eb1bf
Fix energy warfare
2016-06-19 23:04:52 -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
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
e28883dd47
Merge branch 'default-database-profiles' of git://github.com/Ebag333/Pyfa
2016-06-13 20:01:35 -04:00
Ebag333
53da2f9bb2
Many updates
...
Redid all the values, especially updated target resist profiles.
Re-implemented the _init_ on service\damagePattern.py to check for
default values.
2016-06-13 13:49:56 -07:00
blitzmann
be4b78ee1c
Module replacement when dropping market module onto fitting view ( #528 )
2016-06-12 12:38:25 -04:00
Ebag333
8eb0b942c8
Remove _init_ hack to import the default pattern
...
Removed the kludgey method of using _init_ to check to see if the Uniform 25/25/25/25 damage pattern exists, and if missing create it.
Moved creation of it to prefetch.py.
2016-06-06 16:22:08 -07:00
Ebag333
4c55827aa4
call function to import defaults to database
2016-06-06 16:18:16 -07:00
blitzmann
6141356754
Add Ice Products to search results ( #600 )
2016-05-30 22:43:31 -04:00
blitzmann
62be4c5bce
Merge branch 'master' of git://github.com/Timmeey/Pyfa into Timmeey-master
2016-05-28 17:01:58 -04:00
blitzmann
655d658a52
Remove prints
2016-05-16 23:56:46 -04:00
blitzmann
62fd545d24
Restrict citadels to only use citadel modules. Rename Ships tab to Fittings as it no longer just carries ships :(. Fix crash on item stats.
2016-05-15 23:18:39 -04:00
blitzmann
7cf0a35a7a
Add citadel fittings to market browser, and get rid of some initial errors
2016-05-15 18:58:47 -04:00
blitzmann
523f7793b5
Add Citadel to ship root
2016-05-15 18:42:01 -04:00
blitzmann
19929ef3ba
Increment/decrement cargo instead of adding/removing ( #610 )
2016-05-11 21:29:17 -04:00
TimmeeY
eb8e5c5135
Added an option for HTML Export, to produce a minimal html version
...
Added an Opton in the HTMLExport menu to set the HTML export to produce
a minimal HTML version, without any styles or Javscript dependencies.
This can be useful if you are not javascript capable, or if you just
want to copy'n'pase the exported HTML into some web-editor (wordpress).
2016-05-08 23:50:41 +02:00
blitzmann
5a5e77414a
Remove rigs from prereq checking
2016-05-02 21:10:29 -04:00
blitzmann
f524591327
Fix prereq skill checking for fighters
2016-05-02 20:58:35 -04:00
blitzmann
57b9b916ed
Take care of empty market groups
2016-05-01 19:06:34 -04:00
blitzmann
d416124081
Implemented projected fighters, and various fighter bugfixes / improvements
2016-04-30 19:52:13 -04:00
blitzmann
8f6f55b001
Merge branch 'singularity'
2016-04-30 18:23:32 -04:00
blitzmann
8bf75e38ad
Add loaded charges export to CREST ( #569 )
2016-04-29 23:42:47 -04:00
blitzmann
87a354a314
Add SerializableUriCharacter to EVEMon import check ( #557 )
2016-04-29 23:15:30 -04:00
blitzmann
dc5d6a4ef8
Add conversion pack
2016-04-29 22:54:44 -04:00
Michael Krane
8a4f3b7642
Code clean Up
2016-04-28 22:59:47 +02:00
Michael Krane
a09d4139d5
Removes everything before and after the DNA
2016-04-28 19:06:53 +02:00
Michael Krane
a257ac87f7
Allows to import DNA fittings via ingame urls
2016-04-28 18:30:41 +02:00
blitzmann
ed6f00a893
Added column for fighter abilities, fixed some fighter bugs, added some context menus to them
2016-04-28 00:29:25 -04:00
blitzmann
b15f9766c1
* Show fighter bay resources in fighter pane
...
* Give fighters a state
* Include some toggled stats on the resources pane
* Add some decent icons for fighter stuff
2016-04-28 00:10:01 -04:00
blitzmann
4a2d1b7997
Fix subsystem slots ( #553 )
2016-04-22 20:49:16 -04:00
blitzmann
a5e2a32fb8
Merge remote-tracking branch 'origin/master' into singularity
2016-04-22 20:38:33 -04:00
Ryan Holmes
87f865ce1f
Merge pull request #562 from DuLLSoN/master
...
Added website selection for HTML Export
2016-04-17 23:53:36 -04:00
blitzmann
af9a9c5698
More fighter work. Basic abilities now work correctly.
2016-04-17 13:28:12 -04:00
Dullson
a7e6d3e969
Feature: Ability to select between different online fitting tools while using HTML Export.
2016-04-17 17:32:51 +03:00
blitzmann
708425c67a
Toggle fighter abilities in fighter context menu
2016-04-17 02:16:58 -04:00
aacn500
94dc3117bc
Fix importing T3 cruisers #556
2016-04-15 22:14:29 +01:00
blitzmann
e7118f637c
Merge branch 'charImplants' into singularity
...
# Conflicts:
# eos/db/saveddata/fit.py
# gui/builtinContextMenus/itemStats.py
2016-04-12 20:16:53 -04:00
blitzmann
3177713447
Add preliminary (database/gui) fighter support. No effects / calculations.
2016-04-04 23:32:03 -04:00
blitzmann
1161037092
Migrate implant set editor to new entity editor
2016-03-29 21:51:39 -04:00
blitzmann
a3d9d5cca8
Migrate character editor to use new entity editor.
2016-03-29 21:19:20 -04:00
blitzmann
3315d27d45
Applied entity editor to resist editor.
...
Fixed issue with checking for same name in validator.
Center dialogs on parents to make it look nicer
2016-03-27 22:12:59 -04:00
blitzmann
c3dcdb0686
Entity = characters, damage profiles... anything with the generic drop down list of entities along with new/rename/etc buttons. This commit starts refactoring how we handle this, hopefully simplifying the process to a series of dialogs rather than trying to manage multiple control in the window.
2016-03-27 21:48:19 -04:00
blitzmann
3ae312db37
Import / export implants sets
2016-03-21 23:43:45 -04:00