blitzmann
c384848870
Merge branch 'master' into development
...
Conflicts:
config.py
2017-11-12 15:33:59 -05:00
Ryan Holmes
ca27cd3250
bump stable release ( #1329 )
2017-10-29 18:54:46 -04:00
Ryan Holmes
c0e15f61c6
Merge pull request #1322 from burnsypet/issue-1315
...
Stop applying neut resistance twice
2017-10-29 15:27:27 -04:00
blitzmann
4355f35eef
Revert "Stop applying neut resistance twice" and instead remove the resistance application from addDrain()
...
This reverts commit 7b32fe08ac
2017-10-29 15:07:05 -04:00
Ryan Holmes
029e61edaf
Merge branch 'master' into issue-1315
2017-10-29 12:36:29 -04:00
Ryan Holmes
b18f82505b
Merge pull request #1327 from pyfa-org/bug1316
...
Bug1316
2017-10-29 12:25:00 -04:00
blitzmann
f8a65de47f
tox fix
2017-10-29 12:23:45 -04:00
blitzmann
e5a0ef1877
Re-work menu spawning for Command and Projected views to be a bit more straightforward and allow spawning up context menu when right clicking the DummyEntry ( #1316 )
2017-10-29 12:22:15 -04:00
Ryan Holmes
8647fe460c
Merge pull request #1326 from pyfa-org/133bugfixes
...
133bugfixes
2017-10-28 22:44:27 -04:00
blitzmann
a4950e9015
Remove the rifter test as it's not properly mocked out and recent balancing passes have since made it useless
2017-10-28 22:36:00 -04:00
blitzmann
82d50cfa0d
Fix effect that used to only be for skill, but is now for a booster ( #1324 )
2017-10-28 21:04:51 -04:00
blitzmann
efea46006a
Better include all missiles in the MISC column ( #1325 )
2017-10-28 20:37:29 -04:00
blitzmann
d9800dcf19
Fix some effects for #1320
2017-10-28 19:45:09 -04:00
blitzmann
266b3ce985
Set Victor and Virtuso to not published, and fix bug which allowed user fits to return in search even if ship isn't published ( #1310 )
2017-10-28 19:25:19 -04:00
blitzmann
3b61a07c55
Fix for #1321 - make sure we have attribute on ship
2017-10-28 19:25:15 -04:00
blitzmann
5dc092ace5
bump dev
2017-10-28 19:25:10 -04:00
burnsypet
7b32fe08ac
Stop applying neut resistance twice
...
Energy neut/nos resistance was being applied twice when a nos or
neut is projected onto a fit. I have removed the redundant resistance
application in energyneutralizerfalloff.py and also in
energynosferatufalloff.py as they are already being applied once in
eos.saveddata.fit.addDrain.
2017-10-26 17:53:16 +01:00
Ryan Holmes
fd6e318ae3
Release/v1.33.0 ( #1319 )
...
* update database file to SISI 1202899
* Effect and group renaming
* Add civilian modules (#1308 )
* Add new effects
* update effect headers
* update database to tq - lifeblood (1203953)
* Update renders
* Update icons
* bump version
* fix tox errors
* change up tox config to ignore E722
* more tox ignores
* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.
* Try this
* more testing
* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
2017-10-25 23:33:05 -04:00
Ryan Holmes
34c692c972
Use unicode string to prevent non-ASCII ship names from causing error ( #1317 )
2017-10-21 22:04:40 -04:00
Ryan Holmes
b4dfcf53fb
Merge pull request #1303 from burnsypet/issue-1289
...
Change how skillsMap is generated
2017-10-08 21:42:40 -04:00
Ryan Holmes
3c26676b66
Merge branch 'master' into issue-1289
2017-10-08 21:30:53 -04:00
Ryan Holmes
3fb7411b9d
Issue/1305 ( #1311 )
...
* Bump dev version
* fix issue in itemDiff
* Do not apply Prop Jamming to Grapplers (#1305 )
2017-10-08 21:13:38 -04:00
burnsypet
cac8e528a3
Change how skillsMap is generated
...
Changes to characterSelection.py:
grantMissingSkills now uses _buildSkillsTooltipCondensed to
generate a list of skills to update
_buildSkillsTooltipCondensed now outputs level and ID rather than
just level so that it can be used by grantMissingSkills
Anything else using _buildSkillsTooltipCondensed like exportSkills
and fitChanged have been amended to extract just the level from
the skills map rather than level and ID
2017-09-26 18:22:24 +01:00
blitzmann
06e82a04b4
fix issue in itemDiff
2017-09-25 01:15:14 -04:00
blitzmann
782df18501
Bump dev version
2017-09-24 18:23:01 -04:00
blitzmann
a87d659e5d
Merge remote-tracking branch 'origin/master' into development
2017-09-24 18:20:53 -04:00
blitzmann
cd35c9319c
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
2017-09-24 18:20:26 -04:00
Ryan Holmes
dfe3d5c82a
Update forum references ( #1301 )
2017-09-24 18:00:21 -04:00
blitzmann
ccd8cdd099
Update forum references
2017-09-24 17:54:19 -04:00
Ryan Holmes
72062e6213
Release/1.32.0 ( #1300 )
...
* update database
* update effect headers
* Bump version
2017-09-24 16:43:51 -04:00
Ryan Holmes
10836acab2
Bug/1275 ( #1299 )
...
* Add stacking penalties to the max targeting range bonus of the Info Command Burst : Sensor Optimization
* Move Information Burst: Sensor Optimization: Targeting Range effect to proper position
* Fix tox issue
2017-09-24 13:38:52 -04:00
Ryan Holmes
08ab8fbc5b
Make sure efxBmp is created ( #1265 ) ( #1298 )
2017-09-24 13:29:57 -04:00
Ryan Holmes
da5aaf2f78
Feature/evemarketdata ( #1297 )
...
* Add preliminary support for eve market data
* Break out market sources into their own classes and register them onto the price service. Create preference option to select which source user wants. Default to eve central
* fix tox stuff
2017-09-23 19:39:38 -04:00
Ryan Holmes
4484b68a3a
Fix for #1260 - need to unbind event handling from frame when closed ( #1296 )
2017-09-23 19:15:03 -04:00
Ryan Holmes
81fce93186
Merge pull request #1294 from pyfa-org/bug/1263
...
Bug/1263
2017-09-23 13:18:01 -04:00
Ryan Holmes
d58987e427
Merge branch 'master' into bug/1263
2017-09-23 12:56:29 -04:00
Ryan Holmes
05a5ebff00
Merge pull request #1293 from pyfa-org/bug/1278
...
Bug/1278
2017-09-23 12:56:13 -04:00
blitzmann
2f28afc7ae
Merge branch 'bug/1278' of https://github.com/pyfa-org/Pyfa into bug/1278
2017-09-23 12:49:05 -04:00
blitzmann
0134c3b9a1
Fix formatting
2017-09-23 12:33:51 -04:00
Ryan Holmes
9f433fd072
Merge branch 'master' into bug/1278
2017-09-23 03:11:04 -04:00
blitzmann
7729bd9210
Opps commented wrong thing
2017-09-22 02:35:01 -04:00
blitzmann
ce5803dd9c
Disable an odd bit of code from a long time ago that fitting max group fitting restrictions to be bypassed ( #1278 )
2017-09-22 02:33:46 -04:00
blitzmann
821ede8579
Do the same thing for damage patterns as we did for character for global setting
2017-09-22 02:08:53 -04:00
blitzmann
592f9a2298
Trigger a recalc on fit switching if the characters are not the same and the global character flag is set.
2017-09-22 02:01:27 -04:00
blitzmann
c30c07b91c
fix tox stuff
2017-09-21 21:21:14 -04:00
Ryan Holmes
73d9dd60e6
Don't return None as a price, always return a float ( #1291 ) ( #1292 )
2017-09-21 21:13:05 -04:00
blitzmann
dbdbe155f3
Merge branch 'feature/evemarketdata' into development
2017-09-21 21:12:42 -04:00
blitzmann
7d41260863
Break out market sources into their own classes and register them onto the price service. Create preference option to select which source user wants. Default to eve central
2017-09-21 20:50:37 -04:00
blitzmann
d53ff0f502
Add preliminary support for eve market data
2017-09-21 00:10:33 -04:00
Ryan Holmes
f37f4573bf
Add missing effect ( #1290 )
2017-09-20 00:11:32 -04:00
