blitzmann
|
0f8992432b
|
Merge branch 'master' into wx3
Conflicts:
gui/characterEditor.py
|
2015-09-26 18:53:28 -04:00 |
|
blitzmann
|
c751544560
|
Do not show level change menu for All 5/0 in char editor
|
2015-09-25 12:56:40 -04:00 |
|
blitzmann
|
1d51e86c1c
|
Added individual skill save to context menu
|
2015-09-25 12:16:11 -04:00 |
|
blitzmann
|
05b9d1e607
|
Fixed some bugs, added character action buttons on editor
|
2015-09-25 12:13:17 -04:00 |
|
blitzmann
|
2a88e3114b
|
Skill color goes back to normal when saving/reverting skill.
|
2015-09-25 11:15:08 -04:00 |
|
blitzmann
|
a0f9fb6ad6
|
Enable/disable edit menu options, and add color to character editor to show which skills are edited
|
2015-09-24 22:11:31 -04:00 |
|
blitzmann
|
b844bdf986
|
Add save character as dialog
|
2015-09-24 20:46:07 -04:00 |
|
blitzmann
|
61614553a2
|
Fix bug with char copy, and added char revert and save as (unfinished)
|
2015-09-24 19:03:30 -04:00 |
|
blitzmann
|
e9d02ce4c8
|
Change to use BitmapLoader class
|
2015-09-24 12:21:50 -04:00 |
|
blitzmann
|
ec6914d4aa
|
Bitmap Loader is now a proper class, and can be used to load images from zipfile
|
2015-09-24 12:18:33 -04:00 |
|
blitzmann
|
474f270b26
|
Change to new icon locations
|
2015-09-24 12:17:17 -04:00 |
|
blitzmann
|
fb7574e476
|
Remove extra location stuff from bitmap loader
|
2015-09-24 11:45:24 -04:00 |
|
blitzmann
|
3ea4439b8d
|
Allow changing all 5 and 0 from editor
|
2015-09-18 11:59:52 -04:00 |
|
blitzmann
|
bd53785667
|
Allow all 5 and 0 to change skills from affecting skill menu
|
2015-09-14 20:35:36 -04:00 |
|
blitzmann
|
f2b4400834
|
Do auto-save when editing in character editor.
|
2015-09-14 20:30:12 -04:00 |
|
blitzmann
|
89c011d37e
|
Minor modifications.
|
2015-09-12 10:30:51 -04:00 |
|
blitzmann
|
ca34217f3b
|
Added character saving.
Deleting characters is broken for now due to using wrong session, but I believe creating character works. Further tests needed
|
2015-09-09 20:33:15 -04:00 |
|
blitzmann
|
b162927f79
|
Merge branch 'master' into wx3
|
2015-08-27 22:05:38 -04:00 |
|
blitzmann
|
6e95f69565
|
Support speedLimit introduced with Entosis Link
|
2015-08-25 17:26:25 -04:00 |
|
blitzmann
|
cda8dd4c8b
|
Windows skel has an issue with this, so if there is an issue, use default path to cache file.
|
2015-08-21 19:04:42 -04:00 |
|
Will Wykeham
|
2904ab6afa
|
Non-windows platform fix for variations menu
|
2015-08-18 15:59:02 +01:00 |
|
Will Wykeham
|
c763595cc4
|
Remove debug print statement
|
2015-08-17 15:41:58 +01:00 |
|
Will Wykeham
|
8fe97180ed
|
Sort higher metalevel items properly in variations menu
|
2015-08-16 21:56:39 +01:00 |
|
Will Wykeham
|
6a4b2ffe69
|
Make variations menu handle multiple selections
Ensure the variations menu only shows when you've got
a matching set of items selected.
|
2015-08-16 21:45:20 +01:00 |
|
Will Wykeham
|
7f100353e2
|
Make variations menu actually swap out module
Functional, but not handling multiple selections well
|
2015-08-16 18:30:27 +01:00 |
|
Will Wykeham
|
97ac0804c5
|
Add Submenu of variations of module type.
Non functional so far.
|
2015-08-15 19:35:31 +01:00 |
|
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 |
|