blitzmann
|
b1729095a0
|
Export fitting to EVE, fix json bugs, and include forgotten CREST service.
|
2015-10-18 17:13:19 -04:00 |
|
blitzmann
|
23dbb59f3f
|
Couple fixes
|
2015-10-18 01:46:41 -04:00 |
|
blitzmann
|
9269c54434
|
Implement exporting in CREST format
|
2015-10-18 01:33:39 -04:00 |
|
blitzmann
|
c4246c0d50
|
Added CREST service and first pass of fitting resource browsing. I want to completely rework this eventually, but right now just focused on getting a rough draft going.
|
2015-10-18 00:21:01 -04:00 |
|
blitzmann
|
a33ec89e87
|
Fix issue that caused fits that were supposed to open in the background to calculate. Unfortunately this fix breaks the tab snapshot, will have to figure that out later
|
2015-10-09 18:32:03 -04:00 |
|
blitzmann
|
072fac4259
|
Merge branch 'master' into wx3
|
2015-09-29 21:35:44 -04:00 |
|
blitzmann
|
37b158439d
|
Fix #359
|
2015-09-28 20:32:55 -04:00 |
|
blitzmann
|
0f8992432b
|
Merge branch 'master' into wx3
Conflicts:
gui/characterEditor.py
|
2015-09-26 18:53:28 -04:00 |
|
blitzmann
|
dc55dbdf36
|
Polish some events
|
2015-09-25 14:48:05 -04:00 |
|
blitzmann
|
1d51e86c1c
|
Added individual skill save to context menu
|
2015-09-25 12:16:11 -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
|
ae870f9535
|
Merge branch 'newTempChar'
|
2015-09-24 17:16:14 -04:00 |
|
blitzmann
|
a08bb2494b
|
Fix system effect states
|
2015-09-22 21:45:32 -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
|
9ae5cfbab2
|
Revert "Fix API stuff. This should theoretically work, but it's untested."
This reverts commit 1402ceec63.
|
2015-09-13 16:57:22 -04:00 |
|
blitzmann
|
045031e8ae
|
Revert "Fix character rename, delete, and copy."
This reverts commit c72f049ccd.
Conflicts:
service/character.py
|
2015-09-13 16:55:32 -04:00 |
|
blitzmann
|
1584586fd2
|
Try a different approach to temp skill levels
|
2015-09-13 16:51:36 -04:00 |
|
blitzmann
|
1402ceec63
|
Fix API stuff. This should theoretically work, but it's untested.
|
2015-09-12 13:15:59 -04:00 |
|
blitzmann
|
0b9cdaa944
|
Change the way skills are loaded. We now load all skills when character is created, instead of just creating character and loading skills on demand. This fixes a bug in which new characters were not saving their skills to the database.
|
2015-09-12 10:59:44 -04:00 |
|
blitzmann
|
89c011d37e
|
Minor modifications.
|
2015-09-12 10:30:51 -04:00 |
|
blitzmann
|
c72f049ccd
|
Fix character rename, delete, and copy.
|
2015-09-09 23:12:59 -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 |
|
DarkPhoenix
|
31b1c94c0f
|
Add AT13 prize ships
|
2015-09-01 01:26:30 +03:00 |
|
blitzmann
|
b162927f79
|
Merge branch 'master' into wx3
|
2015-08-27 22:05:38 -04:00 |
|
blitzmann
|
aa5eb7ac92
|
Update DB, force Imp and Fiend as not published again (will publish these when they are live)
|
2015-08-27 21:49:06 -04:00 |
|
blitzmann
|
b2dce223b0
|
Add AT13 prizes
|
2015-08-25 17:42:34 -04: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 |
|
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 |
|
DarkPhoenix
|
f18ba6160a
|
Do 2 blank lines between cargo contents and the rest of the fit, and when exported with the implants - do cargo items after the implants
|
2015-08-08 13:36:16 +03:00 |
|
blitzmann
|
cc59612fa4
|
Debug logging when flag is set
|
2015-07-23 16:58:55 -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
|
e74e2615ad
|
Merge remote-tracking branch 'origin/projections'
|
2015-07-23 15:46:32 -04:00 |
|
blitzmann
|
9de3600d7f
|
Fix self-boosting
|
2015-07-23 01:38:51 -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
|
182104a010
|
Fix #109
|
2015-07-19 16:20:42 -04:00 |
|
blitzmann
|
f591ecba10
|
Fix use case where gang boosts were not being applied when projections were added/removed.
|
2015-07-14 16:15:52 -04:00 |
|
blitzmann
|
63fce4be17
|
Handle self projections by creating a copy of the fit. Due to the way effects are calculated, we would have double effects implemented if not for the copy
|
2015-07-11 16:28:09 -04:00 |
|
blitzmann
|
86ee5292d8
|
Fix fit copying and deleting fits not being reflected in other fits.
|
2015-07-11 12:43:47 -04:00 |
|
blitzmann
|
0060f58e3d
|
Support evemon character imports.
|
2015-07-11 10:17:02 -04:00 |
|
blitzmann
|
28a5318e3b
|
Merge branch 'master' into toggleProjectionFit
Conflicts:
config.py
|
2015-07-10 16:09:00 -04:00 |
|
blitzmann
|
4216904736
|
Remove function to remove projected fits correctly. This is now handled by proper DB relationships
|
2015-07-10 15:46:42 -04:00 |
|
blitzmann
|
496e9b56b5
|
Handle use case of invalid fit's mucking things up
|
2015-07-10 15:46:15 -04:00 |
|
blitzmann
|
68dddf2810
|
Fix for init projected fit. Took a long time to figure out what was happening.
|
2015-07-10 11:58:15 -04:00 |
|
blitzmann
|
221a3fde14
|
Being extra cautious
|
2015-07-09 18:18:36 -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 |
|