1482 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Azgaar	8e9c0c9f78	prepare from trade generation	2022-11-27 18:39:08 -05:00
Azgaar	899c83fc65	partially refactor BurgAndStates	2022-11-27 18:38:46 -05:00
Azgaar	ecdb536f95	partially refactor BurgAndStates	2022-11-27 18:38:30 -05:00
Azgaar	713833f4b8	resource units	2022-11-27 18:38:16 -05:00
Azgaar	e963ccbfca	resource units	2022-11-27 18:37:57 -05:00
Azgaar	c219ba8045	show production in burgs editor	2022-11-27 18:37:45 -05:00
Azgaar	eda75ed98e	culture type bonuses for production	2022-11-27 18:37:11 -05:00
Azgaar	7982aea194	fix merge conflicts	2022-11-27 18:36:28 -05:00
Azgaar	535538bce0	remove log	2022-11-27 18:36:06 -05:00
Azgaar	84965cf0ca	burgs placement change + resource style	2022-11-27 18:34:50 -05:00
Azgaar	1e227642c8	fix some merge issues	2022-11-27 18:34:10 -05:00
Azgaar	f8bc33ba29	resource icon upload + save/load	2022-11-27 18:33:45 -05:00
Azgaar	f88d263e68	burgs overview - icon upload basic	2022-11-27 18:33:24 -05:00
Azgaar	9c02906c88	burgs overview - shift icon	2022-11-27 18:32:56 -05:00
Azgaar	3b2216f668	Resource editor - ability to add bonus if no bonuses	2022-11-27 18:32:35 -05:00
Azgaar	8f8a33f0a4	add resource	2022-11-27 18:31:37 -05:00
Azgaar	4bf901e849	generic confirmationDialog for all files	2022-11-27 18:31:10 -05:00
Azgaar	556e651d52	generic confirmationDialog	2022-11-27 18:22:54 -05:00
Azgaar	5477e5ca1e	Resources editor - assign cells	2022-11-27 18:22:39 -05:00
Azgaar	2e84654477	resource bonus UI	2022-11-27 18:22:11 -05:00
Azgaar	c3f102656d	resource bonus UI	2022-11-27 18:22:11 -05:00
Azgaar	6bcd0d3aad	resource bonus UI basic	2022-11-27 18:21:57 -05:00
Azgaar	787a830d92	custom spread models	2022-11-27 18:21:44 -05:00
Azgaar	68cf5c5d1c	custom spread models	2022-11-27 18:21:28 -05:00
Azgaar	10acdce50a	regenerate resources	2022-11-27 18:20:59 -05:00
Azgaar	d0500f19d6	color picker behavior update	2022-11-27 18:20:20 -05:00
Azgaar	df1ee1b5a3	resources ("goods") layers	2022-11-27 18:19:31 -05:00
Azgaar	e69762792a	resource styling - all 40 are done	2022-11-27 18:18:49 -05:00
Azgaar	3758b2bb09	resource styling	2022-11-27 18:16:52 -05:00
Azgaar	ccce3c8519	resource styling	2022-11-27 18:16:33 -05:00
Azgaar	9b1ae25129	new resources	2022-11-27 18:16:17 -05:00
Azgaar	1d751a3d5a	new resources	2022-11-27 18:16:00 -05:00
Azgaar	955e798a95	new resources	2022-11-27 18:13:56 -05:00
Azgaar	b9db7edf43	econonics - restore from feb	2022-11-27 18:13:27 -05:00
Peter	c4710de7db	resource-editor ui import	2022-11-27 17:49:39 -05:00
Peter	d16fff9524	import resource-editor ui	2022-11-27 17:49:31 -05:00
Peter	09a5a7bd04	merge fixes	2022-11-27 17:33:47 -05:00
Peter	5beb497026	remove unused files	2022-11-27 17:23:26 -05:00
Peter	1776fa8917	main references to resources	2022-11-27 17:18:54 -05:00
Peter	a6a8acbd1e	merge module uis	2022-11-27 17:05:47 -05:00
Peter	112e78f40a	merge module ui	2022-11-27 16:56:11 -05:00
Peter	8875f5d10a	merge editor uis	2022-11-27 16:35:40 -05:00
Peter	cf017b4943	merge synchronizing dynamic modules	2022-11-27 16:22:52 -05:00
Peter	9d18e962ac	Merge synchronizations with the master branch	2022-11-27 16:18:19 -05:00
Peter	f3396941e4	post-merge fixes	2022-11-27 14:46:31 -05:00
Peter	c24a786519	Merge economics with current	2022-11-27 14:11:46 -05:00
Azgaar	f17bc1e3af	feat(names): name colonies using New constuct	2022-11-27 14:09:24 -05:00
Thomas Robert	7c10fd7b6c	UI improvement for hierarchy tree (#834) ... * style(hierarchy tree): improve responsivness Fix details on the bottom of the dialog Make the tree view take the rest of the available space of the dialog * style(hierarchy tree): distinguish buttons Distinguish between action buttons and remove origins tags-like button * typo(hierarchy tree): change button label and tips * fix(hierarchy tree): disable top node interactions * chore: update version/hash to v1.86.07 * chore: update version/hash to v1.86.08 * fix: bad hash versions * fix: update index.html to correct versions	2022-11-27 14:08:10 -05:00
Azgaar	acd9531bb8	feat(charts): add quantization types	2022-11-27 14:07:32 -05:00
Azgaar	14fc0dcfeb	feature(hierarchy tree): dynamically load, control dialog	2022-11-27 14:06:56 -05:00