9517 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcel	81b8cf21ff	Merge branch 'xMAC94x/biomeinfo' into 'master' ... add biome and site info to F3 debug menu See merge request veloren/veloren!2593	2021-07-12 18:13:11 +00:00
Marcel Märtens	5f780aa0ee	add biome and site info to F3 debug menu	2021-07-12 18:44:54 +02:00
Marcel	35d8306c7a	Merge branch 'xMAC94x/update-toolchain' into 'master' ... xMAC94x/update toolchain See merge request veloren/veloren!2594	2021-07-12 15:00:29 +00:00
Marcel Märtens	468cfe84e7	clippy fixes in tests	2021-07-12 13:35:26 +02:00
Marcel Märtens	d345a8f8f0	adjust cache image tag	2021-07-12 12:14:54 +02:00
Marcel Märtens	db8aedd363	fmt after applying clippy fixes after toolchain update	2021-07-12 12:09:27 +02:00
Marcel Märtens	9b3b21f368	fix clippy warnings	2021-07-12 12:09:09 +02:00
Marcel Märtens	fb4f50002e	update toolchain to nightly-2021-07-06	2021-07-12 00:15:37 +02:00
Samuel Keiffer	2633e9d70c	Merge branch 'sam/buff-stat' into 'master' ... Added buff strength stat to weapons. See merge request veloren/veloren!2586	2021-07-11 19:06:13 +00:00
Samuel Keiffer	89d948c827	Merge branch 'ubruntu/trade-entity-name' into 'master' ... Replace "Player 1" with an NPC name when trading with an NPC See merge request veloren/veloren!2588	2021-07-11 18:27:34 +00:00
ubruntu	6bb47b447e	Replace "Player 1" with an NPC name when trading with an NPC	2021-07-11 18:27:34 +00:00
Sam	be8b12845a	Added buff strength stat to weapons.	2021-07-11 12:50:38 -05:00
Samuel Keiffer	7cf5bc4bb7	Merge branch 'sam/rename-poise-stat' into 'master' ... Renamed poise_strength to effect_power to allow it to be used more generally... See merge request veloren/veloren!2589	2021-07-11 15:13:00 +00:00
Marcel	36a0e58a3d	Merge branch 'Replace-deprecated-constant' into 'master' ... Replace deprecated constant in 'loot_scroller' See merge request veloren/veloren!2590	2021-07-11 12:40:12 +00:00
Dr. Dystopia	01a118efc5	Replace deprecated constant in 'loot_scroller'	2021-07-11 13:13:36 +02:00
Knightress Paladin	146f86be2c	Removed references to Healing Beam, which Healing Aura is replacing	2021-07-10 21:39:11 -07:00
Sam	fbcc774911	Renamed poise_strength to effect_power to allow it to be used more generally with other weapons in the future.	2021-07-10 23:22:00 -05:00
Knightress Paladin	42c3872528	Added healing aura duration skill to voxygen UI	2021-07-10 20:02:36 -07:00
Knightress Paladin	b96bb6fc5d	Added combo scaling to healing aura and allowed cultists to use it	2021-07-10 20:02:36 -07:00
Knightress Paladin	b4ec433509	Add healing aura for sceptre M2	2021-07-10 20:02:35 -07:00
Marcel	7b7d0c0504	Merge branch 'szabo_lambert/hungarian_translation' into 'master' ... Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files) See merge request veloren/veloren!2580	2021-07-10 17:25:57 +00:00
Szabó Lambert	0140e75ed4	Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files)	2021-07-10 17:25:56 +00:00
Marcel	9e841a7dea	Merge branch 'alphyr/update_wasmer' into 'master' ... Update wasmer to 2.0 See merge request veloren/veloren!2585	2021-07-10 15:19:25 +00:00
Benoît du Garreau	286037166a	Update wasmer	2021-07-10 15:06:51 +02:00
Samuel Keiffer	351a68944b	Merge branch 'juliancoffee/skill_truth' into 'master' ... Move skill boost modifiers to skills module See merge request veloren/veloren!2540	2021-07-09 23:05:48 +00:00
Samuel Keiffer	f7a97f2de5	Merge branch 'Replace-deprecated-constant' into 'master' ... Replace deprecated constant in 'chat' See merge request veloren/veloren!2581	2021-07-09 21:00:16 +00:00
Jonathan Berglin	00434b25c0	Replace deprecated constant in 'chat'	2021-07-09 21:00:15 +00:00
Marcel	6d63461222	Merge branch 'xMAC94x/fix_test_not_running_in_merge_train' into 'master' ... xMAC94x/fix test not running in merge train See merge request veloren/veloren!2524	2021-07-09 18:15:19 +00:00
Marcel Märtens	88fb4deebf	allow optinal releases on master if its no merge_request to allow it on forks, also adjust the workflow rules to run on release branches ... ignore Gitlab user also for releases, as all protected branches are synced	2021-07-09 19:06:39 +02:00
Samuel Keiffer	32c2807ee0	Merge branch 'swrup/fix_melee_hit_count_increment' into 'master' ... fix melee hit_count increment See merge request veloren/veloren!2574	2021-07-09 16:17:51 +00:00
swrup	02151417f2	fix melee hit_count increment	2021-07-09 16:17:51 +00:00
Samuel Keiffer	b725cf57bb	Merge branch 'knightresspaladin/fix-melee-leap' into 'master' ... Added check to prevent melee leaps from stalling in liquids See merge request veloren/veloren!2584	2021-07-09 15:02:13 +00:00
Marcel Märtens	6efe3523d5	test on merge event rather than branch name master as a fork could also have a branch master	2021-07-09 11:19:22 +02:00
Marcel Märtens	fcc6bb819b	make sure that all CI jobs run always and not only in branch	2021-07-09 11:19:20 +02:00
Marcel	1c8e47b9b1	Merge branch 'caldog20/patch_chat_scrolling_#1203' into 'master' ... Prevent chat from scrolling with new messages while reading history. See merge request veloren/veloren!2583	2021-07-09 08:57:47 +00:00
Knightress Paladin	c5c89e8662	Added check to prevent melee leaps from stalling in liquids	2021-07-08 23:52:00 -07:00
Samuel Keiffer	cc505faa66	Merge branch 'swrup/apply_attack_return_bool' into 'master' ... make apply_attack() return if attack was actually applied See merge request veloren/veloren!2582	2021-07-09 01:04:01 +00:00
Caleb	ffeb936601	Prevent chat from scrolling with new messages if not already at the bottom to allow players to read history	2021-07-08 20:01:07 -05:00
Swrup	a8579670cf	make apply_attack() return if attack was actually applied	2021-07-08 21:05:32 +02:00
Marcel	8bb5fb6c14	Merge branch 'xMAC94x/dependencies' into 'master' ... update dependencies See merge request veloren/veloren!2577	2021-07-08 16:40:37 +00:00
Marcel	4b1a3891df	Merge branch 'Refactor-prepare_tab_completion-function' into 'master' ... Convert 'prepare_tab_completion' to ternary operation in 'chat' file See merge request veloren/veloren!2579	2021-07-08 15:25:50 +00:00
Dr. Dystopia	7ded50a668	Convert 'prepare_tab_completion' to ternary operation in 'chat' file	2021-07-08 16:38:27 +02:00
Marcel Märtens	98800c5424	update depednencies	2021-07-08 12:21:02 +02:00
Samuel Keiffer	72fa4f2180	Merge branch 'knightresspaladin/sceptre-ai' into 'master' ... Knightresspaladin/sceptre ai See merge request veloren/veloren!2572	2021-07-08 03:43:42 +00:00
Knightress Paladin	adc337530c	Merge branch 'knightresspaladin/sceptre-ai' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/sceptre-ai	2021-07-07 20:03:26 -07:00
Knightress Paladin	d0bb7004ab	Added check to prevent sceptre AI from canceling its own ward	2021-07-07 20:01:00 -07:00
Knightress Paladin	65d67ef781	Clean up sceptre ai code before merge	2021-07-07 20:00:35 -07:00
Knightress Paladin	63c5d9f7df	Fixed formatting	2021-07-07 20:00:35 -07:00
Knightress Paladin	ba35aaaf90	Add check to see if cultist already has ward buff	2021-07-07 20:00:35 -07:00
Knightress Paladin	35242c71e1	Added sceptre tactic and sceptre cultists	2021-07-07 20:00:01 -07:00