Ryan Holmes
|
bc63eaa876
|
Merge pull request #1704 from feyyd/bug/1692
Bug/1692
|
2018-08-21 20:14:44 -05:00 |
|
Ryan Holmes
|
78de723b81
|
Merge pull request #1701 from feyyd/bug/1691
Bug/1691
|
2018-08-21 20:12:57 -05:00 |
|
Ryan Holmes
|
dbb9823df5
|
Merge pull request #1697 from feyyd/bugfix-1695
Bug/1695, Bug/1690
|
2018-08-21 20:06:15 -05:00 |
|
blitzmann
|
95899548e5
|
Fix an issue with double forward slashes in res paths (#1703)
|
2018-08-21 20:58:38 -04:00 |
|
blitzmann
|
2a076292da
|
pep8
|
2018-08-21 20:48:30 -04:00 |
|
blitzmann
|
308fa3c46c
|
Update effect headers
|
2018-08-21 20:47:56 -04:00 |
|
blitzmann
|
ccd6d357ed
|
New icons
|
2018-08-21 20:45:16 -04:00 |
|
blitzmann
|
21b6a2cdfd
|
Update for new effects and ships
|
2018-08-21 20:44:46 -04:00 |
|
DarkPhoenix
|
ccbd0a117b
|
Fix merge issue
|
2018-08-21 19:51:56 +03:00 |
|
DarkPhoenix
|
6caa79c951
|
Merge master into singularity
|
2018-08-21 19:43:41 +03:00 |
|
DarkPhoenix
|
4365da8292
|
Merge branch 'master' into singularity
|
2018-08-21 19:40:39 +03:00 |
|
DarkPhoenix
|
ff222b8d62
|
Some fixes to DB conversion script
|
2018-08-21 19:39:07 +03:00 |
|
Ryan Holmes
|
180b766b59
|
Merge branch 'master' into development
|
2018-08-21 00:45:15 -04:00 |
|
P
|
b4e765abfa
|
add None checks in deleteFit to prevent exceptions
|
2018-08-20 21:41:50 -07:00 |
|
P
|
2f40365a03
|
default return of getModifiedAttr so can use comparison
|
2018-08-19 17:42:55 -07:00 |
|
P
|
2001a395e5
|
extra check, swap instead of clone if unique module
|
2018-08-19 17:28:24 -07:00 |
|
blitzmann
|
7e94914f65
|
Implement drone toggle command
|
2018-08-18 01:09:37 -04:00 |
|
blitzmann
|
b17314f3c6
|
Add projected drone change command, and remove some prints
|
2018-08-18 00:45:26 -04:00 |
|
blitzmann
|
fd83a4b709
|
Remove drone splitting / merging, and introduce drone change qty
|
2018-08-18 00:39:05 -04:00 |
|
blitzmann
|
a37fdf48c8
|
Fix implant / booster toggles, add qty change commands, started dinking with drone stacks, although think I might remove this altogether in favor of a qty change
|
2018-08-18 00:06:50 -04:00 |
|
Ryan Holmes
|
5ee8e203db
|
Merge branch 'commandRefactor' of https://bitbucket.org/blitzmann/pyfa-playground into commandRefactor
|
2018-08-16 23:41:19 -04:00 |
|
Ryan Holmes
|
083b34c780
|
working commit
|
2018-08-16 23:40:50 -04:00 |
|
P
|
6c12e1c5fc
|
fix bug issue 1690 as well
|
2018-08-15 22:23:35 -07:00 |
|
blitzmann
|
bcbed3df39
|
Fix an issue which caused pyfa to crash (turns out instantiating the commands in the init was not a good idea)
|
2018-08-16 00:24:31 -04:00 |
|
P
|
083b618b71
|
1695 fixes + tox test fixes
|
2018-08-15 20:38:05 -07:00 |
|
blitzmann
|
3d4b41d135
|
Move deprecated methods to a base class - will remove this eventually, want to keep Fit clean
|
2018-08-14 01:31:59 -04:00 |
|
blitzmann
|
eeb2b019c0
|
Remove the crap from meta swap that was already reimplemented, leaving only drones as a reminder on what needs to be done
|
2018-08-14 01:26:17 -04:00 |
|
blitzmann
|
71257b5265
|
Implement some various toggles as commands
|
2018-08-14 01:25:36 -04:00 |
|
blitzmann
|
a5a152d395
|
Move meta swap functionality to command process
|
2018-08-14 00:58:50 -04:00 |
|
Ryan Holmes
|
f0983c1468
|
Implement fighter add/remove commands
|
2018-08-13 19:35:32 -04:00 |
|
Ryan Holmes
|
513e9d14d8
|
Moved the default fighter ability to the __init__()
|
2018-08-13 18:53:30 -04:00 |
|
Ryan Holmes
|
efbf2e7432
|
Make sure we recalc during swaps from cargo to module
|
2018-08-13 18:50:00 -04:00 |
|
Ryan Holmes
|
646a903f18
|
differentiate command processors based on fitID
|
2018-08-13 17:16:00 -04:00 |
|
Ryan Holmes
|
d74f2b2e42
|
Rework the logic of dragging module to cargo
|
2018-08-13 17:01:16 -04:00 |
|
Ryan Holmes
|
9977866eb0
|
work on moving from cargo to modules (including swapping modules)
|
2018-08-13 15:03:19 -04:00 |
|
Ryan Holmes
|
008d73e605
|
Finish off commands for cargo to module action
|
2018-08-13 02:01:16 -04:00 |
|
Ryan Holmes
|
2164588329
|
projected drone commands
|
2018-08-12 17:49:58 -04:00 |
|
Ryan Holmes
|
391c3a32a6
|
commands for add / remove projected fighters
|
2018-08-10 13:29:26 -04:00 |
|
Ryan Holmes
|
bd975becf1
|
Continue work on projections (adding/removing projected environment and fit)
|
2018-08-10 12:47:51 -04:00 |
|
Ryan Holmes
|
d6b280d3cc
|
Working commit for adding / removing projected modules / environments
|
2018-08-09 15:52:34 -04:00 |
|
Ryan Holmes
|
56ebb2926d
|
Merge remote-tracking branch 'bitbucket/commandRefactor' into commandRefactor
|
2018-08-05 11:06:45 -04:00 |
|
Ryan Holmes
|
804d90c50c
|
Don't run adding command on implants and boosters if item is already item
|
2018-08-05 08:17:24 -04:00 |
|
Ryan Holmes
|
326e1e04c2
|
Reworked slot-copying logic so that we can call it explicitly outside the append. Needed for the fitting commands to know what the previous item ID was that it's replacing.
|
2018-08-05 08:14:12 -04:00 |
|
blitzmann
|
0f4f8c636d
|
Start working on projections
|
2018-08-04 22:10:14 -04:00 |
|
blitzmann
|
425c7f657c
|
Do command fit toggle. Still need to settle on the logic for how to handle deleted fits - seems there's an issue with the queue.
|
2018-08-03 22:30:09 -04:00 |
|
blitzmann
|
3c7f0258df
|
More converting for command fits
|
2018-08-03 21:19:51 -04:00 |
|
Ryan Holmes
|
7a1b4b4a1e
|
Merge remote-tracking branch 'bitbucket/commandRefactor' into commandRefactor
# Conflicts:
# gui/fitCommands/__init__.py
|
2018-08-03 16:11:52 -04:00 |
|
Ryan Holmes
|
fcc53d3f21
|
Add commands for booster and command fits
|
2018-08-03 16:10:27 -04:00 |
|
blitzmann
|
15ba5c8ace
|
Convert tactical mode switching
|
2018-08-03 02:01:42 -04:00 |
|
blitzmann
|
6057a1a7d9
|
Fix issue with setting None charge
|
2018-08-03 02:01:26 -04:00 |
|