14710 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
flo	ecde64a30f	Merge branch 'jcoxeye/resin-seeds-embers-selling' into 'master' ... Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron See merge request veloren/veloren!4212	2023-12-17 22:49:56 +00:00
flo	f0754021ae	Merge branch 'do-no-van/armor-offset-fixes' into 'master' ... fix typo and armor offsets See merge request veloren/veloren!4213	2023-12-17 22:44:44 +00:00
do-no-van	b5eaa58728	fix typo and armor offsets	2023-12-17 22:44:43 +00:00
flo	0a42a51810	Merge branch 'poise_resilience_buffs' into 'master' ... poise_resilience_buffs_for_dagon_and_wyverns See merge request veloren/veloren!4207	2023-12-17 20:12:13 +00:00
flo	6f5e385d2a	poise_resilience_buffs_for_dagon_and_wyverns	2023-12-17 20:12:13 +00:00
JCoxeye	00434f55c9	Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron	2023-12-17 12:41:27 -05:00
flo	f075b1d654	Merge branch 'uniior/barrels' into 'master' ... Crate and Barrel sprites See merge request veloren/veloren!4210	2023-12-17 16:17:14 +00:00
Uniior	737b5761f6	Crate and Barrel sprites	2023-12-17 16:17:14 +00:00
flo	18fd06fd88	Merge branch 'isse/crustacean-skeleton' into 'master' ... crustacean-skeleton and crab See merge request veloren/veloren!4200	2023-12-16 13:47:56 +00:00
flo	569ab5c5ed	crustacean-skeleton and crab	2023-12-16 13:47:55 +00: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