Commit Graph

321 Commits

Author SHA1 Message Date
DarkPhoenix
a4fae73a1e Make "fill with module" context menu entry disablable via preferences 2019-02-13 17:12:21 +03:00
DarkPhoenix
7bad3bc376 Show 'market group' context menu for mutated items as well 2019-02-13 17:07:06 +03:00
blitzmann
0745ed50e0 * Merge branch 'fill-with-module' of git://github.com/petosorus/Pyfa into petosorus-fill-with-module
* Remove settings check

# Conflicts:
#	gui/fitCommands/__init__.py
2019-01-10 23:36:05 -05:00
blitzmann
194c159379 Create a new property on Module, returns if module is projected (or None if it's not attached to a fit). Fix issues with setting charges on projected modules because the command was always looking at the literal modules on the fit (instead of projected) 2018-12-01 20:50:40 -05:00
DarkPhoenix
4845b3b0ce Add PvP weather to abyssal weather menu 2018-11-22 16:17:54 +03:00
petosorus
46f5a592ce Right click option to fill slots with a module 2018-10-21 16:07:02 +02:00
blitzmann
1454cd8a0d Merge remote-tracking branch 'origin/development' into release/v2.5.0 2018-10-08 12:40:23 -04:00
blitzmann
31c3101d6d Remove redundant parenthesis 2018-09-16 01:11:16 -04:00
blitzmann
b4b8a158f5 Bunch of import optimizations 2018-09-16 00:05:36 -04:00
blitzmann
5c6303995d Replace set() with a literal 2018-09-15 23:44:32 -04:00
blitzmann
621672bf34 Some tox fixes 2018-09-15 20:38:08 -04:00
Alexander Maryanovsky
8e41a90f57 Fixed missile module ammo picker not showing damage type icons. 2018-09-12 23:54:02 +03: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
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
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
d6b280d3cc Working commit for adding / removing projected modules / environments 2018-08-09 15:52:34 -04:00
blitzmann
0f4f8c636d Start working on projections 2018-08-04 22:10:14 -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
dd430bc9bb Implant and cargo conversions 2018-07-27 23:54:41 -04:00
blitzmann
b724e5bec1 Set up commands for adding/removing cargo 2018-07-27 00:43:47 -04:00
blitzmann
d5aeb0913d Start refactoring the refactor that was started with command pattern refactoring.
Instead of attempting to keep all the Fit service functionality, move these into specific "Fitting Commands" that are designed to define a unit of work and it's undo. Then, we will have "GUI Commands" which are defined as actions taken by the user themselves - these will usually use one or more "Fitting Commands".
2018-07-24 01:29:57 -04:00
blitzmann
5d0342ee2d Convert module charge handling to command pattern (adding charges and removing charges) 2018-07-21 18:04:07 -04:00
blitzmann
ec3cd75f4c Convert the context > Remove Module to command pattern 2018-07-21 16:00:02 -04:00
blitzmann
39f7ecdf5c Merge branch 'mutaplasmids'
# Conflicts:
#	eve.db
2018-06-21 00:22:57 -04:00
blitzmann
8f16fc5c1e Merge branch 'master' into mutaplasmids
# Conflicts:
#	eve.db
2018-06-17 12:52:49 -04:00
blitzmann
7e6fc4e6c2 Fix issue with closing item stats 2018-06-16 15:58:30 -04:00
blitzmann
6fdcce12a3 Merge branch 'icons-1621' into v2.2.0b1
# Conflicts:
#	eos/db/__init__.py
#	eos/db/gamedata/__init__.py
#	eos/db/gamedata/item.py
#	eos/gamedata.py
#	eve.db
2018-06-12 21:43:28 -04:00
blitzmann
e19d231eba Merge branch 'master' into v2.2.0b1
# Conflicts:
#	eve.db
2018-06-12 21:41:04 -04:00
DarkPhoenix
d48f9354ec Update database (vedmak fitting changes) and do relevant string updates
Also change jsontosql script to ignore fsdtypeoverrides which is no longer dumpable by phobos
2018-06-05 20:02:00 +03:00
blitzmann
b3acc8fd21 Get a slider interface going for the items stats. Starting to come together! 2018-06-04 02:21:52 -04:00
blitzmann
3670f3289c Convert a module to an abyssal with a mutaplasmid - saving to and loading from database confirmed. 2018-06-03 19:50:50 -04:00
blitzmann
04171b243b Get the mutaplasmid context men working to display the mutaplasmids 2018-06-03 16:48:31 -04:00
blitzmann
20f57146c4 Merge branch 'master' into mutaplasmids
# Conflicts:
#	eve.db
2018-06-03 16:31:20 -04:00
blitzmann
012c5f536b Add mutaplasmid context menu 2018-06-03 16:29:00 -04:00
blitzmann
8bb3cbb25e More icon fixes 2018-05-31 21:20:47 -04:00
blitzmann
5388ba7a70 Remove need for Icon class, references to it's DB relationship, and remove from DB. Also, add the files. All the files. 2018-05-31 21:13:12 -04:00
blitzmann
7a18224800 pep8 2018-05-30 19:34:14 -04:00
blitzmann
553a181966 Merge branch 'abysmal_weather' into singularity
# Conflicts:
#	eve.db
2018-05-27 17:25:47 -04:00
DarkPhoenix
d4beba8b7b Fix ammo picker for disintegrators 2018-05-24 14:35:17 +03:00
blitzmann
9268dc36bf Give the abyssal effect name some custom, directed loving. Mmm. 2018-05-23 00:45:11 -04:00
blitzmann
e95cbdd19b Re-work the wormhole (now call Environmental) context menu 2018-05-23 00:38:30 -04:00
blitzmann
155a3a4e42 Tweak the ammo sorter to be more consistent, and not go off of calculated values for the modules (which may change based on the current charge) (#1520) 2018-05-19 17:41:04 -04:00
blitzmann
03212be54a Merge branch 'master' into test-3
# Conflicts:
#	eos/capSim.py
#	eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
#	eos/effects/warpdisruptsphere.py
2018-03-25 03:03:59 -04:00
blitzmann
1513b07071 set cargo amoutninput to select all instead of inserstion end 2018-03-11 19:40:38 -04:00