14702 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christof Petig	c0b56671ec	hang wreaths at the fireplace	2023-12-14 23:29:32 +01:00
Christof Petig	9b485456eb	Calendar based gear for villagers	2023-12-14 16:31:48 +01:00
Isse	ba02d083da	Merge branch 'isse/walk-toggle' into 'master' ... Roleplay stuff See merge request veloren/veloren!4171	2023-12-12 19:59:58 +00:00
Isse	b654c2f923	expect instead of unwrap	2023-12-12 20:20:03 +01:00
Isse	96a3c81cbb	fix captain dismounting and don't panic in RandomField::choose	2023-12-12 20:14:39 +01:00
Isse	8569f30336	review fixes	2023-12-12 19:41:40 +01:00
Isse	850112bd72	typo fix and add some adjectives to tavern namegen	2023-12-12 19:28:12 +01:00
Isse	5361b290df	make vec2 make more sense	2023-12-12 19:25:06 +01:00
Samuel Keiffer	776cf2fb76	Merge branch 'hrom/agile-icon-fix' into 'master' ... fixed perforate icon not displaying See merge request veloren/veloren!4203	2023-12-09 16:45:08 +00:00
flo	8a4ada0407	Merge branch 'Neras/cobalt&blood-armor_buff' into 'master' ... added 10 armor stat for cobalt and bloodstone sets See merge request veloren/veloren!4206	2023-12-08 14:40:43 +00:00
Neras	10513091e0	added 10 armor stat for cobalt and bloodstone sets	2023-12-08 14:40:42 +00:00
Isse	57bf7cfdac	place rooms at correct alt, remove walls between gardens	2023-12-07 22:34:58 +01:00
Joshua Barretto	fbd72f7400	Better walking animation	2023-12-07 20:08:40 +01:00
Isse	110e36e468	add to changelog	2023-12-07 20:08:37 +01:00
Isse	1000b7b73f	better colors for tavern	2023-12-07 20:08:03 +01:00
Isse	b60ebd4131	don't show red text when walking	2023-12-07 20:08:03 +01:00
Isse	2097a499c7	cancel walking on some inputs	2023-12-07 20:08:03 +01:00
Isse	96a70d760c	clippyyyyy	2023-12-07 20:08:03 +01:00
Isse	7a1612aa8a	small fixes	2023-12-07 20:08:03 +01:00
Isse	ee4c6d006f	More advanced roofs	2023-12-07 20:08:03 +01:00
Isse	5a31b17bc3	Add simple roofs	2023-12-07 20:08:03 +01:00
Isse	a9191b96a9	better stairs	2023-12-07 20:08:03 +01:00
Isse	6e19abd7ec	stairs	2023-12-07 20:08:03 +01:00
Isse	e8f8f20ad0	somewhat 3d layouting	2023-12-07 20:08:03 +01:00
Isse	a3a19ecc3a	tavern rtsim	2023-12-07 20:08:03 +01:00
Isse	c1aa9bd1b6	move some details to generate	2023-12-07 20:08:03 +01:00
Isse	4fa52db71d	more work on tavern	2023-12-07 20:08:03 +01:00
Isse	9903b53105	working rooms	2023-12-07 20:08:03 +01:00
Isse	eb2395a401	walk fixes	2023-12-07 20:08:03 +01:00
Isse	ecb85a0534	Tavern room layout	2023-12-07 20:08:02 +01:00
Isse	63e500d3d8	laying and steering animation	2023-12-07 20:08:02 +01:00
Isse	5320f83462	configurable walking speed	2023-12-07 20:08:02 +01:00
Hrom	de42ffdfd8	fixed perforate icon not displaying	2023-12-06 23:38:22 +01:00
Joshua Barretto	8d35450d3f	Merge branch 'zesterer/git-gc-before-tag-push' into 'master' ... Perform a cleanup before publishing a tag See merge request veloren/veloren!4201	2023-11-30 10:59:42 +00:00
Joshua Barretto	777874c805	Perform a cleanup before publishing a tag	2023-11-30 10:17:06 +00:00
Samuel Keiffer	233f1d6bac	Merge branch 'qsto/phoenix' into 'master' ... Phoenix overhaul See merge request veloren/veloren!4073	2023-11-28 11:13:18 +00:00
Michał	14120232a0	Phoenix overhaul	2023-11-28 11:13:18 +00:00
Samuel Keiffer	3d9d3d9419	Merge branch 'crabman/basicmelee-hit-timing' into 'master' ... Add hit_timing to BasicMelee See merge request veloren/veloren!4193	2023-11-27 21:47:30 +00:00
Maxicarlos08	2da97747e5	Addressed review comments	2023-11-27 21:29:13 +01:00
maxicarlos08	d05586f08a	fix small precision bug	2023-11-27 21:28:12 +01:00
maxicarlos08	fc3634aaa8	changelog	2023-11-27 21:28:12 +01:00
maxicarlos08	c7ee737fef	Add hit_timing to BasicMelee	2023-11-27 21:28:12 +01:00
Christof Petig	256afc1960	Merge branch 'crabman/precision-ui-fix' into 'master' ... fix stat UI bug for modular components while trading See merge request veloren/veloren!4196	2023-11-27 19:25:41 +00:00
Isse	73c0a02851	Merge branch 'crabman/curios-potion-loot-protection' into 'master' ... Don't allow bypassing loot protection with curious potion See merge request veloren/veloren!4199	2023-11-27 18:34:21 +00:00
Maxicarlos08	1cf733597d	Don't allow bypassing loot protection with curious potion	2023-11-27 18:54:20 +01:00
Maxicarlos08	c689708ec9	fix stat UI bug while trading	2023-11-26 20:22:59 +01:00
Isse	69e827dfda	Merge branch 'isse/very-cool-commands' into 'master' ... Target any entity with commands, and a few new commands. See merge request veloren/veloren!4192	2023-11-26 15:13:45 +00:00
Isse	a4caa2bc26	use Result::or for Either::from_str	2023-11-26 15:37:14 +01:00
flo	e9ae0a4c9e	Merge branch 'clifftown_relocation' into 'master' ... clifftown_relocation See merge request veloren/veloren!4194	2023-11-25 20:58:05 +00:00
flo	daff899f37	clifftown_relocation	2023-11-25 20:58:05 +00:00