Commit Graph

5851 Commits

Author SHA1 Message Date
blitzmann
ec2bf8d4ed Update renders 2018-05-29 19:40:01 -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
blitzmann
a02f863bc8 update database 2018-05-27 17:30:12 -04:00
blitzmann
553a181966 Merge branch 'abysmal_weather' into singularity
# Conflicts:
#	eve.db
2018-05-27 17:25:47 -04:00
blitzmann
4a1e4853fb fix issue with display 2018-05-27 17:25:04 -04:00
DarkPhoenix
d4beba8b7b Fix ammo picker for disintegrators 2018-05-24 14:35:17 +03:00
DarkPhoenix
4141a9df45 Do not show falloff range if it's too low (disintegrators fetch base value of 1 and show it) 2018-05-24 14:32:35 +03:00
DarkPhoenix
b6181f8ad6 Update db to latest sisi 2018-05-24 09:37:54 +03:00
blitzmann
c0f34f1117 update database, and a code tweak 2018-05-23 01:12:46 -04:00
blitzmann
5cf9e0c4ff Merge branch 'singularity' into abysmal_weather
# Conflicts:
#	eve.db
2018-05-23 00:49:29 -04:00
blitzmann
33d4a8a691 update database 2018-05-23 00:46:51 -04: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
1c359fb6ed tox 2018-05-20 15:58:25 -04:00
blitzmann
a8c57bbdeb Merge branch 'singularity' into abysmal_weather 2018-05-20 15:57:17 -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
c1f24a1979 Merge branch 'singularity' into abysmal_weather 2018-05-20 15:51:47 -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
7ac4b52d20 Do all localization effects 2018-05-20 15:05:41 -04:00
blitzmann
d110dd4c76 Implement xeon gas and electric store weather effects 2018-05-20 14:33:37 -04:00
blitzmann
a5b959fbf8 Implement caustic and darkness weather 2018-05-20 14:22:58 -04:00
blitzmann
90f1947ea7 Implement caustic weather 2018-05-20 14:14:35 -04:00
blitzmann
afd16e1afd Add new warfareBuffID, and fix issue with going to effect file in debug 2018-05-20 14:10:37 -04:00
blitzmann
bc23417eae Start working on Abysmal space environment effects. The values produced for the infernal weather (calm firestorm) thermic resist penalties are spot on according to my testing. :D 2018-05-20 12:53:33 -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