Maru Maru
|
da5893ac91
|
Merge branch 'master' into py3EFFS
|
2018-07-06 04:26:48 -04:00 |
|
blitzmann
|
39f7ecdf5c
|
Merge branch 'mutaplasmids'
# Conflicts:
# eve.db
|
2018-06-21 00:22:57 -04:00 |
|
blitzmann
|
6c184e9184
|
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
|
2018-06-21 00:21:36 -04:00 |
|
blitzmann
|
c587fa1e84
|
Merge branch 'issue/1645'
|
2018-06-21 00:21:08 -04:00 |
|
DarkPhoenix
|
1b932fd885
|
Implants are not penalized
|
2018-06-19 16:10:41 +03:00 |
|
blitzmann
|
6c6423515c
|
Fix for #1635
|
2018-06-18 20:55:16 -04:00 |
|
blitzmann
|
8f16fc5c1e
|
Merge branch 'master' into mutaplasmids
# Conflicts:
# eve.db
|
2018-06-17 12:52:49 -04:00 |
|
blitzmann
|
8bf9a9881f
|
Add some invalidation logic to module for Abyysal modules without base or mutaplasmid
|
2018-06-17 12:23:05 -04:00 |
|
blitzmann
|
8f5060cc3e
|
Fix some issues capping at a certain range (#1651)
|
2018-06-17 12:10:33 -04:00 |
|
blitzmann
|
b7458396ac
|
Fix some rounding issues (#1651)
|
2018-06-17 01:48:51 -04:00 |
|
blitzmann
|
710739696a
|
Incorporate mutaplasmids within module copy
|
2018-06-16 23:25:27 -04:00 |
|
blitzmann
|
5c566bae73
|
Introduce special cases for cargo swapping when dealing with abyssal modules (#1649)
|
2018-06-16 21:50:18 -04:00 |
|
Maru Maru
|
6bbfb18680
|
Merge branch 'master' into py3EFFS
|
2018-06-16 04:52:10 -04:00 |
|
Maru Maru
|
d61ab0ff5a
|
Refactoring for various EFS export code
|
2018-06-16 04:50:55 -04:00 |
|
blitzmann
|
3462252ecc
|
Automatically check on character load that the character at least has all skills in the database for it (#1645)
|
2018-06-14 22:53:16 -04:00 |
|
blitzmann
|
5a085b6e27
|
Automatically check on character load that the character at least has all skills in the database for it (#1645)
|
2018-06-14 22:52:33 -04:00 |
|
blitzmann
|
154b07e0d6
|
Move the attribute unit translations from the GUI to the Unit class and tweak the display of mutator ranges to use this. Additionally, develop inverse functions to the value translations for eventual use in the mutator slider
|
2018-06-13 23:10:48 -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 |
|
blitzmann
|
3ebfe045c5
|
Catch a rare error with mutators that are kinda orphaned (not via module, but the mod doesn't have base or mutaplasmid)
|
2018-06-12 21:15:31 -04:00 |
|
blitzmann
|
75230a78a6
|
Do not explicitly add the mutator to the module. Setting the Mutator.module property is sufficient, and prevents from a duplicate one from being added with a None key.
|
2018-06-12 20:57:06 -04:00 |
|
blitzmann
|
994521f654
|
Move some functionality tot he mutator object, and clean some stuff up
|
2018-06-11 23:09:21 -04:00 |
|
blitzmann
|
f8b5adb31d
|
Determine validity via mod, not value (prevents weirdness with negatives)
|
2018-06-10 01:30:05 -04:00 |
|
blitzmann
|
e8b56b076b
|
Instantiate mutators when a mutated module is created / loaded from DB. Some bug fixes for a few things.
|
2018-06-10 01:10:53 -04:00 |
|
blitzmann
|
cc529d3499
|
Penalized drone velocity rigs (#1630)
|
2018-06-06 00:25:45 -04:00 |
|
blitzmann
|
aee225d11a
|
Only apply thermodynamics skill to modules with heatDamage attribute
|
2018-06-05 23:59:01 -04:00 |
|
Ryan Holmes
|
0b45438981
|
Merge pull request #1626 from WatchMeCalculate/Issue-#1519
Issue #1519, on fitting restriction toggle, accurately keep valid modules
|
2018-06-05 20:26:16 -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
|
20f57146c4
|
Merge branch 'master' into mutaplasmids
# Conflicts:
# eve.db
|
2018-06-03 16:31:20 -04:00 |
|
blitzmann
|
3fbd869821
|
Get some basic relationships added for mutaplasmids
|
2018-06-03 16:28:33 -04:00 |
|
blitzmann
|
18bbe49c49
|
support renders
|
2018-06-02 14:34:00 -04:00 |
|
blitzmann
|
59d56fc333
|
Remove clothing form the database
|
2018-06-02 14:04:34 -04:00 |
|
WatchMeCalculate
|
a5b5cec919
|
Fixed flake8 issues
|
2018-06-01 13:08:25 -07:00 |
|
WatchMeCalculate
|
cc586f6532
|
For modules with maxfitting, ensure on validity count, don't count itself
|
2018-06-01 02:18:03 -07:00 |
|
WatchMeCalculate
|
02103b6d2e
|
Refactor checking if Hardpoints has free spots into a function fit can use
|
2018-06-01 02:16:29 -07: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
|
e8efa22a95
|
Merge branch 'singularity'
|
2018-05-30 19:49:40 -04:00 |
|
blitzmann
|
7a18224800
|
pep8
|
2018-05-30 19:34:14 -04:00 |
|
blitzmann
|
d0777602e7
|
Clean up unused effect files now that the effects script works (hopefully)
|
2018-05-29 21:49:32 -04:00 |
|
blitzmann
|
618507f88c
|
Fix the effects used by script (no longer restricted on category / group), and fix many effects headers
|
2018-05-29 21:43:25 -04:00 |
|
blitzmann
|
c5bc9e2534
|
Added missing effectsm, and update headers
|
2018-05-29 21:39:11 -04:00 |
|
blitzmann
|
de7a5361fd
|
Add triglavian icon to ship browser
|
2018-05-29 19:58:59 -04:00 |
|
blitzmann
|
8ab709e590
|
* Update database (unpublish Abyssal items, for now)
* Add eve data version and datetime to about window (temp measure until we can get a better about window implemented)
|
2018-05-29 19:37:55 -04:00 |
|
Ryan Holmes
|
efe974f8f9
|
Merge pull request #1616 from WatchMeCalculate/issue-#1599
Remove asterisk next to character name after API refresh
|
2018-05-28 17:55:23 -04:00 |
|
WatchMeCalculate
|
da85c66089
|
Make sure to clear dirty skills when clearing all skills
|
2018-05-28 13:33:19 -07:00 |
|
blitzmann
|
9f560584ce
|
Fix fighter DPS graph (#1521)
|
2018-05-27 16:29:47 -04:00 |
|
blitzmann
|
3944545721
|
Support for Abyssal module loading base item attributes
|
2018-05-27 14:58:14 -04:00 |
|