Ryan Holmes
1444a24e70
Merge branch 'master' into issue-1264
2017-09-18 20:04:09 -04:00
Ryan Holmes
73dfa25ef0
Merge pull request #1282 from burnsypet/issue-1280
...
Convert booster attribute to value before applying
2017-09-18 19:25:32 -04:00
burnsypet
a01284ff1c
Convert booster attribute to value before applying
...
Changes to boostermissilevelocitypenalty.py:
Get booster attribute value using booster.getModifiedItemAttr()
before attempting to apply it to avoid type error
2017-09-14 21:53:53 +01:00
burnsypet
8cc81cebdd
Don't attempt PopupMenu if getMenu returned False
...
Change to characterEditor.py:
Added logic to prevent a crash when attempting to execute
self.PopupMenu(menu) when menu was False. This would occur in the
situation where there were no saved implant sets.
2017-08-19 18:47:58 +01:00
Ryan Holmes
c33aeb7275
Merge pull request #1270 from pyfa-org/release/v1.31.0
...
Release/v1.31.0
2017-08-16 20:57:04 -04:00
blitzmann
c0237905b6
Ignore F401 warning (# noqa: E402, F401 isn't being honored ion Travis??)
2017-08-16 20:50:18 -04:00
blitzmann
eda6d738a4
fix some whitespace stuff, update database, effect headers, and release version
2017-08-16 20:39:26 -04:00
blitzmann
eef3b420a9
Merge branch 'burnsypet-issue-1241' into development
2017-08-16 20:36:38 -04:00
burnsypet
caef752a74
Bind contextHandler to children of contentPanel
...
Changes to statsPane.py:
Added new method applyBinding which loops through all the children
of the contentPanel passed to it and binds contextHandler to each of them
Changes to miningyieldViewFull.py:
Call to new method applyBinding
2017-08-16 22:54:32 +01:00
blitzmann
e13bd7af52
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
2017-08-15 21:52:16 -04:00
Ryan Holmes
c263575788
Merge pull request #1262 from burnsypet/issue-1261
...
Issue #1261 show variations menu for cargo items
2017-08-15 21:51:50 -04:00
Ryan Holmes
5bd80d3d06
Merge pull request #1267 from w9jds/input-fix
...
Amounts window crashes pyfa if you paste with characters
2017-08-15 21:47:22 -04:00
blitzmann
47cbc71e8a
Implement simple skill import/export functionality, and some cleanup top pass tox
2017-08-14 23:28:50 -04:00
blitzmann
fdba8d147f
Merge remote-tracking branch 'petosorus/master' into development
2017-08-14 22:22:47 -04:00
Jeremy Shore
4720b611b0
Support Decimals
2017-08-14 15:48:18 -05:00
blitzmann
1f43410780
Merge branch 'qol/file-reorg' into development
2017-08-13 21:20:20 -04:00
blitzmann
ead595e666
Allow burst projector to be projected
2017-08-13 21:19:55 -04:00
Jeremy Shore
89cf40423b
Fixed issue crashing pyfa when pasting from calculator with commas
2017-08-13 01:54:59 -05:00
burnsypet
95d6944298
Merge branch 'issue-1261' of https://github.com/burnsypet/Pyfa into issue-1261
...
Conflicts:
gui/builtinContextMenus/metaSwap.py
2017-07-30 21:35:59 +01:00
burnsypet
a3c19d1d1c
Issue #1261 show variations menu for cargo items
...
Added logic to condition statement in metaSwap.py to accomodate
cargoItem context. Will replace existing cargo item with selected
item and retain the original stack amount.
2017-07-30 21:34:21 +01:00
burnsypet
88185cb886
Issue #1261 show variations menu for cargo items
...
Added logic to condition statement in metaSwap.py to accomodate
cargoItem context. Will replace existing cargo item with selected
item and retain the original stack amount.
2017-07-30 21:18:47 +01:00
blitzmann
7962aa7b1b
Reorganize file structure of item stats dialog box
2017-07-23 17:55:18 -04:00
Ryan Holmes
220ce23e8f
Merge pull request #1254 from pyfa-org/bug-1246
...
Bug 1246 fix
2017-07-15 21:57:54 -04:00
blitzmann
66752b2cbf
Fix cargo bonus for Covert subsytems ( #1246 )
2017-07-15 21:51:32 -04:00
blitzmann
f59a65f314
bump dev
2017-07-15 21:49:58 -04:00
blitzmann
725034ebc5
Merge remote-tracking branch 'origin/master' into development
2017-07-11 23:00:50 -04:00
Ryan Holmes
0210020658
Merge pull request #1245 from pyfa-org/release/1.30.0
...
Release/1.30.0
2017-07-11 19:45:44 -04:00
blitzmann
22dc6512c0
Final updates and bump version :D
2017-07-11 19:39:13 -04:00
blitzmann
709b4524e6
Bump version :D
2017-07-11 19:26:02 -04:00
blitzmann
bc462ede3e
Fix some back event reference due to sleepiness last night ;_;
2017-07-11 19:23:29 -04:00
blitzmann
277bd14453
See #1234 - temporarily add conditional to ensure we run the skill level checking code only when a character exists to prevent error. This may cause some issues with the alpha characters since that may not get checked anymore.
2017-07-11 19:23:08 -04:00
blitzmann
59fed2c516
Update to TQ 1164320
2017-07-11 19:09:32 -04:00
blitzmann
d19486ce15
cleanup
2017-07-11 02:30:26 -04:00
blitzmann
b55fcfaf04
cleanup
2017-07-11 02:06:09 -04:00
blitzmann
60e5085724
ohgodwhathaveidone.jpg
2017-07-11 01:50:54 -04:00
blitzmann
5adde95807
Remove print statement
2017-07-11 01:42:45 -04:00
blitzmann
3da0b8bc29
Effect header update
2017-07-11 01:31:02 -04:00
blitzmann
0104e8954a
Remove the -dev suffix for the user database
2017-07-11 01:17:30 -04:00
blitzmann
78e065feff
Apparently, my IDE settings changed from spaces to tabs. Changing this back :3
2017-07-11 01:13:25 -04:00
blitzmann
30fe7930a9
Remove log spam
2017-07-11 01:10:55 -04:00
blitzmann
453054f6c7
Remove command fitting from the command fits context menu upon deletion ( #1244 )
2017-07-11 01:10:39 -04:00
blitzmann
231f9a91c2
Do not assume number of columns for damagePatterns, see #1238
2017-07-10 22:46:30 -04:00
blitzmann
c553790eaf
move the "generating effect" spam - doesn't need to happen every time the handler is called
2017-07-10 01:48:10 -04:00
blitzmann
f2e8506ea7
Merge remote-tracking branch 'origin/singularity' into development
2017-07-10 01:39:32 -04:00
Ryan Holmes
76b22dfe17
Merge pull request #1243 from wendazhou/singularity-fix-loki-effects
...
Fix loki effects
2017-07-10 01:39:16 -04:00
blitzmann
1202c335d9
Fix implant set clipboard import ( #1237 )
2017-07-10 00:28:22 -04:00
blitzmann
f70d671f1d
Fix implant set copy ( #1236 )
2017-07-10 00:21:52 -04:00
blitzmann
1305a1f2b6
Do not get variations by "group" unless the item is part of a set of hard-coded categories. #1232
2017-07-10 00:11:54 -04:00
blitzmann
f5108c34db
Do not kill the entire XML import if one fitting fails ( #1231 )
2017-07-09 19:08:46 -04:00
Ebag333
d553c60b65
Fix errors caused by importing a few "skinned" ships. Patch by ebag. See #1231
2017-07-09 19:08:06 -04:00
