Ryan Holmes
bc63eaa876
Merge pull request #1704 from feyyd/bug/1692
...
Bug/1692
2018-08-21 20:14:44 -05:00
P
b4e765abfa
add None checks in deleteFit to prevent exceptions
2018-08-20 21:41:50 -07:00
P
6c12e1c5fc
fix bug issue 1690 as well
2018-08-15 22:23:35 -07:00
P
083b618b71
1695 fixes + tox test fixes
2018-08-15 20:38:05 -07:00
blitzmann
b57bede510
tox fixes
2018-07-15 02:51:53 -04:00
MaruMaruOO
7a4c7a8f9f
Removed excess diagnostic information
2018-07-11 10:28:39 -04:00
Maru Maru
1699b8ceee
Add ability to use character implants by default
2018-07-11 05:35:19 -04:00
blitzmann
39f7ecdf5c
Merge branch 'mutaplasmids'
...
# Conflicts:
# eve.db
2018-06-21 00:22:57 -04:00
blitzmann
8f16fc5c1e
Merge branch 'master' into mutaplasmids
...
# Conflicts:
# eve.db
2018-06-17 12:52:49 -04:00
blitzmann
d4dba99363
Properly handle projecting an abyssal module (we now copy modules instead of using the same item ID)
2018-06-17 00:04:34 -04:00
blitzmann
5c566bae73
Introduce special cases for cargo swapping when dealing with abyssal modules ( #1649 )
2018-06-16 21:50:18 -04:00
blitzmann
ed94294584
Finish implementing the translated values for the Mutators
2018-06-15 01:31:51 -04:00
blitzmann
6fdcce12a3
Merge branch 'icons-1621' into v2.2.0b1
...
# Conflicts:
# eos/db/__init__.py
# eos/db/gamedata/__init__.py
# eos/db/gamedata/item.py
# eos/gamedata.py
# eve.db
2018-06-12 21:43:28 -04:00
blitzmann
e19d231eba
Merge branch 'master' into v2.2.0b1
...
# Conflicts:
# eve.db
2018-06-12 21:41:04 -04:00
blitzmann
bceaa0d1d5
Get mutations to save
2018-06-11 23:44:34 -04:00
blitzmann
3670f3289c
Convert a module to an abyssal with a mutaplasmid - saving to and loading from database confirmed.
2018-06-03 19:50:50 -04:00
blitzmann
19cf3c2036
Update various GUI things to show new location for ship icon
2018-06-02 14:54:59 -04:00
WatchMeCalculate
87660246b6
When re-enabling restrictions only delete incompatible modules
...
Hardpoints past limit will show up highlighted red.
2018-06-01 02:19:14 -07:00
blitzmann
bc23417eae
Start working on Abysmal space environment effects. The values produced for the infernal weather (calm firestorm) thermic resist penalties are spot on according to my testing. :D
2018-05-20 12:53:33 -04:00
blitzmann
891c20eea7
Merge branch 'master' into singularity
2018-05-20 00:22:24 -04:00
blitzmann
eeb700c75d
Get back into tox's good graces
2018-05-15 01:41:32 -04:00
blitzmann
deecfb31dc
Merge tag 'v2.0.1' into singularity (bring sisi code up to date with pyfa 2 / py3 / wx4)
...
# Conflicts:
# eos/effects/techtwocommandburstbonus.py
2018-05-15 01:17:51 -04:00
blitzmann
5101e2851a
replace eve-central with evemarketer
2018-05-07 22:28:40 -04:00
DarkPhoenix
32c6dcdb79
Sort fits during search the same way they are sorted normally
2018-05-03 11:24:01 +03:00
blitzmann
d3b8cebc8a
Merge branch 'master' into test-3
2018-03-01 23:42:22 -05:00
blitzmann
b1e40427a3
Tox
2018-03-01 23:41:39 -05:00
blitzmann
73925df24b
Don't fail when trying to project a module that can't be projected.
2018-03-01 23:24:00 -05:00
blitzmann
42ccc53166
bit of clean up for reload setting
2018-02-18 20:35:46 -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
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
Ryan Holmes
da5aaf2f78
Feature/evemarketdata ( #1297 )
...
* Add preliminary support for eve market data
* Break out market sources into their own classes and register them onto the price service. Create preference option to select which source user wants. Default to eve central
* fix tox stuff
2017-09-23 19:39:38 -04:00
blitzmann
821ede8579
Do the same thing for damage patterns as we did for character for global setting
2017-09-22 02:08:53 -04:00
blitzmann
592f9a2298
Trigger a recalc on fit switching if the characters are not the same and the global character flag is set.
2017-09-22 02:01:27 -04:00
Ryan Holmes
ee392e07c4
Fixes ( #1288 )
...
* Provide correct text formatting index
* Fix remove item context menu in projected pane
2017-09-19 19:20:10 -04:00
blitzmann
d19486ce15
cleanup
2017-07-11 02:30:26 -04:00
blitzmann
30fe7930a9
Remove log spam
2017-07-11 01:10:55 -04:00
blitzmann
496b28226d
Merge branch 'feature/booster-side-effects' into development
2017-07-09 18:26:38 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
blitzmann
c2cb5d763f
Implement selectable booster side effects and persist them to the database, very much based on the fighter ability code. Still need to name them and enable the effects.
...
This also removes the old boosterActiveSideEffect table definition (migration script to drop table still needs to be written)
2017-06-04 23:33:11 -04:00
Ryan Holmes
208148b670
Fix issue with fit deletion ( #1211 )
...
* bump dev
* Fix issue with deleted fit not being removed from database cache (#1207 ). Also, include some error handling around the our commit stuff
2017-06-02 00:30:58 -04:00
Ryan Holmes
45c3533501
Make some extra logging statements and stuff to troubleshoot fit deletion bugs ( #1199 )
2017-05-30 22:57:52 -04:00
Ryan Holmes
18554e3186
Fix a bunch of item swapping mechanisms (see #1186 ) ( #1187 )
2017-05-21 20:31:12 -04:00
Ryan Holmes
da33a372cb
Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. ( #1168 )
2017-05-14 20:52:06 -04:00
blitzmann
3b23c9eacd
flake8
2017-05-14 01:41:15 -04:00
blitzmann
d4ce1ef3db
Fix issue with Delete key event on t3d mode causing exception ( #1160 ). Additionally, work around the fact that every module that is removed also recalculates the fit, allowing for a faster response time when deleting multiple modules at a time. This is somewhat ugly as the removeModule function was originally based on the assumption of removing only one module. Should clean it up at some point.
2017-05-14 01:37:49 -04:00
blitzmann
ffe840e245
Fix for #1161 . Can't reproduce, but I'm unsure what the root cause is (probably something firing in the wrong order). 9be4ae may also alleviate the root cause.
2017-05-13 23:28:51 -04:00
blitzmann
5e20d6973f
Fix situation in which deleting a fit that was both a command and projected fit for the same target threw an error
2017-05-13 23:28:49 -04:00
blitzmann
5392aaa27e
refresh command fits on boosted fits when the booster is deleted
2017-05-13 23:28:48 -04:00
Ryan Holmes
de9b167242
Bump version and include fix for #1147 ( #1150 )
...
* bump dev
* Fix two issues with deleting fits (#1147 )
2017-05-10 18:48:33 -04:00
blitzmann
dd09b3d951
Add fitting notes to the ship browser tooltips
2017-05-08 19:20:30 -04:00
