blitzmann
|
f773e0a935
|
fix misplaced parentheses
(cherry picked from commit 2a60216a92d39bb200c26bce8573484f54a80dc5)
|
2018-03-01 00:26:52 -05:00 |
|
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
|
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 |
|
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 |
|
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
|
f245a02372
|
DNA export should respect Export Charges setting
|
2018-02-24 23:37:53 -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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ryan Holmes
|
f66485c48a
|
Merge pull request #1396 from pyfa-org/bug/citadels
Bug/citadels
|
2018-02-16 17:42:50 -05:00 |
|
Ryan Holmes
|
2153c05183
|
Merge branch 'master' into bug/citadels
|
2018-02-16 17:42:03 -05:00 |
|
blitzmann
|
f66c36e42b
|
disable tests preventing branch from passing tox
|
2018-02-16 17:32:45 -05:00 |
|
DarkPhoenix
|
8771de9c1f
|
Fix retribution rof effect
|
2018-02-16 23:03:51 +03:00 |
|
blitzmann
|
fa3cf90421
|
add / update effects for citadels
|
2018-02-16 00:44:26 -05:00 |
|
blitzmann
|
636ee1de23
|
Get new Standup fighters working
|
2018-02-15 22:26:42 -05:00 |
|
blitzmann
|
b36bf8fb21
|
Fix issue restricting structure modules from fitting onto a structure
|
2018-02-15 21:03:25 -05:00 |
|
blitzmann
|
55ad52919e
|
Add missing Ishkur effect (drone tracking)
|
2018-02-15 20:09:50 -05:00 |
|
blitzmann
|
0648feaa7b
|
Handle a couple of group renamings
|
2018-02-15 20:07:57 -05:00 |
|
blitzmann
|
e16ae88ed9
|
Fix the item diff script not looking at all items needed
|
2018-02-15 20:07:06 -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 |
|
Ryan Holmes
|
8d7f0b56f1
|
Merge pull request #1382 from pyfa-org/release/v1.35.0
Release/v1.35.0
|
2018-02-14 22:19:46 -05:00 |
|