blitzmann
|
ecaf6f96a9
|
guage: respect animation setting (#1434)
|
2018-02-25 00:10:17 -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 |
|
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
|
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
|
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
|
73d59569ff
|
Merge remote-tracking branch 'origin/master' into test-3
# Conflicts:
# gui/characterEditor.py
|
2018-02-23 23:28:33 -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
|
96c13c344a
|
Fix working on missing skills context menu (#1412)
|
2018-02-23 01:15:57 -05:00 |
|
blitzmann
|
8f42822d9e
|
Add roman package as a requirement, and remove the roman module from pyfa
|
2018-02-23 01:04:31 -05:00 |
|
blitzmann
|
c5ba79cfbb
|
Merge branch 'master' into test-3
# Conflicts:
# .gitignore
|
2018-02-23 01:02:51 -05:00 |
|
Ryan Holmes
|
3a23d820cc
|
Merge branch 'master' into acceptRomanNumerals
|
2018-02-23 01:01:07 -05:00 |
|
blitzmann
|
c917d22db5
|
tox fixes for the roman library to prevent travis from yelling at us
|
2018-02-23 01:00:43 -05:00 |
|
blitzmann
|
c3f8b102fa
|
Add the romans library to pyfa itself to avoid having to modify the binaries
|
2018-02-23 00:57:26 -05:00 |
|
blitzmann
|
5e566db47d
|
Fix attribute override export / import (#1420)
|
2018-02-23 00:36:52 -05:00 |
|
blitzmann
|
dd78a41171
|
Fix HTML export (more encoding stuff). Also fix old bug in which unicode fit names don't display correctly in the webbrowser. #1411
|
2018-02-23 00:13:14 -05:00 |
|
blitzmann
|
8abd25fe40
|
Use a scolled window in preference pages
|
2018-02-19 23:32:44 -05:00 |
|
blitzmann
|
d59c897921
|
Fix image list in preferences dialog
|
2018-02-19 01:20:57 -05:00 |
|
blitzmann
|
42ccc53166
|
bit of clean up for reload setting
|
2018-02-18 20:35:46 -05:00 |
|
blitzmann
|
35ad21da38
|
Add pattern for commit hashes to update dialog
|
2018-02-17 16:27:12 -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
|
8b2cfe44f2
|
Merge remote-tracking branch 'origin/master' into test-3
# Conflicts:
# config.py
# eos/saveddata/fighter.py
|
2018-02-17 12:31:58 -05:00 |
|
blitzmann
|
12a526fa9e
|
Fix for some standup fighter errors
|
2018-02-17 11:59:51 -05:00 |
|
blitzmann
|
82e3db1ffb
|
Centralize version string getting. Still trying to work out how we should handle automatic version increments so we don't have to modify files all the time. Remove version file from repo (should only be a thing when building binaries)
|
2018-02-17 11:10:42 -05:00 |
|
BlueShanks
|
bd0fcbef3a
|
Fixed style issues which were throwing errors
The code was failing an automatic test because of style issues, which are hopefully fixed now
|
2018-02-17 18:26:00 +10:00 |
|
blitzmann
|
0456cb2f96
|
Merge remote-tracking branch 'origin/master' into test-3
|
2018-02-16 22:26:10 -05:00 |
|
blitzmann
|
cafd92f169
|
add a todo
|
2018-02-16 22:26:02 -05:00 |
|
blitzmann
|
05f08970c9
|
fix character editor not spawning on OSX
|
2018-02-16 20:40:51 -05:00 |
|
blitzmann
|
636ee1de23
|
Get new Standup fighters working
|
2018-02-15 22:26:42 -05:00 |
|
BlueShanks
|
c5c673e360
|
moved a line back to where it was
results in a net smaller diff
|
2018-02-16 00:46:51 +10:00 |
|
BlueShanks
|
5cd21da7b1
|
Character Editor: accept skill plans in Roman numerals too
|
2018-02-16 00:19:56 +10:00 |
|
blitzmann
|
da0f89ef91
|
Merge commit 'refs/tags/v1.35.0^{}' into test-3
|
2018-02-14 22:25:45 -05:00 |
|
blitzmann
|
89b6e8f8c3
|
fix tox stuff
|
2018-02-14 22:15:48 -05:00 |
|
blitzmann
|
c6e715aa5c
|
Merge branch 'master' into test-3
|
2018-02-14 22:07:33 -05:00 |
|
blitzmann
|
649ba9f3e4
|
Merge branch 'master' into singularity
|
2018-02-14 21:31:54 -05:00 |
|
blitzmann
|
33618f12f7
|
Fix issue when error happens before wx is even initialized traceback is never set
|
2018-02-11 23:22:37 -05:00 |
|
blitzmann
|
5f0ce58c29
|
Merge branch 'master' into test-3
# Conflicts:
# gui/builtinShipBrowser/fitItem.py
# service/port.py
|
2018-02-11 21:29:17 -05:00 |
|
blitzmann
|
d94d49f0a9
|
Add misc column to booster panel, and show booster duration
|
2018-02-10 20:45:26 -05:00 |
|
blitzmann
|
0f30ea554d
|
Fix for #1377 - group up support fighters and modify the bonus based on amount active
|
2018-02-10 14:14:31 -05:00 |
|
blitzmann
|
50dd74dbe8
|
Add packaging requirement, and use it's PEP 440 version parsing for version comparisons.
|
2018-02-10 00:59:25 -05:00 |
|