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
7e6fc4e6c2
Fix issue with closing item stats
2018-06-16 15:58:30 -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
DarkPhoenix
d48f9354ec
Update database (vedmak fitting changes) and do relevant string updates
...
Also change jsontosql script to ignore fsdtypeoverrides which is no longer dumpable by phobos
2018-06-05 20:02:00 +03:00
blitzmann
b3acc8fd21
Get a slider interface going for the items stats. Starting to come together!
2018-06-04 02:21:52 -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
04171b243b
Get the mutaplasmid context men working to display the mutaplasmids
2018-06-03 16:48:31 -04:00
blitzmann
20f57146c4
Merge branch 'master' into mutaplasmids
...
# Conflicts:
# eve.db
2018-06-03 16:31:20 -04:00
blitzmann
012c5f536b
Add mutaplasmid context menu
2018-06-03 16:29:00 -04:00
blitzmann
8bb3cbb25e
More icon fixes
2018-05-31 21:20:47 -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
7a18224800
pep8
2018-05-30 19:34:14 -04:00
blitzmann
553a181966
Merge branch 'abysmal_weather' into singularity
...
# Conflicts:
# eve.db
2018-05-27 17:25:47 -04:00
DarkPhoenix
d4beba8b7b
Fix ammo picker for disintegrators
2018-05-24 14:35:17 +03:00
blitzmann
9268dc36bf
Give the abyssal effect name some custom, directed loving. Mmm.
2018-05-23 00:45:11 -04:00
blitzmann
e95cbdd19b
Re-work the wormhole (now call Environmental) context menu
2018-05-23 00:38:30 -04:00
blitzmann
155a3a4e42
Tweak the ammo sorter to be more consistent, and not go off of calculated values for the modules (which may change based on the current charge) ( #1520 )
2018-05-19 17:41:04 -04:00
blitzmann
03212be54a
Merge branch 'master' into test-3
...
# Conflicts:
# eos/capSim.py
# eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
# eos/effects/warpdisruptsphere.py
2018-03-25 03:03:59 -04:00
blitzmann
1513b07071
set cargo amoutninput to select all instead of inserstion end
2018-03-11 19:40:38 -04:00
blitzmann
df0c6ed269
Merge branch 'bug/amount-modal' into test-3
2018-02-24 22:21:02 -05:00
blitzmann
2b87f91279
tox fix
2018-02-24 22:20:24 -05:00
blitzmann
9b48b61b9b
Merge branch 'bug/amount-modal' into test-3
2018-02-24 22:17:22 -05:00
blitzmann
57e67b3699
Handle getting value for Change Amount differently for projected fits
2018-02-24 22:17:04 -05:00
blitzmann
f94fbd740a
Merge branch 'bug/amount-modal' into test-3
...
# Conflicts:
# gui/builtinContextMenus/amount.py
2018-02-24 02:55:40 -05:00
blitzmann
1da12cb18e
tox fix
2018-02-24 02:54:23 -05:00
blitzmann
e0cddcd061
Redesign amount modal, basing style off wx.TextEntryDialog (but not a wx.TextEntryDialog, because there are possibilities to do a few different things in this modal)
2018-02-24 02:47:13 -05:00
blitzmann
42ccc53166
bit of clean up for reload setting
2018-02-18 20:35:46 -05:00
blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -05:00
blitzmann
65e17119af
Deprecation fix
2017-11-25 13:12:26 -05:00
blitzmann
f3dc3bc654
Fix tabs not disabling. It was primarily an issue with event propagation not being handled correctly, as well as some missing helper code in chrome_tabs
2017-11-24 12:22:21 -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
bd181559ed
Don't show Side Effects menu if there are no side effects (eg: Synths)
2017-11-22 23:19:03 -05:00
blitzmann
cc9b6ea04b
More deprecation fixes
2017-11-13 00:18:24 -05:00
blitzmann
5ae7805bb1
Fix ammo picker
2017-11-05 01:54:19 -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
Ryan Holmes
34c692c972
Use unicode string to prevent non-ASCII ship names from causing error ( #1317 )
2017-10-21 22:04:40 -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
Ryan Holmes
3e73c2eb34
Fix setting implant set for character implants ( #1284 )
2017-09-18 20:36:41 -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
Jeremy Shore
4720b611b0
Support Decimals
2017-08-14 15:48:18 -05:00
Jeremy Shore
89cf40423b
Fixed issue crashing pyfa when pasting from calculator with commas
2017-08-13 01:54:59 -05: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
blitzmann
bc462ede3e
Fix some back event reference due to sleepiness last night ;_;
2017-07-11 19:23:29 -04:00
blitzmann
5adde95807
Remove print statement
2017-07-11 01:42:45 -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
496b28226d
Merge branch 'feature/booster-side-effects' into development
2017-07-09 18:26:38 -04:00
blitzmann
f8e5e15051
Fixed bug with meta swap context menu for subsystems
2017-07-09 15:08:59 -04:00
