blitzmann
|
7ab3ad9e08
|
Don't delete and recreate skills when updating char sheet. Instead, get each individual skill and change level.
(cherry picked from commit 55c79c1bafaa9a1b159b73a72c6480f7e8d6cb6b)
|
2018-03-01 00:26:47 -05:00 |
|
blitzmann
|
3f3a82ca6c
|
Merge branch 'py3' of https://github.com/pyfa-org/Pyfa into test-3
|
2018-02-28 22:02:22 -05:00 |
|
blitzmann
|
e902cc5780
|
Add event.skip() to fit rename textCtrl focus loss
|
2018-02-28 22:00:48 -05:00 |
|
Ryan Holmes
|
fcb6952119
|
Merge pull request #1444 from Neugeniko/py3
Ensure graph frame unbinds its event handlers.
|
2018-02-27 21:09:10 -05:00 |
|
Neugeniko
|
3eecd57979
|
Update graphFrame.py
|
2018-02-28 03:17:37 +11:00 |
|
blitzmann
|
6e73b9fefd
|
Tox
|
2018-02-27 00:52:15 -05:00 |
|
blitzmann
|
f0b0285f77
|
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
|
2018-02-27 00:46:10 -05:00 |
|
blitzmann
|
e706a015b3
|
Merge branch 'issue/1397' into development
|
2018-02-27 00:45:53 -05:00 |
|
blitzmann
|
a804f9a1ad
|
Fix working on missing skills context menu (#1412)
(cherry picked from commit 96c13c344a)
|
2018-02-27 00:45:46 -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
|
551ffe9ed3
|
Quick fix for #1430
|
2018-02-27 00:23:29 -05:00 |
|
blitzmann
|
cbe1ce5bcd
|
Merge branch 'master' into test-3
|
2018-02-27 00:16:45 -05:00 |
|
Ryan Holmes
|
917afd5067
|
Merge pull request #1441 from pyfa-org/issue/1440
Convert sec status to float on character import (#1440)
|
2018-02-27 00:15:59 -05:00 |
|
blitzmann
|
c3fb9231a4
|
Convert sec status to float on character import (#1440)
|
2018-02-27 00:15:20 -05:00 |
|
blitzmann
|
2ed2f8e262
|
Fix issue with losing wrapper for FittingView when closing
|
2018-02-25 12:04:57 -05:00 |
|
blitzmann
|
390d90ac47
|
Merge branch 'issue/1434' into test-3 (#1434)
# Conflicts:
# gui/builtinViews/fittingView.py
|
2018-02-25 01:57:36 -05:00 |
|
blitzmann
|
4c877e7a5a
|
re-enable the tab preview
|
2018-02-25 01:45:43 -05:00 |
|
blitzmann
|
972fe433f7
|
remove vestigial file
|
2018-02-25 00:11:13 -05:00 |
|
blitzmann
|
ecaf6f96a9
|
guage: respect animation setting (#1434)
|
2018-02-25 00:10:17 -05:00 |
|
Ryan Holmes
|
8541e2a869
|
Merge pull request #1438 from pyfa-org/issue/1433
DNA export should respect Export Charges setting
|
2018-02-24 23:50:21 -05:00 |
|
blitzmann
|
48a2963472
|
Merge branch 'issue/1433' into test-3
|
2018-02-24 23:40:26 -05:00 |
|
blitzmann
|
f245a02372
|
DNA export should respect Export Charges setting
|
2018-02-24 23:37:53 -05:00 |
|
blitzmann
|
1c16343b46
|
Merge branch 'master' into test-3
|
2018-02-24 22:24:16 -05:00 |
|
Ryan Holmes
|
d0f66f2d16
|
Merge pull request #1437 from pyfa-org/issue/1432
Always open imports in a new tab (#1432)
|
2018-02-24 22:23:13 -05:00 |
|
blitzmann
|
df0c6ed269
|
Merge branch 'bug/amount-modal' into test-3
|
2018-02-24 22:21:02 -05:00 |
|
Ryan Holmes
|
9a4e26a5be
|
Merge pull request #1436 from pyfa-org/bug/amount-modal
Handle getting value for Change Amount differently for projected fits (#1435)
|
2018-02-24 22:20:51 -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
|
15e60c3d24
|
Always open imports in a new tab (#1432)
|
2018-02-24 21:11:53 -05:00 |
|
blitzmann
|
ebf07db6c6
|
Partial fix for #1430
|
2018-02-24 19:01:54 -05:00 |
|
blitzmann
|
1559767201
|
Ensure that the event is propagated when the graph window handles FitChanged (#1430)
|
2018-02-24 18:21:32 -05:00 |
|
blitzmann
|
6e5e52df37
|
See #1429, version file not currently applied
|
2018-02-24 17:13:50 -05:00 |
|
blitzmann
|
e9289c102b
|
Fix issue in notebook tab preview (this feature hasn't been enabled for a while, but we may want to turn it back on eventually. As such, ensure that we don't run into any problems here)
|
2018-02-24 13:53:56 -05:00 |
|
blitzmann
|
81d61d7e29
|
lol context management not available in 4.0.0b2, and can't update to >4.0 until #1421 is addressed
|
2018-02-24 13:49:17 -05:00 |
|
blitzmann
|
9ab4ec2d4f
|
Convert AutoBufferedPaintDC > BufferedPaintDC (and use spiffy new context management). See #1418
|
2018-02-24 13:45:36 -05:00 |
|
blitzmann
|
565332dfcd
|
Set wx requirement to v4b2, see #1421
|
2018-02-24 13:28:45 -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 |
|
Ryan Holmes
|
a2719ec2f7
|
Merge pull request #1427 from pyfa-org/bug/amount-modal
Redesign amount modal
|
2018-02-24 02:54:38 -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
|
78f632a4f6
|
Merge remote-tracking branch 'origin/master' into test-3
|
2018-02-24 02:03:29 -05:00 |
|
Ryan Holmes
|
52754535a0
|
Merge pull request #1426 from pyfa-org/issue/1416
Issue/1416
|
2018-02-24 02:02:57 -05:00 |
|
blitzmann
|
a9db667c9c
|
Do the same treatment to Target Resists as Damage Patterns
|
2018-02-24 02:01:23 -05:00 |
|
blitzmann
|
f442632fbc
|
Fix importing damage profiles which included overwriting existing ones and then performing a delete on one of them. #1416
|
2018-02-24 01:49:09 -05:00 |
|
blitzmann
|
362086cc83
|
Fix type in database default for damage types
|
2018-02-24 01:47:05 -05:00 |
|
blitzmann
|
73d59569ff
|
Merge remote-tracking branch 'origin/master' into test-3
# Conflicts:
# gui/characterEditor.py
|
2018-02-23 23:28:33 -05:00 |
|
Ryan Holmes
|
cb4fadf84c
|
Merge pull request #1425 from pyfa-org/issue/1419
Migrate the Save Character As dialog tot he same dialog / validator a…
|
2018-02-23 23:26:44 -05:00 |
|
blitzmann
|
e85d144928
|
Migrate the Save Character As dialog tot he same dialog / validator as the Edit Character Name (#1419)
|
2018-02-23 23:25:11 -05:00 |
|
blitzmann
|
07099f4057
|
Fix working on missing skills context menu (#1412)
(cherry picked from commit 96c13c344a)
|
2018-02-23 01:17:18 -05:00 |
|