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 |
|
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
|
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
|
f69f76856a
|
Merge pull request #1391 from BlueShanks/acceptRomanNumerals
Character Editor: accept skill plans in Roman numerals too
|
2018-02-23 01:01:57 -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
|
5b2c5907ed
|
Skills needed export (#1412): Need to encode the string before we gzip it
|
2018-02-23 00:23:45 -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
|
201fb4e241
|
Remove all encoding bits from fit importing. Might not work 100% of the time, but as 2.0 gets introduced to the community, we'll get reports of possible problems. #1410
|
2018-02-23 00:00:53 -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 |
|
Ryan Holmes
|
cb89d13d9f
|
Merge pull request #1409 from pyfa-org/bug/1403
Remove some defunct items from market service
|
2018-02-19 00:16:42 -05:00 |
|
blitzmann
|
a1aa78adc0
|
Remove some defunct items from market service
|
2018-02-18 23:28:17 -05:00 |
|
blitzmann
|
4bbbd33917
|
Return 0 instead of -1 when there is no charge on a weapon. It was changed from None to -1 during the py3 conversion (as None can no longer be compared against non-None types). -1 was throwing the capSim off by quite a bit. See #1405
|
2018-02-18 22:55:31 -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
|
72efef818f
|
Fix version stuff
|
2018-02-17 13:59:19 -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 |
|
Ryan Holmes
|
5ea7215ec0
|
Merge pull request #1400 from pyfa-org/release/v1.35.1
Release/v1.35.1
|
2018-02-17 12:28:48 -05:00 |
|
blitzmann
|
e2ac90a040
|
Bump release
|
2018-02-17 12:27:12 -05:00 |
|
blitzmann
|
6ab84240a2
|
Add missing effect for scram script for standup warp disruptor. Update database to make sure everything is updated.
|
2018-02-17 12:22:35 -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 |
|
blitzmann
|
e779bb84e2
|
Fix for #1383. Due to the changed mechanics of None in py3, getModifiedItemAttr was defaulted to 0 instead of None. This adds an explicit default of None when trying to find the allowed drone group attribute
|
2018-02-17 10:53:29 -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 |
|
Ryan Holmes
|
f66485c48a
|
Merge pull request #1396 from pyfa-org/bug/citadels
Bug/citadels
|
2018-02-16 17:42:50 -05:00 |
|