35 Commits (3e25c8a13f869e4d554dbad5f4b136afbb8b53cb)

Author	SHA1	Message	Date
bobloy	3e25c8a13f	Saving and loading	4 years ago
bobloy	d987018664	More zoom WIP	4 years ago
bobloy	25e90c350f	More progress on switched to ConquestGame class	4 years ago
bobloy	2d0c9e31b3	WIP self.current_map	4 years ago
bobloy	80db00890d	Merge branch 'master' into conquest_develop ... # Conflicts: # conquest/conquest.py # conquest/mapmaker.py	4 years ago
bobloy	61fa006e33	QoL fixes	4 years ago
Sourcery AI	0475b18437	'Refactored by Sourcery'	4 years ago
bobloy	4496903663	further WIP	4 years ago
bobloy	4457d51f07	More WIP conquest	4 years ago
bobloy	4cd033bf12	WIP conquest	4 years ago
bobloy	d0445f41c7	Black format update	4 years ago
bobloy	664aa63833	much to do	4 years ago
bobloy	500915b947	Game data is different	4 years ago
bobloy	7574117d9a	WIP ConquestGame and per guild saving	4 years ago
bobloy	f0d33f0354	Better mask combination	4 years ago
bobloy	e2e5477661	Better number positioning, better mask combining and generation	4 years ago
bobloy	c3c40c594e	More region classification	5 years ago
bobloy	52fc284f5a	WIP Classification	5 years ago
bobloy	ef925b1621	Map maker is almost working	5 years ago
bobloy	58ad3fc978	It's actually a maximum	5 years ago
bobloy	07b90c30a0	Don't use os, more mapmaker	5 years ago
bobloy	a1b89c9f9d	More map maper and notes on regioner	5 years ago
bobloy	f93986e65f	Reorder methods	5 years ago
bobloy	11258d3e76	mapmapker back to conquest.py	5 years ago
bobloy	c02244ceb5	More Conquest Updates (#115) ... * Start of map maker, ambiguous file format (probably just jpg and png) * More map maker WIP * This isn't dad * Split mapmaker * Don't load current map if it doesn't exist * WIP mapmaker	5 years ago
bobloy	5fff65c7d5	WIP mapmaker	5 years ago
bobloy	8012a20ddb	Don't load current map if it doesn't exist	5 years ago
bobloy	3b156d8275	Split mapmaker	5 years ago
bobloy	ae200eb911	This isn't dad	5 years ago
bobloy	03b42b04ef	Merge branch 'master' into conquest_develop	5 years ago
bobloy	f944879896	Why tf were so many hidden?	5 years ago
bobloy	42aab1e801	More map maker WIP	5 years ago
bobloy	dc8d314713	Start of map maker, ambiguous file format (probably just jpg and png)	5 years ago
bobloy	11a5a7505b	Fix invalid json	5 years ago
bobloy	b9dbad8bd1	Conquest initial (#113) ... * Initial files * Functioning image coloring * Add more commands, untested * Add map list, move set to under conquest, and WIP saving map * ALl masks, mostly working commands * Unneeded original.jpg * Rename to simple, WIP numbered * Use numbers as mask, probably need to switch to png soon * Save to config, test zoom levels * Handle zoom properly, save it to json for each map as well * Move maps to WIP folder * WIP folder not in data folder * Info and READMe updates	5 years ago