Commit Graph

5830 Commits

Author SHA1 Message Date
blitzmann
33d4a8a691 update database 2018-05-23 00:46:51 -04:00
blitzmann
752c67bc0b tox 2018-05-20 15:57:02 -04:00
blitzmann
e7c826b71c Merge branch 'master' into singularity 2018-05-20 15:56:12 -04:00
blitzmann
2cac214f46 tox 2018-05-20 15:55:26 -04:00
blitzmann
63e5b6da68 Merge branch 'master' into singularity 2018-05-20 15:51:22 -04:00
blitzmann
23d9e7a91b Fix travis config 2018-05-20 15:50:56 -04:00
blitzmann
d84525876a Gather abysmal environnments into database 2018-05-20 00:52:48 -04:00
blitzmann
891c20eea7 Merge branch 'master' into singularity 2018-05-20 00:22:24 -04:00
blitzmann
020cc9e295 Revert "Clean up unused effects"
This reverts commit 842be9535b.
2018-05-20 00:22:14 -04:00
blitzmann
e423c9248a Fixes for some odd markdown2 bugs (#1532) 2018-05-19 23:57:40 -04:00
blitzmann
b138fea245 Tweak rack labels 2018-05-19 17:56:48 -04:00
blitzmann
cb509a832e Add number of slots in the rack heading (#1535) 2018-05-19 17:55:17 -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
Ryan Holmes
a59949a57a Merge pull request #1578 from minlexx/esi_proxy
Use proxies from Pyfa's "Network settings" for ESI requests
2018-05-19 17:07:57 -04:00
blitzmann
4ba33aa5b8 Fix two structure rig effects related to missile charge bonuses (#1526) 2018-05-19 17:07:01 -04:00
blitzmann
6dbb61dc12 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2018-05-19 14:53:07 -04:00
blitzmann
f1d3b68308 Bump version 2018-05-19 14:52:58 -04:00
blitzmann
cec61fc225 Some QOL tweaks to the character editor SSO section 2018-05-18 23:41:37 -04:00
blitzmann
caf31517ca Fix attempt for #1560 2018-05-18 01:18:46 -04:00
blitzmann
22edebbf9b More stuff for #1586 2018-05-18 01:18:31 -04:00
blitzmann
806f17f6ea Test fix for #1586 2018-05-17 00:50:17 -04:00
Ryan Holmes
77a5896997 Merge pull request #1584 from minlexx/fix_browse_esi_fittings
Skip fits for unknown ships in "Browse EVE Fittings"
2018-05-15 17:49:41 -04:00
Alexey Min
cc754342c8 Skip fits for unknown ships in "Browsing EVE Fittings" 2018-05-16 00:36:37 +03:00
Alexey Min
63074a2b85 Reduce code duplication:
Network settings class now provides its own method to get proxy settings dict in requests format.
This method can be used both in network service and esi access, reducing code duplication.
2018-05-15 22:13:04 +03:00
Alexey Minnekhanov
bec746b76f Use proxies from Pyfa's "Network settings" for ESI requests 2018-05-15 12:48:18 +03:00
blitzmann
eeb700c75d Get back into tox's good graces 2018-05-15 01:41:32 -04:00
blitzmann
deecfb31dc Merge tag 'v2.0.1' into singularity (bring sisi code up to date with pyfa 2 / py3 / wx4)
# Conflicts:
#	eos/effects/techtwocommandburstbonus.py
2018-05-15 01:17:51 -04:00
blitzmann
9bb83d4574 Merge branch 'master' of https://github.com/pyfa-org/pyfa 2018-05-14 22:08:07 -04:00
blitzmann
8023b2ea29 Bump version 2018-05-14 21:59:25 -04:00
blitzmann
3e1244a27a Fix for not being able to drag fit to tab area (#1569) 2018-05-14 19:26:23 -04:00
blitzmann
51e610830f Fix (not really) an issue with a dead character editor still receiving events 2018-05-14 18:27:53 -04:00
blitzmann
a2877f6b5f Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2018-05-14 01:03:06 -04:00
Ryan Holmes
acf6b3dffd Merge pull request #1549 from flashspys/patch-1
Add Drone Damage Amplifier to defaults
2018-05-14 00:39:44 -04:00
blitzmann
b6a1c4b308 Add support for using own client details (messy code, but it works!) 2018-05-14 00:37:26 -04:00
blitzmann
e29ab817af Add the client details back to the preferences page 2018-05-13 13:27:49 -04:00
blitzmann
86576581cd Break out the phobos dump from the data compilation (dump has to work in py2, whereas compilation requires py3 due to hooking directly in with EOS classes). protip: PyCharm configurations are awesome 2018-05-13 01:17:59 -04:00
blitzmann
50bd46015b fix the osx icon 2018-05-12 23:10:27 -04:00
blitzmann
aa2ffaf1ea Update installer script and create new dist script for windows. todo: find out hwo to invoke PyInstaller from python 2018-05-12 22:49:18 -04:00
blitzmann
5cc6b6c69c Move over all esi stuff to it's own class, which the esi service extends from. Also fix an issue in the EVE fittings browser where deleting a fit didn't actually remove it from the list of fits (due to that list being populated by the return data of ESI, which can be cached). More clean up. 2018-05-12 13:57:14 -04:00
blitzmann
0365f71c00 Move over ESI functionality to be completely separate from esipy 2018-05-12 12:25:34 -04:00
blitzmann
4d666907c9 Start breaking out esipy, first up: getting for login 2018-05-11 23:24:30 -04:00
Felix Wehnert
0466678176 Add Drone Damage Amplifier to defaults 2018-05-09 10:20:11 +02:00
blitzmann
c1e239b9b3 Add a message box informing user of failed ESI initialization 2018-05-08 22:00:35 -04:00
blitzmann
26aaeabd7f Bump version 2018-05-08 21:33:20 -04:00
blitzmann
0e0bc9dfd2 Remove some references to old api stuff (#1547) 2018-05-08 21:06:32 -04:00
DarkPhoenix
df24313bcf Update to recent sisi changes 2018-05-08 14:58:25 +03:00
blitzmann
8990cbfd6a update readme 2018-05-08 00:01:55 -04:00
blitzmann
8f34c03289 implement a stop gap measure for #1384 2018-05-07 23:20:11 -04:00
blitzmann
c1322a3566 Run through pyfa.io for update checks (allows us to log version usage and provide more flexibility going forward). Falls back to simple github request 2018-05-07 22:55:50 -04:00
blitzmann
5101e2851a replace eve-central with evemarketer 2018-05-07 22:28:40 -04:00