Commit Graph

3284 Commits

Author SHA1 Message Date
Ryan Holmes
970c3a5473 Merge branch 'master' into efs_port 2018-08-21 20:21:16 -05: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
MaruMaruOO
c0096fc016 Revert irrelevent changes compared to master 2018-07-17 20:46:15 -04:00
MaruMaruOO
ebac100e38 Adjusted EFS to clipboard tooltip 2018-07-17 04:22:40 -04:00
MaruMaruOO
fe43c2ee2e Merge branch 'master' into efs_port 2018-07-17 03:06:34 -04:00
MaruMaruOO
b1f1db1bee Change service.efsPort to a class structure for consistancy. 2018-07-17 02:54:01 -04:00
MaruMaruOO
6583aa9b34 Have missing icons display as question mark icons 2018-07-16 10:26:29 -04:00
MaruMaruOO
4be78db738 Added additional data to efs exports moduleNames and moved it to service.efsPort 2018-07-16 06:25:56 -04:00
MaruMaruOO
897763e8d5 Merge branch 'master' into py3EFFS 2018-07-16 04:01:08 -04:00
blitzmann
b57bede510 tox fixes 2018-07-15 02:51:53 -04:00
Maru Maru
1699b8ceee Add ability to use character implants by default 2018-07-11 05:35:19 -04:00
Maru Maru
f624528ce5 trivial line movement 2018-07-11 02:50:50 -04:00
Maru Maru
7a078f433a draft of misc patches for main branch 2018-07-11 12:05:57 -04:00
blitzmann
89efa9cbf9 Fix syntax issue (see #1657) 2018-07-09 22:59:26 -04:00
MaruMaruOO
29541bc5d9 Make itemStats.closeBtn fire a close event 2018-07-09 05:51:23 -04:00
Maru Maru
da5893ac91 Merge branch 'master' into py3EFFS 2018-07-06 04:26:48 -04:00
Maru Maru
7af5c17015 Changed the name of Eve Fleet Fight Simulator to Eve Fleet Simulator and updated refs to match 2018-07-06 14:01:54 -04:00
blitzmann
39f7ecdf5c Merge branch 'mutaplasmids'
# Conflicts:
#	eve.db
2018-06-21 00:22:57 -04:00
blitzmann
c587fa1e84 Merge branch 'issue/1645' 2018-06-21 00:21:08 -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
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
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
Maru Maru
6bbfb18680 Merge branch 'master' into py3EFFS 2018-06-16 04:52:10 -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
ed94294584 Finish implementing the translated values for the Mutators 2018-06-15 01:31:51 -04:00
blitzmann
12c491a6b3 Merge branch 'mutaplasmids' of https://github.com/pyfa-org/Pyfa into mutaplasmids 2018-06-13 23:11:37 -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
779b9f0821 Fix attribute icons to use new method 2018-06-12 21:51:58 -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
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
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