wolfwood
b78c0a5845
fix issue copying fits with sqlalchemy 1.0
2015-05-27 10:21:16 -07:00
DarkPhoenix
ef6e25bfce
Merge branch 'master' into singularity
2015-05-27 14:55:12 +03:00
DarkPhoenix
e81f7eb765
Change validator requirement for owner ID
...
This fixes bug related to sqlalch 1.0
2015-05-27 14:54:37 +03:00
DarkPhoenix
26122f6da7
Add latest changes from Singularity
2015-05-21 16:44:39 +03:00
blitzmann
e7264108dd
Fix #287
2015-05-05 23:23:38 -04:00
blitzmann
2bcbb03c10
Fix #286 and another minor bug related to colors
2015-05-05 22:56:40 -04:00
DarkPhoenix
9cf20942f1
Change validator requirement for owner ID
...
This fixes bug related to sqlalch 1.0
2015-05-01 20:15:08 +03:00
DarkPhoenix
dbb98e981a
Merge branch 'wx3' of github.com:DarkFenX/Pyfa into wx3
2015-05-01 19:03:04 +03:00
DarkPhoenix
3ae39b2e7c
Remove unused import
2015-05-01 19:02:13 +03:00
DarkPhoenix
7b43b516c9
Add effect i should've added for mosaic release
2015-05-01 18:50:11 +03:00
DarkPhoenix
12d6a2c5de
Bundle runtime libs with windows executable
2015-05-01 16:37:13 +03:00
DarkPhoenix
26bba49193
Work around bug in wxpython
...
Button is specified as property in wx docs, but it returns bound method instead of actually being a property
2015-05-01 16:00:26 +03:00
DarkPhoenix
4e69a2656c
Add some options for Mac binary generation
...
Can't test it atm, but whatever
2015-05-01 15:37:09 +03:00
DarkPhoenix
68d504c79d
Force writing errors/output to file in case of frozen distributive
2015-05-01 15:08:14 +03:00
DarkPhoenix
2180b1ac3b
Add folder with assets used for distributives
2015-05-01 14:50:09 +03:00
DarkPhoenix
32712a8798
Fetch app version from config file
2015-05-01 14:20:01 +03:00
DarkPhoenix
73c7ad55b6
Add comment which shows how to use script
2015-05-01 14:00:31 +03:00
DarkPhoenix
a34c5ace5c
Change setup file to make sure msi installer can be built
2015-05-01 13:54:40 +03:00
DarkPhoenix
fd77661f41
Tune setup file a bit more
2015-05-01 04:02:10 +03:00
DarkPhoenix
ad07cf25d8
Settle on just Tkinter in excludes
2015-05-01 03:23:57 +03:00
DarkPhoenix
4daf1b1ba3
Merge branch 'wx3' of github.com:DarkFenX/Pyfa into wx3
2015-05-01 01:28:18 +03:00
DarkPhoenix
4b189ab146
Remove obsolete readme
2015-05-01 01:27:54 +03:00
DarkPhoenix
64a69e3910
Remove tcl/tk from distributive
2015-05-01 01:27:07 +03:00
DarkPhoenix
9482404ca7
Remove setting locale
...
Who knows what it may cause, i'm not an wx expert, but wx3 bundled with xc_freeze keeps bitching about it...
2015-05-01 00:04:35 +03:00
DarkPhoenix
124d4fab9b
Change the way we fetch conversions from package to make it compatible with frozen and packed builds
2015-04-30 23:59:56 +03:00
DarkPhoenix
722406f636
Change the way we detect root
...
This is needed for executable freeze to work correctly
2015-04-30 23:08:42 +03:00
DarkPhoenix
6d4957b148
Add setup.py for building binary distributives with wx3
2015-04-30 22:24:27 +03:00
DarkPhoenix
cca7f1112a
Revert "Merge branch 'master' into wx3"
...
This reverts commit 33a0c106502077655694
2015-04-30 19:47:15 +03:00
DarkPhoenix
c809a614f9
Revert "Move logging initialization back to pyfa.py"
...
This reverts commit d18cf7b3b0
2015-04-30 19:39:11 +03:00
DarkPhoenix
2c366faa66
Revert "Remove setting locale"
...
This reverts commit 7606bded40
2015-04-30 19:38:47 +03:00
DarkPhoenix
06252d761d
Revert "Change the way we detect pyfa path"
...
This reverts commit bb8d5d0d65
2015-04-30 19:38:18 +03:00
DarkPhoenix
bb8d5d0d65
Change the way we detect pyfa path
...
This ensures that it works even with frozen executable
2015-04-29 00:27:42 +03:00
DarkPhoenix
7606bded40
Remove setting locale
...
It causes issues with wx3 on windows
2015-04-28 23:49:11 +03:00
DarkPhoenix
daaf48d02a
Add effect i should've added for mosaic release
2015-04-28 21:59:54 +03:00
DarkPhoenix
d18cf7b3b0
Move logging initialization back to pyfa.py
2015-04-28 21:59:14 +03:00
DarkPhoenix
33a0c10650
Merge branch 'master' into wx3
2015-04-28 21:53:27 +03:00
DarkPhoenix
2077655694
Bump version for next development release
2015-04-28 21:43:22 +03:00
DarkPhoenix
0dc3cbb7c7
Bump version for a stable release
2015-04-28 19:50:53 +03:00
Anton Vorobyov
a3c19f6f2b
Merge pull request #271 from BlckKnght/fix_stagger
...
Fix stagger
2015-04-28 19:34:58 +03:00
DarkPhoenix
f97b037011
Forgot to save file for previous commit
2015-04-28 19:18:56 +03:00
DarkPhoenix
dd3dd799b2
Move loggin configuration to config temporarily
2015-04-28 19:17:50 +03:00
Anton Vorobyov
ac881ac371
Merge pull request #276 from kainz/master
...
Support fits exported from jEveAssets
2015-04-28 18:30:20 +03:00
DarkPhoenix
d734ccbf0d
Add effect for entosis link and update effect comments
2015-04-28 18:24:25 +03:00
DarkPhoenix
024e0ad4f5
Support proper migration for ishukone scorp (which is skin for regular scorp now)
2015-04-28 18:19:58 +03:00
DarkPhoenix
545d98883a
Update DB to mosaic
2015-04-28 18:06:03 +03:00
DarkPhoenix
742abc3250
Remove bunch of chinese skinned ships
2015-04-28 18:05:15 +03:00
DarkPhoenix
294e213ac2
Remove support for vanity ships which were converted into base hulls in game
...
We do not need any DB conversion for them because we converted them into base hull during import time. Also it breaks import of old posted EFT-style fits with removed skinned ships, but i can't say we care alot about this case
2015-04-28 18:01:06 +03:00
Bryon Roche
557f32ab91
Implement support for loading utf-16 XML.
...
Such XML is generated by software like jEveAssets's owned ships->fitting
export tool.
Without such detection, pyfa will go and try to import those as DNA
fits, with all the ensuing hilarity, thus the DNA import debug code as
well.
2015-04-22 05:05:48 -07:00
DarkPhoenix
e5430cac84
Do not apply ES bonus to weapon locus rigs
2015-04-20 15:07:19 +03:00
blitzmann
39c14b62fd
Merge branch 'master' into wx3
2015-04-17 17:48:56 -04:00
