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 |
|
blitzmann
|
4111d670a7
|
Fix possible issue with floats coming through (see #729)
|
2017-01-26 23:52:18 -05:00 |
|
blitzman
|
57edc32a4b
|
Clean up new tactical mode stats stuff
(cherry picked from commit c9bc234)
|
2016-12-14 12:21:00 -08:00 |
|
Ebag333
|
b529a28715
|
Implement fittingMode
(cherry picked from commit 5eb2fef)
|
2016-12-14 12:18:34 -08:00 |
|
Ebag333
|
e3b592977a
|
Make some imports more explicit
|
2016-12-13 23:49:37 -08:00 |
|
Ebag333
|
28404cd8bb
|
bajillion pep8 fixes to pass tox
|
2016-12-13 23:31:39 -08:00 |
|
a-tal
|
ab9c925c47
|
non-standard - use forces coding declarations
(cherry picked from commit 6e17d88)
|
2016-12-13 20:17:56 -08:00 |
|
a-tal
|
d3b6bc1c93
|
so many pep8 fixes
(cherry picked from commit bee125d)
|
2016-12-13 20:16:44 -08:00 |
|
blitzman
|
c9bc2341d1
|
Clean up new tactical mode stats stuff
|
2016-12-10 02:04:51 -05:00 |
|
Ebag333
|
5eb2fef89c
|
Implement fittingMode
|
2016-12-08 18:56:43 -08:00 |
|
Ebag333
|
510492e5e9
|
More refactoring, elimited another recursive import
|
2016-12-03 17:12:16 -08:00 |
|
Ebag333
|
6ef57e735e
|
Missed imports. Fixed now.
|
2016-12-03 06:21:52 -08:00 |
|
Ebag333
|
d963327ed4
|
Make it run again
|
2016-12-02 03:13:54 -08:00 |
|
blitzman
|
c5b78c20e5
|
Do not allow projection to citadels
|
2016-08-28 20:00:46 -04:00 |
|
blitzmann
|
4d158d99fd
|
Fix crash related to structure rigs not having meta level, and a traceback that might happen occasionally.
|
2016-07-05 23:23:55 -04:00 |
|
blitzmann
|
72e77d2264
|
Fix some wording
|
2016-07-04 11:05:50 -04:00 |
|
blitzmann
|
10c79ac812
|
More work on restrictions
|
2016-07-04 11:01:08 -04:00 |
|
blitzmann
|
6e2878194c
|
Merge branch 'master' into citadel
Conflicts:
config.py
service/market.py
|
2016-07-03 01:10:26 -04:00 |
|
blitzmann
|
10f51b41b7
|
Fix context menu with structure modules (no meta information), add citadel icons.
|
2016-05-15 19:16:51 -04:00 |
|
blitzmann
|
d71b05095d
|
Clean up
|
2016-05-15 12:43:24 -04:00 |
|
blitzmann
|
d061a13b58
|
Move ID pool to context menu class rather than individual menu items
|
2016-05-15 12:18:56 -04:00 |
|
blitzmann
|
5176cc3b06
|
Testing a new way of generating context menu id's
|
2016-05-15 02:35:35 -04:00 |
|
blitzmann
|
d416124081
|
Implemented projected fighters, and various fighter bugfixes / improvements
|
2016-04-30 19:52:13 -04:00 |
|
blitzmann
|
ed6f00a893
|
Added column for fighter abilities, fixed some fighter bugs, added some context menus to them
|
2016-04-28 00:29:25 -04:00 |
|
blitzmann
|
43f69bb184
|
Only show fighter abilites which have been implemented.
|
2016-04-21 22:20:53 -04:00 |
|
blitzmann
|
708425c67a
|
Toggle fighter abilities in fighter context menu
|
2016-04-17 02:16:58 -04:00 |
|
blitzmann
|
e7118f637c
|
Merge branch 'charImplants' into singularity
# Conflicts:
# eos/db/saveddata/fit.py
# gui/builtinContextMenus/itemStats.py
|
2016-04-12 20:16:53 -04:00 |
|
blitzmann
|
3177713447
|
Add preliminary (database/gui) fighter support. No effects / calculations.
|
2016-04-04 23:32:03 -04:00 |
|
blitzmann
|
94f73241ea
|
Implement implant set application in character implants.
|
2016-03-20 23:45:42 -04:00 |
|
blitzmann
|
d4632b9059
|
Add context menu to apply implant set to fit
|
2016-03-20 22:28:18 -04:00 |
|
aacn500
|
f8d7b68289
|
Fix "Change charge skills" showing module skills
|
2016-03-20 22:56:27 +00:00 |
|
blitzmann
|
443c917c6b
|
Get context menus working for character implants
|
2016-03-19 18:23:34 -04:00 |
|
blitzmann
|
0124f63d9a
|
Fix amount change dialog for os x
|
2015-11-08 12:44:32 -05:00 |
|
blitzmann
|
0f8992432b
|
Merge branch 'master' into wx3
Conflicts:
gui/characterEditor.py
|
2015-09-26 18:53:28 -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
|
bd53785667
|
Allow all 5 and 0 to change skills from affecting skill menu
|
2015-09-14 20:35:36 -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 |
|
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 |
|
DarkPhoenix
|
121a81ce70
|
Remove few debugging prints
|
2015-08-11 15:59:38 +03: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
|
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 |
|