blitzmann
b57bede510
tox fixes
2018-07-15 02:51:53 -04:00
MaruMaruOO
fe951e2ca1
Typo fix for eos.gamedata.translations["Boolean"]
...
Fix for #1659 .
I assume the second argument is a typo given the use case.
If not giving it a default value also works.
2018-07-08 21:44:55 -04:00
blitzmann
39f7ecdf5c
Merge branch 'mutaplasmids'
...
# Conflicts:
# eve.db
2018-06-21 00:22:57 -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
154b07e0d6
Move the attribute unit translations from the GUI to the Unit class and tweak the display of mutator ranges to use this. Additionally, develop inverse functions to the value translations for eventual use in the mutator slider
2018-06-13 23:10:48 -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
20f57146c4
Merge branch 'master' into mutaplasmids
...
# Conflicts:
# eve.db
2018-06-03 16:31:20 -04:00
blitzmann
5388ba7a70
Remove need for Icon class, references to it's DB relationship, and remove from DB. Also, add the files. All the files.
2018-05-31 21:13:12 -04:00
blitzmann
de7a5361fd
Add triglavian icon to ship browser
2018-05-29 19:58:59 -04:00
blitzmann
d3bd52fe07
Get dynamic attributes JSON saved to the database... now for the tinkering to begin!
2018-05-25 19:18:51 -04:00
blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -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
de44e6f932
Get rid of some annoying messages
2017-11-21 23:46:33 -05:00
blitzmann
266398b1de
Get some things working for pyinstaller
2017-11-12 00:14:45 -05:00
Ryan Holmes
59b09a255a
Fix override importing (and possibly some other bugs revolving around this?) ( #1285 )
2017-09-18 23:28:39 -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
Ryan Holmes
0527a506ac
fix broken events preventing additions panels to not work
2017-07-03 01:46:46 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
blitzmann
0507a55731
Get resists working with more things, and fix bug in which we were still looking at an effect info (which doesn't exist anymore)
2017-05-07 19:59:25 -04:00
blitzmann
47a683c44c
Merge branch 'feature/strictSkills' into dev
...
Conflicts:
service/character.py
Implements strict skill requirement handling
2017-05-06 13:13:50 -04:00
blitzmann
703d6dbc85
Merge branch 'feature/grant-needed-skills' into dev
2017-05-06 13:09:30 -04:00
blitzmann
1f7858f853
Merge branch 'bug/resist-effects' (also includes current work on sisi branch).
...
This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
blitzmann
77b5e8afdc
Merge branch 'development' into feature/strictSkills
...
Conflicts:
eos/gamedata.py
2017-04-26 19:42:29 -04:00
blitzmann
5657438e3c
Change up effect classes for better efficiency
2017-04-24 19:04:07 -04:00
blitzmann
f7349316b4
Revert "Change to using inspect() instead of the current shitty way"
...
This reverts commit 711537dcf4
2017-04-24 00:34:04 -04:00
blitzmann
b21c850598
move skill mapping to item class
2017-04-22 03:12:33 -04:00
blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -04:00
blitzmann
711537dcf4
Change to using inspect() instead of the current shitty way
2017-04-21 00:45:36 -04:00
blitzmann
e971b7927e
Fix issue in which prices are removed all the time (forgot to add the check for deleted to the condition >.<)
2017-04-21 00:40:45 -04:00
blitzmann
283aba4f85
Add grant missing skills feature
2017-04-13 23:26:08 -04:00
blitzmann
50e604f412
convert print to debug statement >.<
2017-04-10 21:32:26 -04:00
blitzmann
ce01c66b3e
Better manage price object juggling in Item.price property. The previous way was creating new price objects when an object already existed in the database which could lead to Integrity issues.
2017-04-10 20:48:58 -04:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ebag333
a588aec978
Simple change to not try and reimport handlers if they have failed previously.
2017-03-15 15:53:40 -07:00
Ebag333
b9b56f5e73
kill another hidden import.
2017-02-28 19:23:01 -08:00
Ebag333
9134464a39
Fixes case that would generate a exception on the first fit calc (would trigger logging dumps for users). Also clean up a bunch of unnecessary try/exceptions, and some logging improvements
2017-02-28 11:28:41 -08: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
blitzman
c406102995
remove redundant inits
2017-02-14 20:30:34 -05: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
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
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
579a13da44
Tox fixes
2017-02-09 00:59:22 -08:00
Ebag333
7865219164
Add a ton of default values
2017-02-09 00:56:33 -08:00
Ebag333
f2c84692a9
Clean up a bunch of unused variables
2017-02-09 00:22:14 -08:00
blitzman
8a9d2a032e
Revert the try... except, see #960
2017-02-08 00:00:16 -05:00
Ebag333
1ebd54b282
Wrap getting attribute data in a try/except
...
Useful for when we try to get an sub-attribute on an object where the
attribute doesn't exist. Now returns the default value.
2017-01-29 00:27:45 -08:00
Ebag333
1a0ac7bb35
Allow default values to be passed in for modified attributes
2017-01-29 00:16:15 -08:00
Ebag333
88125634d2
Add extra info for misc column for fueled boosters
2017-01-28 21:47:58 -08:00
blitzman
191a065de1
Get skill limits working
2016-12-11 20:26:30 -05:00
