blitzman
|
5e0567ef4d
|
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
|
2017-01-10 22:51:38 -05:00 |
|
blitzman
|
b49de4b0fa
|
Update to 1108313
|
2017-01-10 22:51:27 -05:00 |
|
blitzman
|
372495a83a
|
Remove vestigial appendage
|
2017-01-10 22:45:41 -05:00 |
|
blitzman
|
468a4644d6
|
Merge branch 'development'
Conflicts:
eos/db/saveddata/queries.py
|
2017-01-10 22:42:01 -05:00 |
|
Ryan Holmes
|
29d0f102fd
|
Move AT14 ships to the Limited Edition group (#935)
|
2017-01-05 11:38:47 -05:00 |
|
blitzman
|
ebc7173c50
|
Fix issues with unexpected module positions (see #932)
|
2017-01-04 23:48:37 -05:00 |
|
blitzman
|
43f1ac78a6
|
Keep subsystem module in the same position when swapping them out (see #932)
|
2017-01-04 23:17:56 -05:00 |
|
blitzman
|
d6b1e4465e
|
Merge branch 'test/cat-has-fits'
|
2017-01-03 01:32:50 -05:00 |
|
blitzman
|
5cbffcf3ac
|
Handle counting number of fits per ship category more efficiently (see #819)
|
2017-01-03 01:32:12 -05:00 |
|
blitzman
|
c91723516e
|
Do not calculate projected fits for command fits (see #931)
|
2017-01-02 23:54:06 -05:00 |
|
Ryan Holmes
|
a68f45d15a
|
Merge pull request #927 from Ebag333/BurstProjectors
ECM Burst Projectors effect
|
2017-01-02 19:58:10 -05:00 |
|
Ryan Holmes
|
152a708ee8
|
Merge pull request #920 from Ebag333/Database_Cleanup
Database Validation and Cleanup
|
2017-01-02 19:25:26 -05:00 |
|
blitzman
|
a0ec13d2ed
|
More tweaks
|
2017-01-02 18:45:08 -05:00 |
|
Ebag333
|
3313b7421f
|
Move query logic into own function in queries. Tighten up flow in DB repair. Catch null values.
|
2017-01-02 13:41:39 -08:00 |
|
blitzman
|
a76ee6b2fc
|
more tweaks
|
2017-01-02 12:07:15 -05:00 |
|
Ebag333
|
0056b704d4
|
Add other projector effects. Only allow it to affect the specific attribute it's modifying.
|
2017-01-02 03:18:54 -08:00 |
|
Ebag333
|
c1ead5fe27
|
change method for retreiving count
|
2017-01-02 00:29:44 -08:00 |
|
blitzman
|
85a89339a7
|
Cleaned up database corruption stuff
|
2017-01-02 00:58:54 -05:00 |
|
Ryan Holmes
|
55f82c48bc
|
Merge pull request #929 from Ebag333/Character_Import_Sanitization
Add some sanity checks and validation of imported character data
|
2017-01-02 00:38:48 -05:00 |
|
Ebag333
|
f4761e099b
|
Don't let people rename built in chars
|
2017-01-01 13:17:39 -08:00 |
|
Ebag333
|
be3696deba
|
Add some sanity checks and validation of incoming data
|
2017-01-01 12:47:28 -08:00 |
|
Ebag333
|
cd41e9e9be
|
Change to use skill rather than group, and modify correct attribute
|
2017-01-01 03:08:38 -08:00 |
|
Ryan Holmes
|
fd066c2150
|
Merge branch 'Ebag333-EFTBoosterImports' into development
|
2016-12-28 17:46:33 -05:00 |
|
Ebag333
|
f9ba95b3de
|
Check the ness to see if it's an implant, booster, or something else.
Log it if it's something else and don't try and import it. This prevents
a bad line from failing the entire import, and (hopefully) we know about
it.
|
2016-12-27 12:32:52 -08:00 |
|
Ebag333
|
7ee4d1d588
|
Try loading item as a booster if implant fails.
|
2016-12-26 23:29:22 -08:00 |
|
Ebag333
|
cef5842344
|
Database validation and cleanup
|
2016-12-26 21:54:52 -08:00 |
|
blitzman
|
ff60538e21
|
Revert "Merge branch 'Ebag333-UnicodePaths' into development"
This reverts commit 8a6ef788b3, reversing
changes made to cf91ae7627.
|
2016-12-18 15:56:06 -05:00 |
|
Ryan Holmes
|
50c6133046
|
Revert "Remembers user's meta filtering choices"
|
2016-12-18 10:09:55 -05:00 |
|
Ryan Holmes
|
b7d7b80544
|
Merge pull request #829 from resinneublem/remember-user-filters
Remembers user's meta filtering choices
|
2016-12-18 10:07:15 -05:00 |
|
blitzman
|
2b9342692d
|
working commit
|
2016-12-18 09:45:26 -05:00 |
|
blitzman
|
a24e247f1b
|
Merge branch 'master' into development
Conflicts:
eos/effects/usemissiles.py
eos/saveddata/fit.py
|
2016-12-18 09:24:39 -05:00 |
|
blitzman
|
3396056dae
|
bump dev
|
2016-12-18 09:19:47 -05:00 |
|
blitzman
|
366d6c8971
|
bump stable
|
2016-12-18 08:00:19 -05:00 |
|
blitzman
|
14bf7ddf7a
|
fix renders (revert back to previous ones)
|
2016-12-18 07:52:49 -05:00 |
|
blitzman
|
30cce09063
|
actually fix database
|
2016-12-18 06:27:37 -05:00 |
|
blitzman
|
9a50ebfc47
|
fix database
|
2016-12-18 05:51:22 -05:00 |
|
blitzman
|
0f05b60c20
|
Fix for #901
|
2016-12-18 05:47:56 -05:00 |
|
blitzman
|
4f8493d1bb
|
Merge branch 'Ebag333-Patch_1105543'
|
2016-12-16 21:27:19 -05:00 |
|
blitzman
|
58dd629956
|
update db
|
2016-12-16 21:27:11 -05:00 |
|
blitzman
|
936b746954
|
update headers
|
2016-12-16 21:19:00 -05:00 |
|
blitzman
|
ef14bfac58
|
Merge branch 'Patch_1105543' of https://github.com/Ebag333/Pyfa into Ebag333-Patch_1105543
|
2016-12-16 21:16:07 -05:00 |
|
blitzman
|
291f73b661
|
fix for #905
|
2016-12-16 20:59:54 -05:00 |
|
blitzman
|
3d9dae0d52
|
fuuu
|
2016-12-16 20:50:36 -05:00 |
|
blitzman
|
017c37c4af
|
Fix for #892
|
2016-12-16 20:49:42 -05:00 |
|
blitzman
|
ee0c852ddb
|
Fix titan effects and issue in which all warefarebuffs may not get run (range too short). This should also shore up (#897)
|
2016-12-16 20:17:20 -05:00 |
|
blitzman
|
d63627a37b
|
More cleanup
|
2016-12-16 19:26:54 -05:00 |
|
blitzman
|
b1c9e70f95
|
Merge branch 'command-refactor'
|
2016-12-16 19:20:44 -05:00 |
|
blitzman
|
3ac2fd870f
|
clean up
|
2016-12-16 19:20:30 -05:00 |
|
blitzman
|
8ab6e26def
|
Start refactoring the command burst effects in a way that's not complete and total shit (only slightly shit)
|
2016-12-13 23:55:56 -05:00 |
|
Ebag333
|
cd7d25e4e1
|
Add skill bonus
|
2016-12-13 14:28:43 -08:00 |
|