Commit Graph

5976 Commits

Author SHA1 Message Date
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
15216453c9 Update item attributes panel when mutation changes (#1644) 2018-06-17 13:01:54 -04:00
blitzmann
8f16fc5c1e Merge branch 'master' into mutaplasmids
# Conflicts:
#	eve.db
2018-06-17 12:52:49 -04:00
blitzmann
444f42ceee Change CREST export text to ESI 2018-06-17 12:51:57 -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
d4dba99363 Properly handle projecting an abyssal module (we now copy modules instead of using the same item ID) 2018-06-17 00:04:34 -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
blitzmann
4e8e5d86c4 Fix for #1647 2018-06-16 17:04:29 -04:00
blitzmann
7e6fc4e6c2 Fix issue with closing item stats 2018-06-16 15:58:30 -04:00
blitzmann
47016c682e Don't destroy ItemStats window on close. Instead, Skip() the event so that it can finish processing events correctly. (#1650) 2018-06-15 02:27:41 -04:00
blitzmann
eece7de547 Merge branch 'issue/1642' into mutaplasmids 2018-06-15 01:32:03 -04:00
blitzmann
ed94294584 Finish implementing the translated values for the Mutators 2018-06-15 01:31:51 -04:00
blitzmann
634bdab396 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2018-06-14 22:53:33 -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
12c491a6b3 Merge branch 'mutaplasmids' of https://github.com/pyfa-org/Pyfa into mutaplasmids 2018-06-13 23:11:37 -04:00
Ryan Holmes
4d8240a588 Merge pull request #1643 from burnsypet/mutaplasmids
Added reset and randomize buttons to mutaplasmid view
2018-06-13 23:10:55 -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
burnsypet
59a5b68152 Added reset and randomize buttons to mutaplasmid view 2018-06-13 22:52:36 +01:00
Ryan Holmes
f0a6034cec Merge pull request #1632 from WatchMeCalculate/Issue-#1627
Adds exception handler for when HttpServer fails on init
2018-06-13 00:21:46 -04:00
Ryan Holmes
6224286524 Merge pull request #1639 from burnsypet/issue-1637
HTML export now contains EFT block
2018-06-13 00:20:14 -04:00
Ryan Holmes
eefc84465f Merge pull request #1638 from surculus12/issue-1633
resolves #1633
2018-06-13 00:18:15 -04:00
blitzmann
4fd54ca74a bump beta version 2018-06-12 22:23:57 -04:00
blitzmann
779b9f0821 Fix attribute icons to use new method 2018-06-12 21:51:58 -04:00
blitzmann
3ae10fe483 adding icons 2018-06-12 21:46:31 -04:00
blitzmann
88be999899 update database 2018-06-12 21:46:05 -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
d4d55c026a tweak font sizes 2018-06-12 21:29:00 -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
burnsypet
ab6200e2c1 Fixed line length for PEP8 2018-06-12 20:11:39 +01:00
burnsypet
8a18047957 HTML export now contains EFT block 2018-06-12 19:17:39 +01:00
blitzmann
fccd4b61f4 Recalc fit after a mutator change and 1 sec has passed. This allows for both gui animations to finish and prevent multiple quick changes form clogging everything up) 2018-06-12 01:55:40 -04:00
blitzmann
bceaa0d1d5 Get mutations to save 2018-06-11 23:44:34 -04:00
blitzmann
994521f654 Move some functionality tot he mutator object, and clean some stuff up 2018-06-11 23:09:21 -04:00
surculus12
b7b60e4ea6 resolves #1633 2018-06-11 15:24:17 +00:00
blitzmann
6a03ff59af Attribute graph: add edge on neutral 2018-06-10 02:28:01 -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
fe47ebd1f5 Merge branch 'attribute_gauge' of https://bitbucket.org/blitzmann/pyfa-playground into attribute_gauge 2018-06-09 20:35:08 -04:00
blitzmann
3b310e9b61 Tweaks to slider logic with respect to negative values 2018-06-09 20:34:59 -04:00
Ryan Holmes
07737a1f6d more refactoring and bug fixes for gui 2018-06-09 11:03:04 -04:00