blitzmann
b6a28ae15f
Merge branch 'master' into development
...
Conflicts:
config.py
2017-06-25 01:23:08 -04:00
Ryan Holmes
94256876e4
Add tooltip for alpha clones to explain functionality ( #1227 )
...
See #1219
2017-06-08 22:13:46 -04:00
Ryan Holmes
d319b74d7a
Fix exception when double clicking CREST fit browser hull ( #1226 )
2017-06-08 21:58:20 -04:00
blitzmann
f77cd0b834
Merge branch 'master' into development
2017-06-01 00:32:06 -04:00
Ryan Holmes
45c3533501
Make some extra logging statements and stuff to troubleshoot fit deletion bugs ( #1199 )
2017-05-30 22:57:52 -04:00
Michael Ryan
46f61ecfa3
address travis errors
2017-05-30 21:07:02 -05:00
Michael Ryan
d09f21fe15
updated drag and drop behavior to not trigger a suspected wx bug on Mac
2017-05-30 20:18:32 -05:00
petosorus
33410f0618
Formatting
2017-05-30 15:51:48 +02:00
petosorus
2c98baade8
Price options labels + total computing in minimal
2017-05-29 15:24:21 +02:00
petosorus
380f90d065
Price options in context menu
2017-05-24 17:30:55 +02:00
petosorus
1781c6dcf0
total computation + settings
2017-05-24 16:27:32 +02:00
Ryan Holmes
cff3d0ee95
Don't process removeModule is ctrl / cmd key is active ( #1190 )
2017-05-22 01:50:13 -04:00
Ryan Holmes
18554e3186
Fix a bunch of item swapping mechanisms (see #1186 ) ( #1187 )
2017-05-21 20:31:12 -04:00
blitzmann
fbf455c9fe
Fix for fighter prices ( #1178 )
2017-05-18 22:28:09 -04:00
blitzmann
00dcda6fad
Check if projected / command thing actually exist before attempting to remove it
2017-05-18 22:22:02 -04:00
Ryan Holmes
65f71b6f6b
Fix exception with character implants, and don't show implant set menu if there aren't any ( #1172 )
2017-05-15 22:59:47 -04:00
Ryan Holmes
6344f7a975
Merge branch 'master' into bug/char_fixes
2017-05-14 22:56:34 -04:00
blitzmann
bff44c46f8
Fix character list sorting ( https://forums.eveonline.com/default.aspx?g=posts&m=6940327#post6940327 )
2017-05-14 22:44:02 -04:00
Ryan Holmes
da33a372cb
Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. ( #1168 )
2017-05-14 20:52:06 -04:00
blitzmann
79445225de
fix issue with market shortcuts if not active items are present
2017-05-14 02:21:23 -04:00
blitzmann
3b23c9eacd
flake8
2017-05-14 01:41:15 -04:00
blitzmann
d4ce1ef3db
Fix issue with Delete key event on t3d mode causing exception ( #1160 ). Additionally, work around the fact that every module that is removed also recalculates the fit, allowing for a faster response time when deleting multiple modules at a time. This is somewhat ugly as the removeModule function was originally based on the assumption of removing only one module. Should clean it up at some point.
2017-05-14 01:37:49 -04:00
blitzmann
ffe840e245
Fix for #1161 . Can't reproduce, but I'm unsure what the root cause is (probably something firing in the wrong order). 9be4ae may also alleviate the root cause.
2017-05-13 23:28:51 -04:00
blitzmann
2e3c3e92f1
Fix for a possible bug (see comments in #1147 ).
2017-05-13 23:28:50 -04:00
blitzmann
c68739d78c
Move the FitRemoved event before the stage selected events. Otherwise, if the stage is selected first and the FitItem (self) is deleted before the FitRemoved is done, we get an error about how self is not valid anymore
2017-05-13 23:28:49 -04:00
Ryan Holmes
9f5e14fe2d
Bugfixes and bump point release ( #1159 )
...
* Add some logging to try to figure out what happens with #1149 , along with some other fixes
* Bump point release
2017-05-11 20:53:37 -04:00
Ryan Holmes
25bfb4ddb8
Fox for issue #1152 - unicode characters in entity names ( #1153 )
2017-05-10 22:36:10 -04:00
Ryan Holmes
de9b167242
Bump version and include fix for #1147 ( #1150 )
...
* bump dev
* Fix two issues with deleting fits (#1147 )
2017-05-10 18:48:33 -04:00
blitzmann
e2de1565bf
Forgot to add notes to the import fit list. Caused break. Very bad.
2017-05-09 20:59:11 -04:00
blitzmann
2595c59c73
Fix issue in which character editor did not display skill level update when changed from skill search results
2017-05-09 19:57:59 -04:00
blitzmann
a6a153b703
Update database, add missing renders, fix bug with not being able to add citadel modules, and fix bug associated with engineering complex properties (debug info, don't care about it)
2017-05-09 18:52:32 -04:00
blitzmann
4d8c9e0522
Fix floats in skill tree, and fix typo - apparently I can't spell dependents x_x
2017-05-08 22:49:37 -04:00
blitzmann
e75e2b7605
Bad isinstance() for skill search... I feel like I've fixed this 3 times now???
2017-05-08 22:40:12 -04:00
blitzmann
0e81c985a3
Fix bad index for fit notes which causes exception on recent fits
2017-05-08 22:38:18 -04:00
blitzmann
21a071ea40
Add "remove" context menu to command fits
2017-05-08 22:34:03 -04:00
blitzmann
4f1e7697ed
Fix issue in which "Open Fit" was showing on the command view, not the command fit, potentially causing an error
2017-05-08 22:29:50 -04:00
blitzmann
3de63c5ca5
flake8 fixes
2017-05-08 21:32:13 -04:00
blitzmann
dd09b3d951
Add fitting notes to the ship browser tooltips
2017-05-08 19:20:30 -04:00
blitzmann
6b22bd189a
Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
...
Conflicts:
eos/config.py
gui/notesView.py
service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
83a7a854bb
Merge branch 'feature/recent' into dev
...
Conflicts:
eos/db/saveddata/character.py
eos/db/saveddata/fit.py
Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
1604ea1f2c
Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities.
2017-05-07 02:02:54 -04:00
blitzmann
4a9662c0f7
Merge branch 'feature/skill-filter' into dev
...
Conflicts:
gui/characterEditor.py
This implements a long-requested feature to be able to search skills in the character editor
2017-05-06 13:25:20 -04:00
blitzmann
47a683c44c
Merge branch 'feature/strictSkills' into dev
...
Conflicts:
service/character.py
Implements strict skill requirement handling
2017-05-06 13:13:50 -04:00
blitzmann
d888982657
Merge branch 'bug/market-fit-none' into dev
2017-05-06 13:11:26 -04:00
blitzmann
703d6dbc85
Merge branch 'feature/grant-needed-skills' into dev
2017-05-06 13:09:30 -04:00
blitzmann
2e6066e848
Merge branch 'feature/tabbed-fits' into dev
2017-05-06 13:08:52 -04:00
blitzmann
f751eff1cf
Fix some styling issues on linux
2017-05-06 12:57:20 -04:00
blitzmann
d342e66db4
Merge branch 'feature/sec-status-change' into dev
...
Add ability to change characters sec status
2017-05-06 12:23:40 -04:00
blitzmann
1222567a4f
Merge branch 'feature/allow-restrictions' into dev.
...
Allows user to turn off most fitting restrictions (#1117 )
2017-05-06 12:11:00 -04:00
blitzmann
1f7858f853
Merge branch 'bug/resist-effects' (also includes current work on sisi branch).
...
This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
