Commit Graph

6015 Commits

Author SHA1 Message Date
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
blitzmann
5ddac97719 Update EVE db from sisi 2017-04-16 19:04:51 -04:00
blitzmann
973432b997 Merge remote-tracking branch 'origin/master' into singularity 2017-04-16 19:02:17 -04:00
blitzmann
1ee679903c Bring dev up to date with master
Conflicts:
	service/fit.py
2017-04-16 11:42:41 -04:00
Ryan Holmes
89614f7948 Merge pull request #1127 from blitzmann/master
Appveyor tweaks
2017-04-16 11:39:16 -04:00
blitzmann
dec5970bd6 Update appveyor to use cx_freeze until pyInstaller is reviewed. 2017-04-16 11:31:08 -04:00
Ebag333
a374fb4a12 Appveyor (#1101)
Appveyor setup
2017-04-16 11:31:01 -04:00
blitzmann
5d066f1401 Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development 2017-04-16 11:12:42 -04:00
blitzmann
e8749d379a Update appveyor to use cx_freeze until pyInstaller is reviewed. 2017-04-16 11:12:15 -04:00
blitzmann
b02506d6cd fixes issue in which fit was recalced on fit switch when characters were different, regardless of calculation state. 2017-04-15 22:33:45 -04:00
blitzmann
cca61b8ac1 Fix issue with selecting item with an empty view 2017-04-14 21:45:41 -04:00
Ryan Holmes
962c45b807 Merge pull request #1124 from StinGer-ShoGuN/PR_01
Default HTML export to pyfa save path, and allow override of database file path
2017-04-14 00:31:59 -04:00
blitzmann
9646cee324 De-jankify self projections. We now check to see if the fit we're about to project is self and, if so, simply run the projections on ourselves. At this point, all bonuses should be applied to our fit. 2017-04-13 23:41:02 -04:00
blitzmann
04242ef52c Fix issue with handling item names that include unicode 2017-04-13 23:39:42 -04:00
blitzmann
da9816d1bd Implement character skill searching 2017-04-13 23:39:00 -04:00
blitzmann
283aba4f85 Add grant missing skills feature 2017-04-13 23:26:08 -04:00
blitzmann
080590a292 Add "Currently Open Fits" context menu for projected and command views 2017-04-13 23:23:48 -04:00
blitzmann
a7ec10525e Apparently this happens on command fits as well... temp fix until I can look into why this happens 2017-04-13 23:23:47 -04:00
blitzmann
e28bf545e9 Fix some bugs with notes view - exception happening due to lack of fit, and possibility of notes saving under the wrong fit 2017-04-12 23:22:57 -04:00
Ryan Holmes
5aeb3a38c8 Fit Calculation Code Cleanup (#1103)
* Remove dirtyStorage, legacy of old fleet boosting system

* Remove withBooster flag from the recalc() function.

This was a legacy parameter dealing with the old fleet boost code, the purpose of which has changed with the addition of command boosts. We no longer have to call recalc with this particular parameter (indeed, it was forced to False in `recalc`). These were never cleaned up. We still have the withBoosters parameter for the `calculateModifiedAttributes` function, however that will be renamed and has a different meaning than it used to (used in the recursion of command fits)

* Add some comments

* Consolidate the tangled mess of conditional flags meant to determine if a fit is local/projected/command. This should make the logic flow a bit clearer.

Also rewrite a blurb about returning on a calculated fit - need to look into this a little bit more.

* fix up test to no longer pass `withBooster`
2017-04-12 19:50:16 -04:00
StinGer ShoGun
c00372900f Save HTML export to .pyfa user's directory by default.
This commit is part of attempts to ease system package creation and
maintenance (specifically Gentoo ebuilds).
2017-04-12 16:13:56 +02:00
StinGer ShoGun
7f50503aec Allow game database file to be loaded from a different directory.
This will allow system-wide installation of Pyfa in Python site-packages
directory, where eve.db has nothing to do.

This commit is part of attempts to ease system package creation and
maintenance (specifically Gentoo ebuilds).
2017-04-12 16:07:21 +02:00
blitzmann
87a600349c Temporarily fix issue with removing a self projected fit 2017-04-11 23:58:05 -04:00
Ryan Holmes
114246bf1e Do not recalc fits on tab switch (#1105)
* Do not recalc fits if they are already calculated. Fits that are projected onto other fits recursively set their victims to `calculated=False` so that the victim will re calculate when it loads again.

* Reset boosted fits when calculating a fit that is boosting others. Also, remove semicolon due to habit :x

* Develop a `__resetDependantCalc()` which will reset any fits that are immediately affected by the current fits calculation.
2017-04-11 23:40:40 -04:00
Ryan Holmes
ebda1349cf Add a small delay on key down for market search (#1123)
* Add a small delay on key down for market search

* prevent a double search if user does something like hit enter in the middle of a timer
2017-04-11 23:30:38 -04:00
Ryan Holmes
45a8aaf387 Merge pull request #1111 from Ebag333/fit_tests
Tests for eos\saveddata\fit.
2017-04-11 00:42:54 -04:00
Ryan Holmes
514933e0e4 Merge pull request #1120 from blitzmann/feature/delete-things
"Delete all" buttons for Prices, Target Resists, Damage Profiles
2017-04-10 22:03:20 -04:00
blitzmann
6f914386ec Remove unused function 2017-04-10 21:58:56 -04:00
blitzmann
efaede0929 Use queries to bulk-delete target resists and damage profiles 2017-04-10 21:49:35 -04:00
Ebag333
73821cbe49 Formatting 2017-04-10 21:41:56 -04:00
Ebag333
e245891cb4 Add delete buttons 2017-04-10 21:40:59 -04:00
blitzmann
50e604f412 convert print to debug statement >.< 2017-04-10 21:32:26 -04:00
blitzmann
4e74555b5d Opps, forgot to change this back from testing. 2017-04-10 21:26:03 -04:00
blitzmann
894c86ebc3 Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development 2017-04-10 21:09:40 -04:00
Ryan Holmes
47ea12f4ba Merge pull request #1048 from Ebag333/ErrorDialog_and_miscfixes
Error Dialog improvements and Pyfa.py refactoring
2017-04-10 21:09:11 -04:00
blitzmann
ce01c66b3e Better manage price object juggling in Item.price property. The previous way was creating new price objects when an object already existed in the database which could lead to Integrity issues. 2017-04-10 20:48:58 -04:00
blitzmann
1260900668 Merge branch 'pricing_v2' into development 2017-04-10 20:46:57 -04:00
jeffy-g
a86ff19c98 Merge branch 'fix_unread_description' of https://github.com/jeffy-g/Pyfa-dev into fix_unread_description 2017-04-10 14:31:29 +09:00
jeffy-g
c07bcf6a29 Determine the necessary changes to use db with test code,
I made necessary edits

.travis.yml
  necessary to depend on wx mod indirectly when running test code

eos\config.py
  copy from development branch, This change was necessary when using data base in test code.

service\settings.py
  copy from development branch.
  and modified SettingsProvider.getSettings and Settings.save.
  After that, we made the same as master branch except for necessary code.
  This change was necessary when using data base in test code.

and other improvement.
2017-04-10 14:23:50 +09:00
Ryan Holmes
82f6d26a88 Merge pull request #1109 from Ebag333/eos_fit_cleanup
Some quick cleanup of logging and shtuff
2017-04-09 23:25:11 -04:00
Ebag333
d1e8f5cf5c Placeholder test (#1113)
* Placeholder test

* pep8
2017-04-09 22:44:28 -04:00
Ryan Holmes
82edaf05d3 Merge pull request #1116 from pyfa-org/eos_cleanup
Eos cleanup
2017-04-09 22:43:29 -04:00
blitzmann
fadc514592 Add back the booster side effect stuff 2017-04-09 22:38:31 -04:00
jeffy-g
fc7ca56f8b searching for a way to open db with minimal changes required 2017-04-10 09:33:54 +09:00
jeffy-g
d629061506 Merge branch 'master' into fix_unread_description 2017-04-10 03:20:35 +09:00
jeffy-g
4a964ab6be apply recent improvements 2017-04-10 03:05:44 +09:00