blitzmann
c6e715aa5c
Merge branch 'master' into test-3
2018-02-14 22:07:33 -05:00
blitzmann
89c84aac96
update effect headers, add some icons, update DB to final 1248987
2018-02-14 22:05:55 -05:00
blitzmann
23f0f48c80
Use a special dev database for py3 branch
2018-02-14 01:16:49 -05:00
blitzmann
40ce7b7c0b
Merge branch 'master' into test-3
...
# Conflicts:
# .gitignore
# eos/saveddata/character.py
# service/network.py
# service/price.py
2017-12-10 22:36:15 -05:00
blitzmann
cc063d1934
Bump release
2017-12-10 18:07:45 -05:00
blitzmann
2936b88c3d
code cleanup
2017-11-27 21:05:06 -05:00
blitzmann
c000b19986
Finish pulling all the cruft out of pyfa.py relating to logging and error handling. All that is now done in separate areas.
...
Also finally did some major reworking on the error dialog. Now it doesn't spawn a new wxApp and wxFrame for each and every error - attaches to MainFrame and sticks around, having exceptions append to it rather than spawn a new one. In the case that an error happens before MainFrame is available, it spins up a new wxApp. Yay cleanup!
2017-11-26 03:57:00 -05:00
blitzmann
8850da6cdb
OS X bundling puts it all into one file, which is extracted. We need to make sure the script knows of the actual path
2017-11-25 20:11:05 -05:00
blitzmann
b30b3fcbf1
Merge branch 'master' into test-3
...
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
2017-11-23 11:19:05 -05:00
Ryan Holmes
b596447095
Fix issue with deleting a fit while having certain other fits open ( #1339 ) ( #1340 )
...
Also, bump dev version
2017-11-22 21:44:15 -05:00
blitzmann
065747f425
bump release
2017-11-12 16:54:28 -05:00
blitzmann
df7dc30e7e
Write out git version information to a file, use in about box, remove all the other stuff until I can format it correctly
2017-11-12 13:13:38 -05:00
blitzmann
266398b1de
Get some things working for pyinstaller
2017-11-12 00:14:45 -05:00
Ryan Holmes
ca27cd3250
bump stable release ( #1329 )
2017-10-29 18:54:46 -04:00
blitzmann
5dc092ace5
bump dev
2017-10-28 19:25:10 -04:00
Ryan Holmes
fd6e318ae3
Release/v1.33.0 ( #1319 )
...
* update database file to SISI 1202899
* Effect and group renaming
* Add civilian modules (#1308 )
* Add new effects
* update effect headers
* update database to tq - lifeblood (1203953)
* Update renders
* Update icons
* bump version
* fix tox errors
* change up tox config to ignore E722
* more tox ignores
* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.
* Try this
* more testing
* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
2017-10-25 23:33:05 -04:00
Ryan Holmes
3fb7411b9d
Issue/1305 ( #1311 )
...
* Bump dev version
* fix issue in itemDiff
* Do not apply Prop Jamming to Grapplers (#1305 )
2017-10-08 21:13:38 -04:00
Ryan Holmes
72062e6213
Release/1.32.0 ( #1300 )
...
* update database
* update effect headers
* Bump version
2017-09-24 16:43:51 -04:00
blitzmann
eda6d738a4
fix some whitespace stuff, update database, effect headers, and release version
2017-08-16 20:39:26 -04:00
blitzmann
f59a65f314
bump dev
2017-07-15 21:49:58 -04:00
blitzmann
709b4524e6
Bump version :D
2017-07-11 19:26:02 -04:00
blitzmann
0104e8954a
Remove the -dev suffix for the user database
2017-07-11 01:17:30 -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
b6a28ae15f
Merge branch 'master' into development
...
Conflicts:
config.py
2017-06-25 01:23:08 -04:00
Ryan Holmes
9712ec4fbf
Fix up some stuff, migrate to cleaned up chrome tabs
2017-06-12 20:38:00 -04:00
Ryan Holmes
7f392006d1
comment out most of the fluff in pyfa.py. Need to come back to this and get it all working
2017-06-12 16:37:15 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
Ryan Holmes
a79257271e
bump to stable 1.29.4 ( #1228 )
2017-06-08 22:22:30 -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
Ryan Holmes
461f5219e5
bump release ( #1204 )
2017-05-31 23:51:46 -04:00
blitzmann
3be7538daa
Bump dev
2017-05-18 22:22:02 -04:00
blitzmann
a5ff46fbd1
Bump stable
2017-05-16 21:34:09 -04:00
Ryan Holmes
fee82d294b
Bump dev and include fix for #1162 ( #1163 )
...
* Add some logging to try to figure out what happens with #1149
* Add some logging to try to figure out what happens with #1149 , along with some other fixes
* bump dev
* Add remote hull repairers in the calculateSustainableTank() mappings
2017-05-13 22:36:03 -04:00
Ryan Holmes
9f5e14fe2d
Bugfixes and bump point release ( #1159 )
...
* Add some logging to try to figure out what happens with #1149 , along with some other fixes
* Bump point release
2017-05-11 20:53:37 -04:00
Ryan Holmes
de9b167242
Bump version and include fix for #1147 ( #1150 )
...
* bump dev
* Fix two issues with deleting fits (#1147 )
2017-05-10 18:48:33 -04:00
blitzmann
892ee13542
bump for 1.29.0 release
2017-05-09 20:49:05 -04:00
StinGer ShoGun
7f50503aec
Allow game database file to be loaded from a different directory.
...
This will allow system-wide installation of Pyfa in Python site-packages
directory, where eve.db has nothing to do.
This commit is part of attempts to ease system package creation and
maintenance (specifically Gentoo ebuilds).
2017-04-12 16:07:21 +02:00
blitzman
b18bb200a9
Merge branch 'development' into MorePreferences
2017-03-26 13:52:59 -04:00
blitzman
c4293bba6b
bump dev
2017-03-23 00:36:20 -04:00
blitzman
4a6c0db4fa
Bump to stable point release
2017-03-20 21:05:09 -04:00
blitzman
20ac2ad847
bump dev
2017-03-15 20:19:05 -04:00
blitzman
3b5fc7e13c
Bump stable
2017-03-15 20:10:08 -04:00
blitzman
9befaf7c91
Test implementation of eos settings
2017-03-05 02:01:10 -05:00
Ebag333
d67573f83a
Add more functionality to preferences window.
2017-02-27 12:05:38 -08:00
blitzman
1c273210e9
tox fixes
2017-02-26 00:44:37 -05:00
blitzman
6eddfd2694
Merge branch 'development' into LogBook_v2
...
Conflicts:
gui/bitmapLoader.py
2017-02-25 19:03:56 -05:00
blitzman
cd516f80bb
bump dev
2017-02-25 19:01:57 -05:00
blitzman
1ae5f64696
Here we go again!
2017-02-25 18:50:20 -05:00
