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
Ryan Holmes
7ae41b71b2
Fix some deprecated things and a bug or two
2017-07-02 23:26:44 -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
8e4db5a8c3
Do some renaming of some files
2017-06-12 18:08:07 -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
petosorus
33410f0618
Formatting
2017-05-30 15:51:48 +02:00
petosorus
2c98baade8
Price options labels + total computing in minimal
2017-05-29 15:24:21 +02:00
petosorus
380f90d065
Price options in context menu
2017-05-24 17:30:55 +02:00
Ryan Holmes
65f71b6f6b
Fix exception with character implants, and don't show implant set menu if there aren't any ( #1172 )
2017-05-15 22:59:47 -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
21a071ea40
Add "remove" context menu to command fits
2017-05-08 22:34:03 -04:00
blitzmann
4f1e7697ed
Fix issue in which "Open Fit" was showing on the command view, not the command fit, potentially causing an error
2017-05-08 22:29:50 -04:00
blitzmann
2e6066e848
Merge branch 'feature/tabbed-fits' into dev
2017-05-06 13:08:52 -04:00
blitzmann
f751eff1cf
Fix some styling issues on linux
2017-05-06 12:57:20 -04:00
blitzmann
90d854fd24
Add change affecting skills menu to drones and fighters
2017-04-17 19:25:35 -04:00
blitzmann
1ee679903c
Bring dev up to date with master
...
Conflicts:
service/fit.py
2017-04-16 11:42:41 -04:00
blitzmann
080590a292
Add "Currently Open Fits" context menu for projected and command views
2017-04-13 23:23:48 -04:00
