blitzmann
|
30fe7930a9
|
Remove log spam
|
2017-07-11 01:10:55 -04:00 |
|
blitzmann
|
453054f6c7
|
Remove command fitting from the command fits context menu upon deletion (#1244)
|
2017-07-11 01:10:39 -04:00 |
|
blitzmann
|
231f9a91c2
|
Do not assume number of columns for damagePatterns, see #1238
|
2017-07-10 22:46:30 -04:00 |
|
blitzmann
|
c553790eaf
|
move the "generating effect" spam - doesn't need to happen every time the handler is called
|
2017-07-10 01:48:10 -04:00 |
|
blitzmann
|
f2e8506ea7
|
Merge remote-tracking branch 'origin/singularity' into development
|
2017-07-10 01:39:32 -04:00 |
|
Ryan Holmes
|
76b22dfe17
|
Merge pull request #1243 from wendazhou/singularity-fix-loki-effects
Fix loki effects
|
2017-07-10 01:39:16 -04:00 |
|
blitzmann
|
1202c335d9
|
Fix implant set clipboard import (#1237)
|
2017-07-10 00:28:22 -04:00 |
|
blitzmann
|
f70d671f1d
|
Fix implant set copy (#1236)
|
2017-07-10 00:21:52 -04:00 |
|
blitzmann
|
1305a1f2b6
|
Do not get variations by "group" unless the item is part of a set of hard-coded categories. #1232
|
2017-07-10 00:11:54 -04:00 |
|
blitzmann
|
f5108c34db
|
Do not kill the entire XML import if one fitting fails (#1231)
|
2017-07-09 19:08:46 -04:00 |
|
Ebag333
|
d553c60b65
|
Fix errors caused by importing a few "skinned" ships. Patch by ebag. See #1231
|
2017-07-09 19:08:06 -04:00 |
|
blitzmann
|
be84cf1db7
|
formatting
|
2017-07-09 18:59:07 -04:00 |
|
blitzmann
|
854d7cb09c
|
Rename "system effects" to "wormhole effects" (#1229)
|
2017-07-09 18:35:44 -04:00 |
|
blitzmann
|
b70f401a91
|
Merge branch 'qol/file-reorg' into development
|
2017-07-09 18:27:18 -04:00 |
|
blitzmann
|
496b28226d
|
Merge branch 'feature/booster-side-effects' into development
|
2017-07-09 18:26:38 -04:00 |
|
blitzmann
|
fec7c8fd0b
|
Merge branch 'singularity' into development
|
2017-07-09 18:26:28 -04:00 |
|
blitzmann
|
f8e5e15051
|
Fixed bug with meta swap context menu for subsystems
|
2017-07-09 15:08:59 -04:00 |
|
blitzmann
|
78b273455d
|
Fix up some effects
|
2017-07-09 14:44:57 -04:00 |
|
blitzmann
|
de35692666
|
Fix a few things with affected by tab (indentation issue, overwriting modifier incorrectly)
|
2017-07-09 13:18:28 -04:00 |
|
blitzmann
|
49b2e42d8c
|
Fix subsystem count, requires post processing of data from CCP when building the database... this may be fixed by the time it releases, but maybe not, and I don't want to forget about it
|
2017-07-09 12:17:07 -04:00 |
|
blitzmann
|
307ccd10e8
|
Implement migration for t3c configurations
|
2017-07-09 00:34:12 -04:00 |
|
blitzmann
|
1225f2074a
|
update to 1163182
|
2017-07-08 21:59:28 -04:00 |
|
Wenda Zhou
|
afee4469f0
|
fix loki effects to apply correctly
|
2017-07-07 00:26:38 -04:00 |
|
blitzmann
|
3b716e6e5e
|
fix py2app setup file
|
2017-07-07 00:22:58 -04:00 |
|
blitzmann
|
961b389b40
|
test
|
2017-07-06 23:41:55 -04:00 |
|
blitzmann
|
e9c691575f
|
Fix RR effect
|
2017-07-05 23:48:44 -04:00 |
|
blitzmann
|
27236feec3
|
Add new effects
|
2017-07-03 22:24:27 -04:00 |
|
Ryan Holmes
|
2e598a7ef7
|
update sisi database
|
2017-07-03 14:59:28 -04:00 |
|
Ryan Holmes
|
0527a506ac
|
fix broken events preventing additions panels to not work
|
2017-07-03 01:46:46 -04:00 |
|
Ryan Holmes
|
1082d8a173
|
fix fix fix
|
2017-07-02 23:45:28 -04:00 |
|
Ryan Holmes
|
7ae41b71b2
|
Fix some deprecated things and a bug or two
|
2017-07-02 23:26:44 -04:00 |
|
Ryan Holmes
|
de5a734919
|
About dialog (looks like shit x_x)
|
2017-07-02 16:42:22 -04:00 |
|
Ryan Holmes
|
987c55ed8f
|
Get preferences dialog up and running
|
2017-07-02 16:32:39 -04:00 |
|
Ryan Holmes
|
57783fe80f
|
More work on character editor
|
2017-07-02 15:28:42 -04:00 |
|
Ryan Holmes
|
f24c2ddd22
|
Get skill list in character editor showing. Mostly doesn't work still
|
2017-07-02 14:12:00 -04:00 |
|
blitzmann
|
58a242f753
|
update effect headers
|
2017-06-27 21:03:16 -04:00 |
|
blitzmann
|
5c2cf6dd15
|
Add last bit of t3 effects from sisi data
|
2017-06-27 21:02:27 -04:00 |
|
blitzmann
|
287f3bc510
|
Fix some broken effects (due to effect renames)
|
2017-06-25 02:54:14 -04:00 |
|
blitzmann
|
caaa6bcd0c
|
update config.py to reflect sisi version
|
2017-06-25 01:33:18 -04:00 |
|
blitzmann
|
b01c961251
|
change path to database in case these sisi releases screw with data
|
2017-06-25 01:27:29 -04:00 |
|
blitzmann
|
826c73c903
|
Merge branch 'strat_cruisers' into singularity
|
2017-06-25 01:26:55 -04:00 |
|
blitzmann
|
b6a28ae15f
|
Merge branch 'master' into development
Conflicts:
config.py
|
2017-06-25 01:23:08 -04:00 |
|
blitzmann
|
ad0d55faed
|
update effect headers
|
2017-06-25 01:21:37 -04:00 |
|
blitzmann
|
910ae6315d
|
More work on subsystems
|
2017-06-25 01:19:48 -04:00 |
|
blitzmann
|
25b4d3a45b
|
More work on strat cruiser updates
|
2017-06-25 00:33:36 -04:00 |
|
blitzmann
|
f355cb3a72
|
Update effect headers
|
2017-06-25 00:18:06 -04:00 |
|
blitzmann
|
ff58648f94
|
start picking at strat cruiser update
|
2017-06-21 22:19:37 -04:00 |
|
Ryan Holmes
|
f16e14e0b4
|
Fix gauges again, convert remaining IconFromBitmap > Icon
|
2017-06-14 15:05:12 -04:00 |
|
Ryan Holmes
|
729c46ab00
|
Revert "Remove EVT_ERASE_BACKGROUND events - pretty sure these were there for older versions of wx where the background wasn't erased properly"
This does help prevent flickering on resizing. Need to research more before removing them
This reverts commit 8c5c7fba29.
|
2017-06-14 03:57:57 -04:00 |
|
Ryan Holmes
|
3b546de070
|
More deprecated fixes, and re-enable a working stats view
|
2017-06-14 03:51:40 -04:00 |
|