blitzmann
d23398ce29
fix for boosters
2017-11-23 20:51:03 -05:00
blitzmann
5e0a5da6d5
more post-merge work
2017-11-23 12:51:43 -05:00
blitzmann
6e112b9ed5
Fix issues with merge
2017-11-23 11:38:08 -05:00
blitzmann
b30b3fcbf1
Merge branch 'master' into test-3
...
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
2017-11-23 11:19:05 -05:00
Ryan Holmes
455fea75c0
Merge pull request #1341 from pyfa-org/bug/1335
...
Bug/1335
2017-11-22 23:22:53 -05:00
blitzmann
bd181559ed
Don't show Side Effects menu if there are no side effects (eg: Synths)
2017-11-22 23:19:03 -05:00
blitzmann
967128cb69
Added missing effect for shield booster penalty on crash
2017-11-22 23:16:28 -05:00
Ryan Holmes
b596447095
Fix issue with deleting a fit while having certain other fits open ( #1339 ) ( #1340 )
...
Also, bump dev version
2017-11-22 21:44:15 -05:00
blitzmann
4a33365195
Add some debug and fix indentation issue causing fit deletion to crash open fittings views
2017-11-22 01:45:31 -05:00
blitzmann
5d5646df79
Fix BlankPage having binding issue
2017-11-22 01:45:06 -05:00
blitzmann
405a965046
Fix issue with loading fighters
2017-11-22 01:44:48 -05:00
blitzmann
4138088d4a
Do not create a new fitting view every time we switch fits.
2017-11-21 23:46:50 -05:00
blitzmann
de44e6f932
Get rid of some annoying messages
2017-11-21 23:46:33 -05:00
blitzmann
d4df989427
Remove handlers from unbind (see https://github.com/wxWidgets/Phoenix/issues/624 )
2017-11-21 23:04:51 -05:00
blitzmann
6c8b143936
Tentative .spec file for linux
2017-11-21 00:32:45 -05:00
blitzmann
0f94557699
Use wx.AutoBufferedPaintDC instead of wx.BufferedPaintDC (helps with drawing on linux)
2017-11-21 00:05:52 -05:00
blitzmann
a52b9e58e9
Testing some stuff out
2017-11-18 19:01:05 -05:00
blitzmann
0d8904d59f
Fix None comparison operation
2017-11-16 01:35:26 -05:00
blitzmann
d956cb7861
use a different image to denote changed skills
2017-11-16 01:31:28 -05:00
blitzmann
e848cec815
Fix dirty skill indicator (* instead of blue text). Need to get a different icon working for those. Remove debugging prints()
2017-11-16 01:20:38 -05:00
blitzmann
ce8f1d385d
Better fix for broken Entity Editor Validation
2017-11-15 21:43:36 -05:00
blitzmann
90e338b969
Fix for broken Entity Editor Validation
2017-11-14 00:07:12 -05:00
blitzmann
1978f5cb92
Test validator stuff
2017-11-13 22:45:12 -05:00
blitzmann
979bc494f0
deprecation
2017-11-13 22:29:58 -05:00
blitzmann
cc9b6ea04b
More deprecation fixes
2017-11-13 00:18:24 -05:00
blitzmann
8cbb327659
Fix bug that caused race image to not appear in fitting tab
2017-11-12 23:58:30 -05:00
Ryan Holmes
2f6e306f8e
Merge pull request #1336 from pyfa-org/release/v1.33.2
...
Release/v1.33.2
2017-11-12 16:59:03 -05:00
blitzmann
065747f425
bump release
2017-11-12 16:54:28 -05:00
blitzmann
c4f41fb5fa
Update to 1209099 and rename old komodo skill
2017-11-12 16:52:56 -05:00
blitzmann
1fc9b2941d
Add spac file for mac
2017-11-12 13:43:19 -05:00
blitzmann
e9be07f281
Rename pyfa.spec to pyfa-win.spec
2017-11-12 13:17:16 -05:00
blitzmann
df7dc30e7e
Write out git version information to a file, use in about box, remove all the other stuff until I can format it correctly
2017-11-12 13:13:38 -05:00
blitzmann
d0235f6d93
Fix market browser meta filtering
2017-11-12 12:00:24 -05:00
blitzmann
de646cf252
Have a noticeable message show up (currently prints for everything, should restrict to only beta builds)
2017-11-12 02:30:15 -05:00
blitzmann
21838f2d9a
Fix issue with pyinstaller not bundling required DLLs when building on Windows 10 / Python >= 3.5
2017-11-12 02:15:15 -05:00
blitzmann
266398b1de
Get some things working for pyinstaller
2017-11-12 00:14:45 -05:00
blitzmann
0cc646bab9
Fix gauge resetting to 0 each time (should figure out how to utilize the existing set range and value, but for now this works)
2017-11-05 02:29:58 -05:00
blitzmann
cebca64e5e
Fix CREST stuff
2017-11-05 01:43:39 -05:00
blitzmann
bd0de82a8e
remove repo version of FloatSpin, go with wx bundled version
2017-11-05 01:10:22 -05:00
blitzmann
0f5ae8d9b6
Fix delete fix (renamed MiddleDown to MiddleIsDown)
2017-11-05 01:03:14 -05:00
blitzmann
5ae7805bb1
Fix ammo picker
2017-11-05 01:54:19 -04:00
blitzmann
6a382c4445
More tweaks to getModifiedItemAttr and fix deprecation warning
2017-11-05 01:51:19 -04:00
blitzmann
3b0c8b6117
Fix Racks having a CPU and Power value of 0
2017-11-04 18:32:26 -04:00
blitzmann
0e1e4cad6d
Fix a few more deprecation warnings
2017-11-04 18:24:18 -04:00
blitzmann
e0b92198b0
Fix deprecation warnings
2017-11-04 18:20:54 -04:00
blitzmann
ce3b94696a
Make sure getModifiedItemAttr always returns an int, unless otherwise wanting None
...
In py2, you could compare None to an int and it would always be less than. Unfortunately in py3, this is no longer the case. Returning getModifiedItemAttr as 0 allows us to not do a huge refactor.
2017-11-04 18:20:00 -04:00
oaao
cacf286176
[fix] eos - remove Komodo thermalDamage double-dipping
2017-11-02 04:41:57 -04:00
Ryan Holmes
ca27cd3250
bump stable release ( #1329 )
2017-10-29 18:54:46 -04:00
Ryan Holmes
c0e15f61c6
Merge pull request #1322 from burnsypet/issue-1315
...
Stop applying neut resistance twice
2017-10-29 15:27:27 -04:00
blitzmann
4355f35eef
Revert "Stop applying neut resistance twice" and instead remove the resistance application from addDrain()
...
This reverts commit 7b32fe08ac
2017-10-29 15:07:05 -04:00
