dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity
4,968 Commits 3 Branches 11 Tags
f9ec79c8ebc3270300fd01e34e47cc753599db38
Commit Graph

357 Commits

Author SHA1 Message Date
Ryan Holmes
f9ec79c8eb Merge pull request #1093 from pyfa-org/master 
Bring dev up to date with master
 2017-04-01 23:14:26 -05:00
Ryan Holmes
e03b3227d4 Fix for #1081 (#1085) 
* Break project application code out of main item iteration, and apply it after command boosts have been applied to the fit. Fix for #1081

* Make tox happy
 2017-04-01 22:23:50 -05:00
Ebag333
403b39659c Fix tox things. 
(cherry picked from commit 60298c8)
 2017-03-24 11:14:34 -07:00
blitzman
b4ad4becd3 Fix for #1060 2017-03-19 16:27:41 -04:00
Ebag333
6ce52a1da9 PEP8 cleanup 
(cherry picked from commit 63f2f85)
 2017-03-16 08:40:14 -07:00
blitzman
4633a1c136 some clean up 2017-03-14 19:22:18 -04:00
Ryan Holmes
53937d1723 Merge pull request #1023 from Ebag333/EosLoggingCleanup 
Quick Eos cleanup and logging fix
 2017-03-11 19:33:58 -05:00
blitzman
1c4128b9a1 Change probe size cap to 1.08 (previous testing done apparently showed 1.1 - 1.12, however most people refer to 1.08 as the cap. 2017-03-05 17:01:00 -05:00
Ebag333
d28312f13b Slightly correction to the effective reload time for cycle time. 2017-02-28 18:57:12 -08:00
Ebag333
e4d0f2dc6f Fix case where property gets reran multiple times. 2017-02-26 08:46:23 -08:00
blitzmann
c430a2d798 Merge branch 'development' into Remote_Repair_Pane_v2 
Conflicts:
	eos/mathUtils.py
	service/crest.py
 2017-02-26 01:40:53 -05:00
blitzman
7115cd178c Merge branch 'development' into LogBook_v2 
Conflicts:
	config.py
	eos/saveddata/fit.py
	gui/bitmapLoader.py
	gui/graphFrame.py
	gui/utils/exportHtml.py
	pyfa.py
	service/crest.py
	service/price.py
	service/server.py
 2017-02-25 18:21:07 -05:00
Ebag333
c24798ad2f Clean up last reference and finish nuking floatfloor. One less method! (ouch my test!) 2017-02-24 17:07:05 -08:00
Ebag333
3411eca1e7 Fix a couple pep8 issues, and clean up other folks pep8 misses. :) 2017-02-24 16:34:32 -08:00
Ebag333
43073069c7 Fix merge conflict. 2017-02-24 16:25:31 -08:00
Ebag333
db330ad035 Merge remote-tracking branch 'origin/Remote_Repair_Pane_v2' into Remote_Repair_Pane_v2 
# Conflicts:
#	eos/saveddata/fit.py
 2017-02-24 16:15:39 -08:00
Ebag333
b3c7273681 implement a suggestion or six from @blitzmann. Fix a bunch of low level bugs (unlikely to have been noticed since we don't really expose those stats). Add some properties instead of referencing the attribute directly. 2017-02-24 16:10:54 -08:00
blitzman
3892ac5996 Change functionality of remote rep calculations to be more efficient. 
* Implement a property per attribute
* Use None as our cleared value (signifies that it really hasn't been calculated, not just that the calc was 0)
 2017-02-24 18:33:42 -05:00
Ebag333
5ca882d3ea implement a suggestion from @blitzmann 2017-02-24 13:06:02 -08:00
blitzman
4ba11d832a Tox fixes, because it's a thing we do now 2017-02-16 23:12:25 -05:00
blitzman
66d78fed2c Add indication in character name of alpha status 2017-02-16 23:09:27 -05:00
Ebag333
6e04707457 Commit *ALL* the files. 2017-02-15 18:25:11 -08:00
Ebag333
25b17a221c Update to current version 2017-02-15 18:23:14 -08:00
Ebag333
93e7b4f5cf Cherry pick d033e4a8d919664d3ae210098291e38df71d3256 2017-02-15 17:23:53 -08:00
Ebag333
159472f82c Tox fixes, and convert all logging string replacement to a standard style. 2017-02-13 13:38:21 -08:00
Ebag333
be9eaa0859 Fix timer, make logging less annoying when at Info or higher level. Only show command bonus logspam if there is any. 2017-02-13 13:25:42 -08:00
Ebag333
35e330f574 Improve handling for exceptions, output more information so we can find and fix problems. 2017-02-12 13:09:26 -08:00
blitzman
401d0d58d5 Merge branch 'development' 2017-02-11 21:42:48 -05:00
Ebag333
3b185e1bcb Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers 2017-02-11 11:51:53 -08:00
blitzman
0cba428c81 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2017-02-11 10:48:11 -05:00
blitzman
bdee8f662c Merge remote-tracking branch 'ebag/SorryNotSorryBlitzmann' into SorryNotSorryBlitzmann 2017-02-11 10:46:59 -05:00
blitzman
62bb550afd Add shortcut indication for fitting search tooltip 2017-02-11 10:15:01 -05:00
Ebag333
3562577521 Tox fix, and catch an extra shadowing 2017-02-10 12:06:23 -08:00
Ebag333
2b45a16872 Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas. 2017-02-10 11:50:04 -08:00
blitzman
72ebafe925 Remove redundant init 2017-02-10 00:37:45 -05:00
Ebag333
df9daf9b4b Fix typo 2017-02-09 14:08:55 -08:00
Ebag333
64070a0798 Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later. 2017-02-09 09:36:16 -08:00
Ebag333
dd9924a7a7 Fix issues where we assume something can exist when it may not. 2017-02-09 07:22:09 -08:00
Ebag333
7865219164 Add a ton of default values 2017-02-09 00:56:33 -08:00
Ebag333
11d7f9d029 Make modules static if they do not use self. 2017-02-09 00:04:41 -08:00
Ebag333
7a2feb9152 Fix a bunch of calls to functions that pass the wrong type of parameter, the wrong number, etc. 2017-02-08 22:20:56 -08:00
Ebag333
3e916e42f2 pyCharm inspection fixes. Mostly variable refernce issues 2017-02-08 17:55:20 -08:00
Ryan Holmes
25182de365 Merge branch 'master' into development 
Conflicts:
	gui/builtinViewColumns/baseName.py
 2017-02-08 13:58:37 -05:00
blitzman
f7d7b3fe5e Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
 2017-02-07 19:22:26 -05:00
Ebag333
aafc850dbd Adhere to standards 2017-02-05 20:09:00 -08:00
Ebag333
be66ff1eec Tox fixes 2017-02-05 15:39:07 -08:00
blitzman
5d46fe7e4d Merge branch 'master' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py
 2017-01-29 15:02:22 -05:00
blitzman
b3eb4f35cd Max out cargo amount to sys.maxint (#958) 2017-01-28 13:31:03 -05:00
blitzman
1d69ed7584 Merge branch 'test_import' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/characterEditor.py
	gui/itemStats.py
 2017-01-27 20:39:54 -05:00
blitzmann
96c3363edc Merge branch 'master' into feature/alphaclones 
Conflicts:
	eve.db
 2017-01-26 19:39:13 -05:00