Ebag333
|
3b185e1bcb
|
Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers
|
2017-02-11 11:51:53 -08:00 |
|
Ebag333
|
f2c84692a9
|
Clean up a bunch of unused variables
|
2017-02-09 00:22:14 -08:00 |
|
Ebag333
|
6e524de320
|
Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt
|
2017-02-08 20:15:24 -08:00 |
|
blitzman
|
1d69ed7584
|
Merge branch 'test_import' into development
Conflicts:
gui/builtinContextMenus/amount.py
gui/characterEditor.py
gui/itemStats.py
|
2017-01-27 20:39:54 -05:00 |
|
blitzman
|
cbf7f7d320
|
Merge branch 'master' into development
|
2017-01-27 19:39:10 -05:00 |
|
blitzmann
|
397084a9ff
|
Disable rename and delete button for restricted character on character editor spawn (fix for #930)
|
2017-01-26 21:33:13 -05:00 |
|
Ebag333
|
28404cd8bb
|
bajillion pep8 fixes to pass tox
|
2016-12-13 23:31:39 -08:00 |
|
Ebag333
|
be53dedb18
|
Large pep8 compliance to make work for Tox
|
2016-12-13 21:23:01 -08:00 |
|
a-tal
|
d3b6bc1c93
|
so many pep8 fixes
(cherry picked from commit bee125d)
|
2016-12-13 20:16:44 -08:00 |
|
blitzman
|
a954759012
|
GUI implementation of alpha clone switching
|
2016-12-11 22:51:48 -05:00 |
|
Ebag333
|
d963327ed4
|
Make it run again
|
2016-12-02 03:13:54 -08:00 |
|
blitzmann
|
b9f0812b38
|
Fix issue with entity editor and wxPython 2.8
|
2016-06-28 23:24:01 -04:00 |
|
blitzmann
|
28ad32aad5
|
Fix Character Editor
|
2016-04-16 23:55:28 -04:00 |
|
blitzmann
|
a3d9d5cca8
|
Migrate character editor to use new entity editor.
|
2016-03-29 21:19:20 -04:00 |
|
blitzmann
|
94f73241ea
|
Implement implant set application in character implants.
|
2016-03-20 23:45:42 -04:00 |
|
blitzmann
|
c1653c5f2e
|
Abstract the implant editor to work with different sources
|
2016-03-20 12:26:37 -04:00 |
|
blitzmann
|
6f1872fb94
|
Disable implants for read-only characters
|
2016-03-19 22:10:09 -04:00 |
|
blitzmann
|
1ddd37f381
|
Enable implant searching.
|
2016-03-19 20:55:29 -04:00 |
|
blitzmann
|
f9d2a78c5e
|
Fix up styling for character implants and fitting window implant view
|
2016-03-19 19:30:42 -04:00 |
|
blitzmann
|
48b45b5f51
|
Merge branch 'master' into charImplants
# Conflicts:
# gui/characterEditor.py
|
2016-03-12 23:20:26 -05:00 |
|
blitzmann
|
4e509bbaee
|
Fix character editor crash on Windows by disallowing resizing. (#441)
|
2016-02-06 16:04:29 -05:00 |
|
blitzmann
|
7e305aab67
|
Revert "Tentative fix for character editor issues."
This reverts commit 253ebdc4e1.
|
2016-01-31 10:52:00 -05:00 |
|
blitzmann
|
55eed0d029
|
Revert "Fix Character Editor Dialog for osx"
This reverts commit 9fc31d6a55.
|
2016-01-31 10:51:45 -05:00 |
|
blitzmann
|
9fc31d6a55
|
Fix Character Editor Dialog for osx
|
2016-01-25 22:47:27 -05:00 |
|
blitzmann
|
253ebdc4e1
|
Tentative fix for character editor issues.
|
2016-01-25 21:10:20 -05:00 |
|
blitzmann
|
cbd2ed603f
|
Possible fix for character editor crash
|
2015-12-06 11:16:54 -05:00 |
|
blitzmann
|
938e2a871d
|
Merge branch 'master' into charImplants
Conflicts:
gui/characterEditor.py
|
2015-11-08 21:19:04 -05:00 |
|
blitzmann
|
2fadaa890b
|
fix save character as on os x
|
2015-11-08 13:52:53 -05:00 |
|
blitzmann
|
31bdb75c51
|
Added confirmation dialog when deleting character
|
2015-11-08 12:49:00 -05:00 |
|
blitzmann
|
09e0a0576c
|
MainFrame pointer was accidentally deleted from characterEditor.py, causing issues.
|
2015-11-03 19:21:45 -05:00 |
|
blitzmann
|
c436e0e669
|
Create a proper menu item toggle for overrides
|
2015-11-01 21:19:49 -05:00 |
|
blitzmann
|
b701acb275
|
Overrides work properly now. Currently toggled on/off by opening character editor, this will be taken over by a menu option
|
2015-11-01 13:02:29 -05:00 |
|
blitzmann
|
11cf4b356c
|
Correct GUI problem with character editor
|
2015-10-05 03:26:41 -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
|
5b5fdd97d6
|
Enable and fix market tree for character implant view
|
2015-09-25 13:59:37 -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
|
e9d02ce4c8
|
Change to use BitmapLoader class
|
2015-09-24 12:21:50 -04:00 |
|
blitzmann
|
474f270b26
|
Change to new icon locations
|
2015-09-24 12:17:17 -04:00 |
|
blitzmann
|
3ea4439b8d
|
Allow changing all 5 and 0 from editor
|
2015-09-18 11:59:52 -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
|
6d01877d78
|
Merge branch 'master' into wx3
Conflicts:
pyfa.py
|
2015-06-27 19:33:12 -04:00 |
|
blitzmann
|
98815f2b85
|
Fix #307 by moving menu code to spawn event
|
2015-06-27 18:18:43 -04:00 |
|
blitzmann
|
a4fe3fe142
|
Fix crash in character editor
|
2015-06-27 15:56:34 -04:00 |
|