blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -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
b0e7c02a6a
Add migration script for character sec status
2017-04-18 00:01:25 -04:00
blitzmann
f0fc5643e9
Return and save sec status for character when updating skills
2017-04-18 00:01:25 -04:00
blitzmann
8c83ac120f
Implement asynchronous api skill fetching
2017-04-18 00:01:24 -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
1aaa93c1fd
Set sqlalchemy version to 1.0.5 in requirements... newer version causing issues in builds?
2017-04-17 21:35:22 -04:00
blitzmann
9d1c77f5b7
Damn you effects...
2017-04-17 21:19:51 -04:00
Ryan Holmes
3b351603a3
Merge pull request #1130 from blitzmann/feature/drone-affecting-skills
...
Add affecting skills context menu to drones and fighters
2017-04-17 19:52:19 -04:00
Ryan Holmes
f563b2666d
Merge pull request #1129 from blitzmann/bug/fighters-1128
...
Fix for #1128
2017-04-17 19:46:51 -04:00
blitzmann
cede46d4a4
Remove PyYAML from list of requirements to run pyfa.
2017-04-17 19:40:47 -04:00
blitzmann
90d854fd24
Add change affecting skills menu to drones and fighters
2017-04-17 19:25:35 -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
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
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
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
