blitzmann
|
39f7ecdf5c
|
Merge branch 'mutaplasmids'
# Conflicts:
# eve.db
|
2018-06-21 00:22:57 -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
|
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
|
3fd4d106d9
|
Merge branch 'master' into test-3
# Conflicts:
# config.py
# eos/effects/warpdisruptsphere.py
# service/update.py
|
2018-03-25 13:16:07 -04:00 |
|
blitzmann
|
3964658d9a
|
Enable cargohold for structures (#1414)
|
2018-03-25 03:18:34 -04:00 |
|
blitzmann
|
963353a1dc
|
Merge branch 'master' into test-3
|
2018-03-01 00:40:40 -05:00 |
|
blitzmann
|
6e73b9fefd
|
Tox
|
2018-02-27 00:52:15 -05:00 |
|
blitzmann
|
9e1b7dbb87
|
Add ability to drag a module from fitting window to projected pane
|
2018-02-27 00:44:42 -05:00 |
|
blitzmann
|
5571bae8b2
|
Fix situation in which event propagation was not working properly for structures
|
2018-02-17 12:47:07 -05:00 |
|
blitzmann
|
0456cb2f96
|
Merge remote-tracking branch 'origin/master' into test-3
|
2018-02-16 22:26:10 -05:00 |
|
blitzmann
|
636ee1de23
|
Get new Standup fighters working
|
2018-02-15 22:26:42 -05:00 |
|
blitzmann
|
c6e715aa5c
|
Merge branch 'master' into test-3
|
2018-02-14 22:07:33 -05:00 |
|
blitzmann
|
d94d49f0a9
|
Add misc column to booster panel, and show booster duration
|
2018-02-10 20:45:26 -05:00 |
|
blitzmann
|
337f0a9c8a
|
Fix stretchspacers
|
2017-11-24 17:23:04 -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
|
f8a65de47f
|
tox fix
|
2017-10-29 12:23:45 -04:00 |
|
blitzmann
|
e5a0ef1877
|
Re-work menu spawning for Command and Projected views to be a bit more straightforward and allow spawning up context menu when right clicking the DummyEntry (#1316)
|
2017-10-29 12:22:15 -04:00 |
|
blitzmann
|
bc462ede3e
|
Fix some back event reference due to sleepiness last night ;_;
|
2017-07-11 19:23:29 -04:00 |
|
blitzmann
|
b55fcfaf04
|
cleanup
|
2017-07-11 02:06:09 -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
|
854d7cb09c
|
Rename "system effects" to "wormhole effects" (#1229)
|
2017-07-09 18:35:44 -04:00 |
|
blitzmann
|
b70f401a91
|
Merge branch 'qol/file-reorg' into development
|
2017-07-09 18:27:18 -04:00 |
|
Ryan Holmes
|
0527a506ac
|
fix broken events preventing additions panels to not work
|
2017-07-03 01:46:46 -04:00 |
|
Ryan Holmes
|
3b546de070
|
More deprecated fixes, and re-enable a working stats view
|
2017-06-14 03:51:40 -04:00 |
|
Ryan Holmes
|
2bbcd96ce3
|
Even more fixes
|
2017-06-13 15:01:30 -04:00 |
|
Ryan Holmes
|
1cbd8ee901
|
Fix some deprecated stuff
|
2017-06-12 21:31:37 -04:00 |
|
Ryan Holmes
|
361f7fc5bb
|
misc fixes
|
2017-06-12 21:09:50 -04:00 |
|
Ryan Holmes
|
ad535ccc78
|
Merge branch 'qol/additionPanes' into qol/file-reorg
|
2017-06-12 01:17:22 -04:00 |
|
Ryan Holmes
|
9dee761f6d
|
Move addition pane views into their own directory
|
2017-06-12 01:17:00 -04:00 |
|