blitzmann
|
48f96a7a32
|
Merge branch 'master' into wx3
Conflicts:
config.py
staticdata/icons/icon01_08.png
staticdata/icons/icon02_11.png
staticdata/icons/icon105_46.png
staticdata/icons/icon105_47.png
staticdata/icons/icon105_48.png
staticdata/icons/icon105_49.png
staticdata/icons/icon108_5.png
staticdata/icons/icon113_64_1.png
staticdata/icons/icon113_64_2.png
staticdata/icons/icon113_64_3.png
staticdata/icons/icon34_16.png
staticdata/icons/iconMarketIcon_16px_Amarr.png
staticdata/icons/iconMarketIcon_16px_Caldari.png
staticdata/icons/iconMarketIcon_16px_Gallente.png
staticdata/icons/iconMarketIcon_16px_Minmatar.png
|
2015-08-15 10:50:58 -04:00 |
|
DarkPhoenix
|
121a81ce70
|
Remove few debugging prints
|
2015-08-11 15:59:38 +03:00 |
|
blitzmann
|
c2ca5dffe8
|
Fix incorrect bitmap rendering of OSX-wx3. MacSetTheme was removed, but it's still required for 2.8 otherwise we get an off-color background
|
2015-08-04 23:48:31 -04:00 |
|
blitzmann
|
ab7bbcb6ef
|
Remove matplotlib's font cache. Fixes #234
|
2015-08-04 22:18:28 -04:00 |
|
blitzmann
|
e5e7311748
|
Revert "Fix preferenceDialog list view width" and actually fix it. OS X untested
This reverts commit 9ba3ca3f5f.
|
2015-07-26 19:34:42 -04:00 |
|
blitzmann
|
9ba3ca3f5f
|
Fix preferenceDialog list view width
|
2015-07-26 19:19:53 -04:00 |
|
Ryan Holmes
|
01db1efdf7
|
Merge pull request #336 from blitzmann/regSkills
Register skills when applying ship bonuses
|
2015-07-23 15:58:07 -04:00 |
|
blitzmann
|
2f246d0897
|
Add context menu to affected by list
|
2015-07-23 15:32:27 -04:00 |
|
blitzmann
|
cd0b0eada0
|
Fix graphing
|
2015-07-22 13:12:57 -04:00 |
|
blitzmann
|
e12b3f3054
|
Merge tag 'v1.13.2' into wx3
Conflicts:
config.py
A lot of icons
|
2015-07-20 13:21:00 -04:00 |
|
blitzmann
|
b32f76cfde
|
Show affecting skills for charges as well
|
2015-07-19 16:39:07 -04:00 |
|
blitzmann
|
182104a010
|
Fix #109
|
2015-07-19 16:20:42 -04:00 |
|
blitzmann
|
ac08b1b264
|
Add check for current skill level
|
2015-07-19 15:16:29 -04:00 |
|
blitzmann
|
f17d015ebe
|
Fix having multiple skills in skill list (happens when multiple attributes are modified)
|
2015-07-19 15:02:50 -04:00 |
|
blitzmann
|
d496637614
|
Add ship skill bonuses to modified modules. Modify effect files for new skill parameter. Enable affecting skill menu.
|
2015-07-19 14:19:24 -04:00 |
|
blitzmann
|
4596c526a2
|
Fix #335 - properly represent charge modifiers
|
2015-07-18 23:39:16 -04:00 |
|
blitzmann
|
9941b6c74b
|
Make default view module again
|
2015-07-18 15:23:10 -04:00 |
|
blitzmann
|
b06ce24d4a
|
Fix attribute view items (two of the same item would merge into one, even if they had different modifiers. now simply list them individually)
|
2015-07-18 15:20:15 -04:00 |
|
blitzmann
|
2f8c201ab3
|
Add attribute view
|
2015-07-18 14:45:26 -04:00 |
|
blitzmann
|
d184820728
|
Fix toggle attribute names. Previous way assumed no other trees apart from first child and siblings. Not true now with projected fit trees. Instead of attempting to walk the tree, we simply store the items in a list that we later iterate over. Much easier
|
2015-07-17 18:28:31 -04:00 |
|
blitzmann
|
40aeb1ed4a
|
Move active fir to init, fixes bug when refreshing with another active fit
|
2015-07-17 16:33:07 -04:00 |
|
blitzmann
|
d6199a58c2
|
Separate projected fits from list of affectors. Also, show when affected module is projected. Still need to clean up affector tree stuff
|
2015-07-16 23:59:37 -04:00 |
|
blitzmann
|
28a5318e3b
|
Merge branch 'master' into toggleProjectionFit
Conflicts:
config.py
|
2015-07-10 16:09:00 -04:00 |
|
blitzmann
|
c17e03d8d0
|
Fixes critical design issue when it comes to projected fits. Disabled some of the more advanced functionality (projection amount and active) to cope to development. Crash still happens occasionally when adding projected fit for unknown reasons - not 100% reproducable yet
|
2015-07-09 17:53:41 -04:00 |
|
blitzmann
|
1f82465a65
|
Return None for price column on ship modes, fixes #322
|
2015-07-09 12:13:13 -04:00 |
|
Ryan Holmes
|
e042a21d32
|
Merge pull request #315 from lunedis/resistmultiplier
Showing Resist Multiplier in Tooltip
|
2015-07-07 14:42:50 -04:00 |
|
Kalu
|
8a22907940
|
newline in resist multiplier tooltip and explanation
|
2015-07-07 20:38:27 +02:00 |
|
Kalu
|
a97847e644
|
show rr factor in tooltip
|
2015-07-07 20:38:16 +02:00 |
|
blitzmann
|
23309a5da6
|
Remove unneeded code that created a bitmap for checkboxes
|
2015-07-07 13:49:40 -04:00 |
|
blitzmann
|
06e4a7e80f
|
Support changing amount of projected fits
|
2015-07-07 13:49:39 -04:00 |
|
blitzmann
|
b95a10d284
|
Add active column. Looping the fit to apply it x amount of times doesn't seem to work. Probably because it's been flagged calculated and returns early
|
2015-07-07 13:49:38 -04:00 |
|
blitzmann
|
2bca3ddcc8
|
GUI support (also made regular checkboxes pretty for drones/implant/etc)
|
2015-07-07 13:49:37 -04:00 |
|
blitzmann
|
5e56107582
|
Revert changes to minimum / default sizes of splitter windows
|
2015-07-07 13:28:02 -04:00 |
|
DarkPhoenix
|
0521d242eb
|
Make sure bitmap loader searches for proper file (w/o EVE embedfs-specific path and extension)
|
2015-07-06 11:31:02 +03:00 |
|
blitzmann
|
1b5e0467fc
|
Save browser sizes
|
2015-07-05 13:59:18 -04:00 |
|
Ryan Holmes
|
a339ae1c55
|
Merge pull request #312 from blitzmann/dbCorruption
Fixes for database rot
|
2015-07-05 13:08:11 -04:00 |
|
blitzmann
|
41b8db346f
|
Fix broken drone drag
|
2015-07-05 01:16:53 -04:00 |
|
blitzmann
|
8c90b3132b
|
Use lunedis's method and apply it to additions pane, cleans up code
|
2015-07-04 01:38:11 -04:00 |
|
blitzmann
|
1326e21f6b
|
Fix IndexError when selecting module index that doesn't exist. Also, tweaked setting the selItem variable.
|
2015-07-04 01:27:57 -04:00 |
|
blitzmann
|
bfdc2161e0
|
Add shortcut cues as toggle in prefs
|
2015-07-04 00:52:44 -04:00 |
|
blitzmann
|
9ab79af70c
|
Show shortcut values in market list
|
2015-07-04 00:44:19 -04:00 |
|
Ryan Holmes
|
f0de2000bf
|
Merge pull request #313 from lunedis/quickfit
Quickly fitting modules using ALT+1-9
|
2015-07-04 00:34:43 -04:00 |
|
Kalu
|
51fed996f1
|
refactor quickfit shortcuts with list
|
2015-07-03 23:43:04 +02:00 |
|
Kalu
|
f6bbc6c410
|
Implemented using Alt+1-5 for quickly fitting modules, see issue #183
|
2015-07-03 23:42:54 +02:00 |
|
blitzmann
|
de71123a48
|
Merge branch 'pricing'
|
2015-07-03 02:38:23 -04:00 |
|
blitzmann
|
874cf4ef0a
|
Use old price information if update fails. Add "(!)" to show that price is out of date
|
2015-07-03 02:37:52 -04:00 |
|
blitzmann
|
539360d5f6
|
Remove old debug print
|
2015-07-02 15:04:07 -04:00 |
|
blitzmann
|
5372f31be8
|
Revert "Revert "Merge branch 'master' into wx3"". So many reverts.
This reverts commit cca7f1112a.
|
2015-06-27 21:53:59 -04:00 |
|
blitzmann
|
6d01877d78
|
Merge branch 'master' into wx3
Conflicts:
pyfa.py
|
2015-06-27 19:33:12 -04:00 |
|
blitzmann
|
646f3afd27
|
Fixed oversights
|
2015-06-27 19:32:21 -04:00 |
|