Commit Graph

127 Commits

Author SHA1 Message Date
blitzmann
95899548e5 Fix an issue with double forward slashes in res paths (#1703) 2018-08-21 20:58:38 -04:00
blitzmann
ccd6d357ed New icons 2018-08-21 20:45:16 -04:00
DarkPhoenix
ccbd0a117b Fix merge issue 2018-08-21 19:51:56 +03:00
DarkPhoenix
6caa79c951 Merge master into singularity 2018-08-21 19:43:41 +03:00
DarkPhoenix
4365da8292 Merge branch 'master' into singularity 2018-08-21 19:40:39 +03:00
DarkPhoenix
ff222b8d62 Some fixes to DB conversion script 2018-08-21 19:39:07 +03:00
blitzmann
df92b857c9 Add a script to extract the dynamic attribute mappings from the client 2018-07-15 00:47:26 -04:00
blitzmann
6fdcce12a3 Merge branch 'icons-1621' into v2.2.0b1
# Conflicts:
#	eos/db/__init__.py
#	eos/db/gamedata/__init__.py
#	eos/db/gamedata/item.py
#	eos/gamedata.py
#	eve.db
2018-06-12 21:43:28 -04:00
blitzmann
e19d231eba Merge branch 'master' into v2.2.0b1
# Conflicts:
#	eve.db
2018-06-12 21:41:04 -04:00
DarkPhoenix
d48f9354ec Update database (vedmak fitting changes) and do relevant string updates
Also change jsontosql script to ignore fsdtypeoverrides which is no longer dumpable by phobos
2018-06-05 20:02:00 +03:00
blitzmann
20f57146c4 Merge branch 'master' into mutaplasmids
# Conflicts:
#	eve.db
2018-06-03 16:31:20 -04:00
blitzmann
19cf3c2036 Update various GUI things to show new location for ship icon 2018-06-02 14:54:59 -04:00
blitzmann
18bbe49c49 support renders 2018-06-02 14:34:00 -04:00
blitzmann
e806471b47 Run icon script to remove the clothing icons 2018-06-02 14:10:37 -04:00
blitzmann
59d56fc333 Remove clothing form the database 2018-06-02 14:04:34 -04:00
blitzmann
926299c20e Add process for getting graphic ids from fsdbinary (not utilizing them yet) 2018-06-02 11:58:38 -04:00
blitzmann
e8d5e9f9f2 More icons fixes 2018-06-02 10:18:56 -04:00
blitzmann
94b1876cf1 icon script tweak 2018-05-31 21:36:22 -04:00
blitzmann
5388ba7a70 Remove need for Icon class, references to it's DB relationship, and remove from DB. Also, add the files. All the files. 2018-05-31 21:13:12 -04:00
blitzmann
ff1d8109cd Start updating the icons script. You can now point it at an EVE installation and an icons.json, which is generated via the icons.yaml from from the SDE (for now, unless we can figure out how to access that info form the res files. it's in CCPs format).
Lots of old stuff still here, needs cleanup. We no longer restrict the queries to certain categories / groups, seemed like extra logic to remember whenever new stuff is potentially added.
2018-05-31 21:09:35 -04:00
blitzmann
d0777602e7 Clean up unused effect files now that the effects script works (hopefully) 2018-05-29 21:49:32 -04:00
blitzmann
618507f88c Fix the effects used by script (no longer restricted on category / group), and fix many effects headers 2018-05-29 21:43:25 -04:00
blitzmann
ba2471e75c Add new icons files 2018-05-29 20:15:05 -04:00
blitzmann
8ab709e590 * Update database (unpublish Abyssal items, for now)
* Add eve data version and datetime to about window (temp measure until we can get a better about window implemented)
2018-05-29 19:37:55 -04:00
blitzmann
d3bd52fe07 Get dynamic attributes JSON saved to the database... now for the tinkering to begin! 2018-05-25 19:18:51 -04:00
blitzmann
afd16e1afd Add new warfareBuffID, and fix issue with going to effect file in debug 2018-05-20 14:10:37 -04:00
blitzmann
bc23417eae Start working on Abysmal space environment effects. The values produced for the infernal weather (calm firestorm) thermic resist penalties are spot on according to my testing. :D 2018-05-20 12:53:33 -04:00
blitzmann
d84525876a Gather abysmal environnments into database 2018-05-20 00:52:48 -04:00
blitzmann
86576581cd Break out the phobos dump from the data compilation (dump has to work in py2, whereas compilation requires py3 due to hooking directly in with EOS classes). protip: PyCharm configurations are awesome 2018-05-13 01:17:59 -04:00
blitzmann
aa2ffaf1ea Update installer script and create new dist script for windows. todo: find out hwo to invoke PyInstaller from python 2018-05-12 22:49:18 -04:00
blitzmann
c99afa79e1 Merge branch 'test-3' 2018-05-07 21:54:51 -04:00
blitzmann
fc35d7bb26 Add mutaplasmids to group listing for sql inclusion 2018-05-02 22:32:49 -04:00
blitzmann
0456cb2f96 Merge remote-tracking branch 'origin/master' into test-3 2018-02-16 22:26:10 -05:00
blitzmann
e16ae88ed9 Fix the item diff script not looking at all items needed 2018-02-15 20:07:06 -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
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
blitzmann
f0baba10df Update effects 2017-11-22 23:04:32 -05:00
blitzmann
d45d7204d2 Merge branch 'release/v1.33.2' into development
Conflicts:
	config.py
2017-11-22 21:51:19 -05:00
blitzmann
25df05a15d Clean up alpha clones for December 2017 release - also runs a few sanity checks to make sure that CCP doesn't forget to include a skill in one of the races 2017-11-22 21:42:25 -05:00
blitzmann
c4f41fb5fa Update to 1209099 and rename old komodo skill 2017-11-12 16:52:56 -05: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
dfe3d5c82a Update forum references (#1301) 2017-09-24 18:00:21 -04:00
blitzmann
be84cf1db7 formatting 2017-07-09 18:59:07 -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
Ryan Holmes
828b18d0fd py2to3 automatic conversion. Woot! 2017-06-12 16:12:45 -04:00
blitzmann
42e64a6223 Fix jsonToSql script and issue with character sec status setter 2017-05-08 21:24:29 -04:00
Ebag333
518f7c9e03 build improvements
(cherry picked from commit 4500bc1)
2017-02-08 13:18:51 -08:00