blitzmann
82e3db1ffb
Centralize version string getting. Still trying to work out how we should handle automatic version increments so we don't have to modify files all the time. Remove version file from repo (should only be a thing when building binaries)
2018-02-17 11:10:42 -05:00
blitzmann
e779bb84e2
Fix for #1383 . Due to the changed mechanics of None in py3, getModifiedItemAttr was defaulted to 0 instead of None. This adds an explicit default of None when trying to find the allowed drone group attribute
2018-02-17 10:53:29 -05:00
blitzmann
0456cb2f96
Merge remote-tracking branch 'origin/master' into test-3
2018-02-16 22:26:10 -05:00
blitzmann
cafd92f169
add a todo
2018-02-16 22:26:02 -05:00
blitzmann
05f08970c9
fix character editor not spawning on OSX
2018-02-16 20:40:51 -05:00
Ryan Holmes
f66485c48a
Merge pull request #1396 from pyfa-org/bug/citadels
...
Bug/citadels
2018-02-16 17:42:50 -05:00
Ryan Holmes
2153c05183
Merge branch 'master' into bug/citadels
2018-02-16 17:42:03 -05:00
blitzmann
f66c36e42b
disable tests preventing branch from passing tox
2018-02-16 17:32:45 -05:00
DarkPhoenix
8771de9c1f
Fix retribution rof effect
2018-02-16 23:03:51 +03:00
blitzmann
fa3cf90421
add / update effects for citadels
2018-02-16 00:44:26 -05:00
blitzmann
636ee1de23
Get new Standup fighters working
2018-02-15 22:26:42 -05:00
blitzmann
b36bf8fb21
Fix issue restricting structure modules from fitting onto a structure
2018-02-15 21:03:25 -05:00
blitzmann
55ad52919e
Add missing Ishkur effect (drone tracking)
2018-02-15 20:09:50 -05:00
blitzmann
0648feaa7b
Handle a couple of group renamings
2018-02-15 20:07:57 -05:00
blitzmann
e16ae88ed9
Fix the item diff script not looking at all items needed
2018-02-15 20:07:06 -05:00
blitzmann
da0f89ef91
Merge commit 'refs/tags/v1.35.0^{}' into test-3
2018-02-14 22:25:45 -05:00
blitzmann
efc3f1ba7d
Don't display console for windows application
2018-02-14 22:23:42 -05:00
Ryan Holmes
8d7f0b56f1
Merge pull request #1382 from pyfa-org/release/v1.35.0
...
Release/v1.35.0
2018-02-14 22:19:46 -05:00
blitzmann
89b6e8f8c3
fix tox stuff
2018-02-14 22:15:48 -05:00
blitzmann
c6e715aa5c
Merge branch 'master' into test-3
2018-02-14 22:07:33 -05:00
blitzmann
0e93136157
Merge branch 'release/v1.35.0'
2018-02-14 22:07:20 -05:00
blitzmann
89c84aac96
update effect headers, add some icons, update DB to final 1248987
2018-02-14 22:05:55 -05:00
blitzmann
649ba9f3e4
Merge branch 'master' into singularity
2018-02-14 21:31:54 -05:00
blitzmann
2d38fd4773
Update to tq
2018-02-14 01:30:24 -05:00
blitzmann
23f0f48c80
Use a special dev database for py3 branch
2018-02-14 01:16:49 -05:00
Ryan Holmes
6254fa3e23
Merge pull request #1380 from pyfa-org/bug/1377
...
Add stacking penalties to dromi fighters
2018-02-12 23:35:40 -05:00
blitzmann
8686c02b1f
Add stacking penalties to dromi fighters
2018-02-12 23:33:16 -05:00
blitzmann
33618f12f7
Fix issue when error happens before wx is even initialized traceback is never set
2018-02-11 23:22:37 -05:00
blitzmann
5f0ce58c29
Merge branch 'master' into test-3
...
# Conflicts:
# gui/builtinShipBrowser/fitItem.py
# service/port.py
2018-02-11 21:29:17 -05:00
blitzmann
c329f5eeb8
Bump up the wxPython requirement to 4.0.1
2018-02-11 21:22:35 -05:00
blitzmann
320a0230f4
fix version data file in mac spec file
2018-02-11 12:32:34 -05:00
blitzmann
d94d49f0a9
Add misc column to booster panel, and show booster duration
2018-02-10 20:45:26 -05:00
Ryan Holmes
9bfc5b35b6
Merge pull request #1378 from pyfa-org/bug/1377
...
Fix for #1377 - group up support fighters and modify the bonus based …
2018-02-10 14:14:57 -05:00
blitzmann
0f30ea554d
Fix for #1377 - group up support fighters and modify the bonus based on amount active
2018-02-10 14:14:31 -05:00
blitzmann
50dd74dbe8
Add packaging requirement, and use it's PEP 440 version parsing for version comparisons.
2018-02-10 00:59:25 -05:00
blitzmann
9c355d8f96
update requirements
2018-02-09 18:53:14 -05:00
Ryan Holmes
f81179db4b
Merge pull request #1374 from pyfa-org/bug/1355
...
Fix for #1355 - we were not properly deleting the fit from the list b…
2018-02-06 00:37:56 -05:00
blitzmann
2d7eed4aac
Fix for #1355 - we were not properly deleting the fit from the list being passed into the Import event (which the history functionality piggy backs on). This also fixes the same bug with the import list.
2018-02-06 00:36:57 -05:00
blitzmann
96828a5611
Add assualt damage control effect
2018-02-05 23:12:58 -05:00
blitzmann
8a0f8ae609
Add module renames from singularity
2018-02-05 22:52:24 -05:00
Ryan Holmes
ac8f805fcb
Merge pull request #1373 from pyfa-org/bug/1372
...
Add stacking penalty to Fighter's MWD ability
2018-02-05 22:46:37 -05:00
blitzmann
9f3c2ca7a8
Add stacking penalty to Fighter's MWD ability
2018-02-05 22:34:25 -05:00
blitzmann
2e8d7d3610
add markdown2 to requirements.txt
2018-02-01 23:09:08 -05:00
blitzmann
3179016aed
Enhance the update modal to show a web view with html-rendered markdown of release ntoes
2018-02-01 21:58:29 -05:00
Ryan Holmes
514db91d7a
Merge pull request #1367 from burnsypet/issue-1360
...
Remove energy warfare resistance on capNeed calc
2018-01-31 23:50:44 -05:00
Ryan Holmes
269d3f326d
Update ISSUE_TEMPLATE.md
2018-01-31 23:10:27 -05:00
Ryan Holmes
b04fcb0d15
Merge pull request #1366 from burnsypet/issue-1362
...
Include service modules in EFT export
2018-01-31 22:59:44 -05:00
blitzmann
a29b3da8a6
Update DB and effects
2018-01-30 00:05:11 -05:00
blitzmann
18a5e35e80
Merge commit 'refs/tags/v1.34.0^{}' into singularity
...
# Conflicts:
# eve.db
# gui/builtinViewColumns/misc.py
2018-01-29 23:34:24 -05:00
burnsypet
3072dbb3ff
Remove energy warfare resistance on capNeed calc
...
When calculating the capactitor need of an energy nosferatu the
amount was being modified incorrectly by the energy warfare
resistance of the ship. Change to only apply energy warfare
resitance modifier if this is a projected effect.
2018-01-26 14:48:35 +00:00
