blitzmann
|
5372f31be8
|
Revert "Revert "Merge branch 'master' into wx3"". So many reverts.
This reverts commit cca7f1112a.
|
2015-06-27 21:53:59 -04:00 |
|
blitzmann
|
6d01877d78
|
Merge branch 'master' into wx3
Conflicts:
pyfa.py
|
2015-06-27 19:33:12 -04:00 |
|
blitzmann
|
646f3afd27
|
Fixed oversights
|
2015-06-27 19:32:21 -04:00 |
|
blitzmann
|
030f22b66f
|
Merge branch 'debugGtk' into wx3
|
2015-06-27 18:25:31 -04:00 |
|
blitzmann
|
98815f2b85
|
Fix #307 by moving menu code to spawn event
|
2015-06-27 18:18:43 -04:00 |
|
blitzmann
|
a4fe3fe142
|
Fix crash in character editor
|
2015-06-27 15:56:34 -04:00 |
|
blitzmann
|
5b0857e169
|
Ensure that resources gauge is not drawn with a width of 0 to make GTK happy
|
2015-06-27 15:35:22 -04:00 |
|
blitzmann
|
975a414c5f
|
Ensure that SetSize() does not take values less than -1
|
2015-06-27 14:39:35 -04:00 |
|
Ryan Holmes
|
95eb5a6117
|
Update README.md
Added note for Linux users and wxPython 2.8
|
2015-06-25 21:45:06 -04:00 |
|
blitzmann
|
8a7e69b902
|
Fix progress dialog stuff. Closes #281
|
2015-06-25 16:43:39 -04:00 |
|
blitzmann
|
dc035469ed
|
Fix background color for certain panels under Linux
|
2015-06-25 16:09:56 -04:00 |
|
blitzmann
|
21937c02ff
|
Made it look nicer
|
2015-06-24 19:53:55 -04:00 |
|
blitzmann
|
7ec78b941e
|
Add help text for why api is disabled, per #269. I may or may not make it look nicer later
|
2015-06-24 15:10:37 -04:00 |
|
blitzmann
|
95bf1039c0
|
Fix #291 - Triage not properly implemented on projected fit
|
2015-06-24 14:36:31 -04:00 |
|
blitzmann
|
e6def6f5f9
|
Fix #299 - fit not recalculated after module states change upon module append
|
2015-06-24 00:40:13 -04:00 |
|
blitzmann
|
da16f6cee7
|
Fix closing of progress dialogs
|
2015-06-20 15:00:02 -04:00 |
|
blitzmann
|
f285395e0f
|
Fix black bitmap when dragging fit, closes #303
|
2015-06-17 19:43:48 -04:00 |
|
blitzmann
|
b54e3aeaf9
|
See #303
|
2015-06-16 15:28:23 -04:00 |
|
blitzmann
|
23baaa7dba
|
Merge branch 'master' of https://github.com/DarkFenX/Pyfa
|
2015-06-16 13:14:28 -04:00 |
|
blitzmann
|
8008c986d3
|
Fix #302 - Projected fit applying Tactical Destroyer mode effects on projectee
|
2015-06-16 13:14:16 -04:00 |
|
DarkPhoenix
|
b9efc919ea
|
Add missing RHML rof effect
|
2015-06-16 16:53:21 +03:00 |
|
blitzmann
|
eb2f4991ee
|
Fix search in wx3 (and remove some needless crap... seriously, why was all that there?)
|
2015-06-04 22:48:46 -05:00 |
|
blitzmann
|
16017a3c31
|
Remove middle click to open new page, fixing wx3 deprecation warning (didn't seem to work anyway)
|
2015-06-04 21:01:49 -05:00 |
|
blitzmann
|
98d9adef8a
|
Fix for libpng hating our color profiles
|
2015-06-04 17:27:11 -05:00 |
|
DarkPhoenix
|
3395f8ebe6
|
Bump for next development release
|
2015-06-02 23:43:16 +03:00 |
|
DarkPhoenix
|
1d45102100
|
Bump for a stable release
|
2015-06-02 23:32:16 +03:00 |
|
DarkPhoenix
|
1694d74afa
|
Add Carnyx tiericide module upgrade/import paths
|
2015-06-02 23:27:08 +03:00 |
|
DarkPhoenix
|
9c9f1dcefa
|
Get faction 200mm plates back
|
2015-06-02 19:37:32 +03:00 |
|
DarkPhoenix
|
a4ca2e90f9
|
Add effect which affects entosis duration on cap ships
|
2015-06-02 16:48:58 +03:00 |
|
DarkPhoenix
|
dbfcfd9acf
|
Change expansion data in config and update database to 893722
|
2015-06-02 16:38:38 +03:00 |
|
DarkPhoenix
|
8c30ee3fd3
|
Merge branch 'master' into singularity
|
2015-05-28 15:21:28 +03:00 |
|
Anton Vorobyov
|
ca17d17232
|
Merge pull request #292 from wolfwood/master
fix issue copying fits with sqlalchemy 1.0
|
2015-05-28 15:17:02 +03:00 |
|
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 |
|