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
|
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 |
|
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
|
ad535ccc78
|
Merge branch 'qol/additionPanes' into qol/file-reorg
|
2017-06-12 01:17:22 -04:00 |
|
Ryan Holmes
|
9dee761f6d
|
Move addition pane views into their own directory
|
2017-06-12 01:17:00 -04:00 |
|
Ryan Holmes
|
f5531b458b
|
Fix up focus for ship browser, allowing space or enter to work to open up new stage
|
2017-06-12 00:28:06 -04:00 |
|
Ryan Holmes
|
a7c89f7b40
|
break out market browser to individual class files
|
2017-06-11 17:54:36 -04:00 |
|
Ryan Holmes
|
048ae0205c
|
Breakout shipBrowser into individual class files
|
2017-06-11 17:32:43 -04:00 |
|
Ryan Holmes
|
e6a0784466
|
space to select fit when it's focus'd
|
2017-06-11 15:43:01 -04:00 |
|
blitzmann
|
53d15425f3
|
tab / tab+shift to change focus of ship browser items
|
2017-06-09 01:27:28 -04:00 |
|
Ryan Holmes
|
a79257271e
|
bump to stable 1.29.4 (#1228)
|
2017-06-08 22:22:30 -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
|
47fcbefe8b
|
Finish off user-selectable booster side effects - effects are applied correctly now and each has their own display name. Implements #642
|
2017-06-05 00:18:36 -04:00 |
|
blitzmann
|
c2cb5d763f
|
Implement selectable booster side effects and persist them to the database, very much based on the fighter ability code. Still need to name them and enable the effects.
This also removes the old boosterActiveSideEffect table definition (migration script to drop table still needs to be written)
|
2017-06-04 23:33:11 -04:00 |
|
Ryan Holmes
|
208148b670
|
Fix issue with fit deletion (#1211)
* bump dev
* Fix issue with deleted fit not being removed from database cache (#1207). Also, include some error handling around the our commit stuff
|
2017-06-02 00:30:58 -04:00 |
|
blitzmann
|
cf02c74272
|
bump dev
|
2017-06-01 00:33:46 -04:00 |
|
blitzmann
|
f77cd0b834
|
Merge branch 'master' into development
|
2017-06-01 00:32:06 -04:00 |
|
Ryan Holmes
|
461f5219e5
|
bump release (#1204)
|
2017-05-31 23:51:46 -04:00 |
|