dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity
5,821 Commits 3 Branches 12 Tags
d5afacef3f65cd230ce7da889e451fa48038bb0a
Commit Graph

494 Commits

Author SHA1 Message Date
blitzmann
cb509a832e Add number of slots in the rack heading (#1535) 2018-05-19 17:55:17 -04:00
blitzmann
eeb700c75d Get back into tox's good graces 2018-05-15 01:41:32 -04:00
blitzmann
5cc6b6c69c Move over all esi stuff to it's own class, which the esi service extends from. Also fix an issue in the EVE fittings browser where deleting a fit didn't actually remove it from the list of fits (due to that list being populated by the return data of ESI, which can be cached). More clean up. 2018-05-12 13:57:14 -04:00
blitzmann
0365f71c00 Move over ESI functionality to be completely separate from esipy 2018-05-12 12:25:34 -04:00
blitzmann
0e0bc9dfd2 Remove some references to old api stuff (#1547) 2018-05-08 21:06:32 -04:00
blitzmann
c99afa79e1 Merge branch 'test-3' 2018-05-07 21:54:51 -04:00
Neugeniko
363904411d Projected Logistic Drones don't have a cap use or rawCycleTime. 
Only call the logic for the appropriate module groups.
 2018-04-04 16:55:05 +10:00
blitzmann
a3e411f225 Merge tag 'v2.0.0b5' into esi 
# Conflicts:
#	eos/saveddata/character.py
 2018-03-25 19:21:32 -04:00
blitzmann
03212be54a Merge branch 'master' into test-3 
# Conflicts:
#	eos/capSim.py
#	eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
#	eos/effects/warpdisruptsphere.py
 2018-03-25 03:03:59 -04:00
Ryan Holmes
2005d0b0b9 Merge pull request #1494 from Neugeniko/Issue#1439-2 
Respect 'Factor in Reload' preference for sustainable tank (tidied up).
 2018-03-25 02:59:48 -04:00
Ryan Holmes
164720db3d Merge pull request #1495 from Neugeniko/Issue#1482-2 
Fix cap use for non repeatable modules.
 2018-03-22 00:58:16 -04:00
blitzmann
bd90ec4bf0 Don't fail an api update when a skill has been removed (#1473) 2018-03-21 22:12:21 -04:00
blitzmann
d7e24dfa8f Merge branch 'Issue#1486' 2018-03-21 21:51:13 -04:00
Ebag333
2f1ad21392 Calculate DPS for beam type doomsdays. 2018-03-21 21:49:04 -04:00
Ryan Holmes
6dd6452c11 Merge pull request #1491 from Neugeniko/Capsimreload 
CapSim changes to make reloadtime a variable.
 2018-03-21 21:03:40 -04:00
Neugeniko
96b701687b pep 8 2018-03-17 13:53:03 +11:00
Neugeniko
e1e90cc23e pep 8 2018-03-17 13:43:19 +11:00
Neugeniko
65ec8cf4ee Take into consideration reactivation time for non repeatable modules 
like the assault DC and MJD when calculating their 'actual'
cycle time.
 2018-03-17 11:44:29 +11:00
Neugeniko
4fc93f7089 Respect 'Factor in Reload' preference for sustainable tank (tidied up). 2018-03-17 09:39:50 +11:00
Ryan Holmes
9d379d966c Implement working character associations with SSO character 2018-03-14 17:53:48 -04:00
Neugeniko
023ea43611 Divide by numShots not need as we do that below. 2018-03-14 15:39:20 +11:00
Neugeniko
044e032ab3 Allow variable reload time in CapSim. 2018-03-14 13:40:49 +11:00
Neugeniko
97742b08c8 Attribute disallowRepeatingAction has been renamed to 
disallowRepeatingActivation in the database. Make appropriate
modification to instances of this attribute name in code.

(cherry picked from commit ff607e4b03)
 2018-03-11 12:19:43 -04:00
Neugeniko
ff607e4b03 Attribute disallowRepeatingAction has been renamed to 
disallowRepeatingActivation in the database. Make appropriate
modification to instances of this attribute name in code.
 2018-03-11 21:38:46 +11:00
blitzmann
5560ef4d34 Merge branch 'test-3' into esi 
# Conflicts:
#	eos/saveddata/character.py
#	service/character.py
#	service/eveapi.py
#	service/pycrest/eve.py
 2018-03-10 15:32:21 -05:00
blitzmann
963353a1dc Merge branch 'master' into test-3 2018-03-01 00:40:40 -05:00
blitzmann
f773e0a935 fix misplaced parentheses 
(cherry picked from commit 2a60216a92d39bb200c26bce8573484f54a80dc5)
 2018-03-01 00:26:52 -05:00
blitzmann
7ab3ad9e08 Don't delete and recreate skills when updating char sheet. Instead, get each individual skill and change level. 
(cherry picked from commit 55c79c1bafaa9a1b159b73a72c6480f7e8d6cb6b)
 2018-03-01 00:26:47 -05:00
blitzmann
78f632a4f6 Merge remote-tracking branch 'origin/master' into test-3 2018-02-24 02:03:29 -05:00
blitzmann
a9db667c9c Do the same treatment to Target Resists as Damage Patterns 2018-02-24 02:01:23 -05:00
blitzmann
f442632fbc Fix importing damage profiles which included overwriting existing ones and then performing a delete on one of them. #1416 2018-02-24 01:49:09 -05:00
blitzmann
4bbbd33917 Return 0 instead of -1 when there is no charge on a weapon. It was changed from None to -1 during the py3 conversion (as None can no longer be compared against non-None types). -1 was throwing the capSim off by quite a bit. See #1405 2018-02-18 22:55:31 -05:00
blitzmann
8b2cfe44f2 Merge remote-tracking branch 'origin/master' into test-3 
# Conflicts:
#	config.py
#	eos/saveddata/fighter.py
 2018-02-17 12:31:58 -05:00
blitzmann
12a526fa9e Fix for some standup fighter errors 2018-02-17 11:59:51 -05:00
blitzmann
e779bb84e2 Fix for #1383. Due to the changed mechanics of None in py3, getModifiedItemAttr was defaulted to 0 instead of None. This adds an explicit default of None when trying to find the allowed drone group attribute 2018-02-17 10:53:29 -05:00
blitzmann
0456cb2f96 Merge remote-tracking branch 'origin/master' into test-3 2018-02-16 22:26:10 -05:00
blitzmann
fa3cf90421 add / update effects for citadels 2018-02-16 00:44:26 -05:00
blitzmann
636ee1de23 Get new Standup fighters working 2018-02-15 22:26:42 -05:00
blitzmann
b36bf8fb21 Fix issue restricting structure modules from fitting onto a structure 2018-02-15 21:03:25 -05:00
blitzmann
33eccaa374 Merge branch 'test-3' into esi 
# Conflicts:
#	requirements.txt
 2018-02-11 23:17:50 -05:00
blitzmann
5f0ce58c29 Merge branch 'master' into test-3 
# Conflicts:
#	gui/builtinShipBrowser/fitItem.py
#	service/port.py
 2018-02-11 21:29:17 -05:00
blitzmann
0f30ea554d Fix for #1377 - group up support fighters and modify the bonus based on amount active 2018-02-10 14:14:31 -05:00
blitzmann
7b0f672f04 Get encrypted refresh tokens working 2018-02-09 18:25:53 -05:00
blitzmann
33bf5234d0 Goodbye eveapi! You have served us well all these years! 
Start stripping XML API stuff and implement ESI skill fetching.
 2018-02-09 00:42:59 -05:00
blitzmann
e77dddc15b More work on getting fittings form a character via ESI. It's starting to be come a pain working with this client with having to background it until it initializes. Thinking about rolling my own, considering we only need a few calls and not a whole package. 2018-02-07 02:07:42 -05:00
blitzmann
c7360c8cc3 Get logging into EVE working and SSO characters saving, along with client hashes being stored alongside characters. 2018-02-07 00:44:37 -05:00
blitzmann
2376148380 Start ripping CREST stuff out, add new SSOCharacter stuff in. Long process ahead. 2018-02-02 02:05:49 -05:00
blitzmann
40ce7b7c0b Merge branch 'master' into test-3 
# Conflicts:
#	.gitignore
#	eos/saveddata/character.py
#	service/network.py
#	service/price.py
 2017-12-10 22:36:15 -05:00
blitzmann
2936b88c3d code cleanup 2017-11-27 21:05:06 -05:00
blitzmann
d23398ce29 fix for boosters 2017-11-23 20:51:03 -05:00