15797 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
crabman	0b9c2621f7	Merge branch 'crab/forgemaster-room-hotfix' into 'master' ... fix error in the forgemaster boss room model See merge request veloren/veloren!4446	2024-05-02 06:56:53 +00:00
Gemu Peachems	982806ba76	fix error in the forgemaster boss room model	2024-05-02 06:40:04 +00:00
crabman	06b6c60112	Merge branch 'horblegorble/changelog-edits' into 'master' ... order and wording edits to new entries; add entry for orichalcum ingots See merge request veloren/veloren!4443	2024-05-02 06:37:10 +00:00
horblegorble	3488d15f0c	order and wording edits to new entries; add entry for orichalcum ingots	2024-05-02 06:37:09 +00:00
Isse	d934419742	Merge branch 'isse/fix-tree-crowding' into 'master' ... Use column sample for tree for crowding value See merge request veloren/veloren!4445	2024-05-01 23:31:34 +00:00
Isse	7cb8d12829	use column sample for tree for crowding value	2024-05-02 00:34:56 +02:00
crabman	fabc0dc37c	Merge branch 'orichalcum-tweaks' into 'master' ... giving stats to orichalcum helmet and balancing orichalcum recipes See merge request veloren/veloren!4444	2024-05-01 21:08:38 +00:00
nectical	f717fa7352	giving stats to orichalcum helmet and balancing orichalcum recipes	2024-05-01 21:11:35 +01:00
Isse	11c34e1628	Merge branch 'isse/i18n-crafting-search' into 'master' ... Allow searching in both selected language and fallback langauage in crafting See merge request veloren/veloren!4442	2024-04-29 12:17:22 +00:00
Isse	6c0da4beeb	allow searching in both selected language and fallback langauage in crafting	2024-04-29 13:33:11 +02:00
Samuel Keiffer	a0b1f76b9b	Merge branch 'hammer' into 'master' ... Hammer See merge request veloren/veloren!4429	2024-04-29 00:53:39 +00:00
Sam	38df083e0c	Changelog entry, better placeholder UI, remove test changes	2024-04-28 20:04:07 -04:00
Sam	06728c1865	Static aura now uses Object::DeleteAfter instead of Projectile	2024-04-28 19:43:50 -04:00
Sam	f90a5272f8	Rebalance hammer component stats	2024-04-28 19:43:50 -04:00
Sam	cfc9e498b4	Tweaks	2024-04-28 19:43:50 -04:00
Sam	904623a003	Changed scornful swipe to only give buff on successful hits. Nerfed knockback on most hammer abilities.	2024-04-28 19:43:50 -04:00
Sam	b6fbcbb204	Fixed bugs with negative DR buffs bypassing admin tabard, auras only being cleared if entity had entered_auras component, and shockwaves with 0 combo cost resetting combo. Other balance feedback.	2024-04-28 19:43:50 -04:00
Sam	aeb887963e	Hammer AI	2024-04-28 19:43:50 -04:00
Sam	0dc261c70a	Judgement	2024-04-28 19:43:50 -04:00
Sam	244ffcf03e	Earthshaker	2024-04-28 19:43:49 -04:00
Sam	171125e73e	Seismic shock	2024-04-28 19:43:49 -04:00
Sam	caac8025c6	Thunderclap	2024-04-28 19:43:49 -04:00
Sam	85e9af4e08	Tenacity	2024-04-28 19:43:49 -04:00
Sam	7daa9a29eb	Rampart	2024-04-28 19:43:49 -04:00
Sam	e1ce09e0a1	Upheaval	2024-04-28 19:40:12 -04:00
Sam	b25e91e79a	Iron tempest	2024-04-28 19:40:12 -04:00
Sam	b8de5e414b	Helm Crusher	2024-04-28 19:40:12 -04:00
Sam	38c74bf182	Finish rooted debuff impl and Lung Pummel	2024-04-28 19:40:12 -04:00
Sam	76dc196996	Pile Driver	2024-04-28 19:40:12 -04:00
Sam	90f3b671c3	Breach	2024-04-28 19:40:12 -04:00
Sam	7ed66f29bf	Spine Cracker	2024-04-28 19:40:12 -04:00
Sam	c9c14c9202	Retaliate	2024-04-28 19:40:12 -04:00
Sam	e858b84427	Intercept	2024-04-28 19:40:11 -04:00
Sam	e24ebc381b	Heavy whorl	2024-04-28 19:40:11 -04:00
Sam	909363d33c	Vigorous bash	2024-04-28 19:40:11 -04:00
Sam	89048e9530	Tremor	2024-04-28 19:36:17 -04:00
Sam	cc70685f7a	Scornful swipe	2024-04-28 19:36:17 -04:00
Sam	af755197bb	Wide wallop	2024-04-28 19:36:16 -04:00
Sam	bddced1ab7	Solid smash	2024-04-28 19:36:16 -04:00
Sam	fcfff367c9	Cleanup stuff from old hammer	2024-04-28 19:36:14 -04:00
Sam	78acdcf767	Placeholder UI for skill tree	2024-04-28 19:35:12 -04:00
Sam	09b25d4f74	Initial setup	2024-04-28 19:35:12 -04:00
flo	8fd6216e39	Merge branch 'mine-implementation' into 'master' ... mine-implementation See merge request veloren/veloren!4262	2024-04-28 19:31:18 +00:00
flo	961f49e2af	mine-implementation	2024-04-28 19:31:18 +00:00
crabman	81fea8acb4	Merge branch 'weblate-translation' into 'master' ... Update translation files (Weblate) See merge request veloren/veloren!4439	2024-04-24 17:32:44 +00:00
Otto Richter	80bc0156a0	Update translation files (Weblate)	2024-04-24 17:32:44 +00:00
Christof Petig	cdc1799012	Merge branch 'crabman/revive_test_server' into 'master' ... Revive test-server See merge request veloren/veloren!4353	2024-04-21 13:09:11 +00:00
crabman	e6a9d4434f	fix test-server compile warnings	2024-04-21 09:48:35 +00:00
crabman	a78ad8de79	revive test-server	2024-04-21 09:34:08 +00:00
crabman	52a9cac813	Merge branch 'crabman/loot-protection-fix' into 'master' ... Fix loot protection bugs See merge request veloren/veloren!4437	2024-04-20 09:52:06 +00:00