11415 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	593d8fa4b5	Merge branch 'xMAC94x/update_vek' into 'master' ... switch to upstream vek again See merge request veloren/veloren!3342	2022-05-02 08:34:21 +00:00
Isse	37974fccf2	Merge branch 'devrique/catalan-language-changes' into 'master' ... Catalan language improvements See merge request veloren/veloren!3347	2022-05-01 23:14:25 +00:00
Enrique AM	132fda804e	Catalan language improvements	2022-05-01 23:14:25 +00:00
Marcel	e30845c68f	Merge branch 'christof/shredded_economy3' into 'master' ... Economic debugging and documentation See merge request veloren/veloren!3309	2022-05-01 18:26:29 +00:00
Isse	8de3b83199	Merge branch 'fix_villagers_seeing_enemies_through_objects' into 'master' ... Fix villagers seeing cultists and familiar enemies through objects. See merge request veloren/veloren!3336	2022-05-01 15:06:43 +00:00
holychowders	914b44c714	Fix villagers seeing cultists and familiar enemies through objects.	2022-05-01 15:06:43 +00:00
Marcel	a22f035638	Merge branch 'xMAC94x/cleanup_old' into 'master' ... remove unused file See merge request veloren/veloren!3346	2022-04-28 11:09:11 +00:00
Marcel	3163f593ce	Merge branch 'xMAC94x/fix_ci' into 'master' ... accidently checked for SCHEDULE_CADENCE to be empty See merge request veloren/veloren!3345	2022-04-28 10:25:51 +00:00
Marcel Märtens	d70c8dd160	remove unused file	2022-04-28 12:23:55 +02:00
Marcel Märtens	6aa4d664fc	accidently checked for SCHEDULE_CADENCE to be empty	2022-04-28 12:03:58 +02:00
Marcel Märtens	fa49248c31	switch to upstream vek again	2022-04-28 09:10:55 +02:00
Marcel	a45791dda5	Merge branch 'giant-tree-entities' into 'master' ... Site2 giant tree entity spawning See merge request veloren/veloren!3344	2022-04-27 10:53:08 +00:00
Isse	3027597352	Site2 giant tree entity spawning	2022-04-27 10:53:08 +00:00
Marcel	2e7f31dbe5	Merge branch 'Ban/FR-Translation' into 'master' ... FR Translation up to date See merge request veloren/veloren!3339	2022-04-26 17:29:09 +00:00
Clary Chevry	f78245615e	FR Translation up to date	2022-04-26 17:29:09 +00:00
Marcel	ff34891665	Merge branch 'xMAC94x/fixed_ci3' into 'master' ... kaniko seems to have a different shell that doesnt support local command, just use export then See merge request veloren/veloren!3341	2022-04-25 06:21:25 +00:00
Marcel Märtens	dba817ba57	kaniko seems to have a different shell that doesnt support local command, just use export then	2022-04-25 08:10:35 +02:00
Marcel	b3fd521d00	Merge branch 'xMAC94x/fixed_ci2' into 'master' ... Seems like before_script in publish was overwriting cargo on pages job, so i... See merge request veloren/veloren!3340	2022-04-24 18:16:22 +00:00
Marcel Märtens	0941dfffae	Seems like before_script in publish was overwriting cargo on pages job, so i just move it into the script itself	2022-04-24 19:48:27 +02:00
Marcel	731fd1021d	Merge branch 'xMAC94x/no_deps' into 'master' ... skip artifact downloading in CI page and tag jobs See merge request veloren/veloren!3338	2022-04-24 17:45:24 +00:00
Marcel	083964e1ad	Merge branch 'xMAC94x/fix_ci' into 'master' ... fix typo See merge request veloren/veloren!3337	2022-04-24 16:28:46 +00:00
Marcel Märtens	ddb90b9f5a	skip artifact downloading in CI page and tag jobs	2022-04-24 18:26:21 +02:00
Marcel Märtens	c55cbb16e1	fix typo	2022-04-24 18:21:36 +02:00
Christof Petig	2ddd1cc0a7	execute with local tracing environment ... sadly the level passed is ignored, and it warns about an invalid filter directive but RUST_LOG environment variables work as expected	2022-04-24 17:26:16 +02:00
Christof Petig	ab985b54ab	initialize ERROR not INFO	2022-04-24 17:26:16 +02:00
Christof Petig	5f5ebeecfe	ignore expensive tests without much added value	2022-04-24 17:26:16 +02:00
Christof Petig	2f7c50281f	fix neighbor logic in test, fix clippy, fix rustfmt	2022-04-24 17:26:16 +02:00
Christof Petig	8dfd6dc523	document more elements of economy	2022-04-24 17:26:16 +02:00
Christof Petig	53ace17327	output trade to csv file	2022-04-24 17:26:16 +02:00
Christof Petig	dc4b9dc19e	more readable and meaningful csv output	2022-04-24 17:26:16 +02:00
Christof Petig	d897df4b78	output number of trade partners	2022-04-24 17:26:16 +02:00
Christof Petig	eedfce45bc	also output normal economic simulation	2022-04-24 17:26:16 +02:00
Christof Petig	8e48d59539	also print situation in other econ test	2022-04-24 17:26:16 +02:00
Christof Petig	b144ed42e3	display trade volume	2022-04-24 17:26:16 +02:00
Christof Petig	57dafea9b4	group the first three settlements together (should enable them to survive by trade)	2022-04-24 17:26:16 +02:00
Christof Petig	6f431a6fff	rearrange and connect towns (shows planning weakness)	2022-04-24 17:26:16 +02:00
Christof Petig	faf12118f0	remember which good a profession is missing for productivity	2022-04-24 17:26:16 +02:00
Christof Petig	94bef521ce	new test to check different resource situations	2022-04-24 17:26:15 +02:00
Marcel	d409a67984	Merge branch 'xMAC94x/cleanup_ci' into 'master' ... remove duplicate airshipper ci jobs. Introduce weekly build. See merge request veloren/veloren!3286	2022-04-24 14:35:10 +00:00
Marcel	c78253e8a6	Merge branch 'christof/minimum_price' into 'master' ... Enforce a minimum price for goods See merge request veloren/veloren!3335	2022-04-24 09:19:12 +00:00
Marcel Märtens	0c50d6fe24	include gittag into yaml	2022-04-24 10:42:14 +02:00
Marcel Märtens	618d4b2340	simply scripts alot, not the null check is necessray because gitlab ci regex with variables is weird and would contain errors otherwise. ... limit pages to master run only, as we dont export scheduled pages	2022-04-24 10:41:35 +02:00
Marcel Märtens	203fe7ad47	remove duplicate airshipper ci jobs. Introduce weekly build. ... This requires the veloren schedule to contain variables and requires the airshipper server to handle those in the config	2022-04-24 07:39:57 +02:00
Christof Petig	40cf44d7b1	Enforce a minimum price for goods	2022-04-23 22:11:29 +02:00
Samuel Keiffer	c6066d7f3f	Merge branch 'balance_tweaks' into 'master' ... Balance tweaks See merge request veloren/veloren!3257	2022-04-23 14:54:01 +00:00
Youssef Fahmy	aec866e5ec	Balance tweaks	2022-04-23 14:54:01 +00:00
Marcel	967d151312	Merge branch 'aerialfiddle/be_BY' into 'master' ... Fixed an error where '{amount} Exp' floater did not use existing localizations See merge request veloren/veloren!3332	2022-04-19 17:02:19 +00:00
Anton Katsuba	d37db03270	Fixed an error where '{amount} Exp' floater was displayed only in English despite localizations being available	2022-04-19 18:28:15 +03:00
Marcel	ce87cdfd7e	Merge branch 'aerialfiddle/be_BY' into 'master' ... Added Belarusian translation, 100% complete See merge request veloren/veloren!3330	2022-04-19 10:16:08 +00:00
Anton Katsuba	c3d4f9972d	be_BY minor orthography correction	2022-04-18 22:51:33 +03:00