5374 Commits

Author	SHA1	Message	Date
Pybit	f6204f9d04	Merge branch 'master' into 'More-potions' ... # Conflicts: # CHANGELOG.md	2024-01-04 11:48:30 +00:00
Joaquin Tornello	0ecfbce4d2	Feat: Day duration slider on map creation UI (#1909)	2024-01-03 22:21:53 +00:00
Pybit	26520b51ef	Added previously requested changes	2024-01-03 12:31:35 +00:00
Imbris	fc28629148	Convert to rgb earlier in screenshot process. ... Also add path information to logs when screenshot folder or file creation fails.	2024-01-01 16:45:44 -05:00
Imbris	35fc92f872	Merge branch 'screenshot' into 'master' ... Don't include an alpha channel when creating a screenshot file. See merge request veloren/veloren!4222	2024-01-01 21:41:41 +00:00
Samuel Keiffer	5bd089c56d	Merge branch 'sam/remove-combo-melee' into 'master' ... Deprecated combo melee character state See merge request veloren/veloren!4233	2023-12-29 17:29:44 +00:00
Sam	8ee054a462	Fix tests	2023-12-29 11:50:18 -05:00
DaforLynx	0b62898060	Audio fixes and new music	2023-12-29 00:25:08 +00:00
Sam	f65d449aa3	Deprecated combo melee character state	2023-12-28 19:02:10 -05:00
flo	c123bdaef5	various_small_fixes	2023-12-27 07:30:22 +00:00
Darren Salt	4156dd56f3	Don't include an alpha channel when creating a screenshot file.	2023-12-21 17:14:07 +00:00
Christof Petig	5af8c4687e	Merge branch 'christof/christmas23' into 'master' ... Christmas theme revival See merge request veloren/veloren!4209	2023-12-20 17:02:01 +00:00
flo	569ab5c5ed	crustacean-skeleton and crab	2023-12-16 13:47:55 +00:00
Christof Petig	dd8850770e	remove variation debugging output	2023-12-16 12:11:12 +01:00
Christof Petig	4b7f3d07d2	add hirdrasil ornament variants and fix clippy	2023-12-16 12:10:17 +01:00
Christof Petig	611b55b279	PRNG experiments	2023-12-15 17:27:15 +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	96a3c81cbb	fix captain dismounting and don't panic in RandomField::choose	2023-12-12 20:14:39 +01:00
Joshua Barretto	fbd72f7400	Better walking animation	2023-12-07 20:08:40 +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	a3a19ecc3a	tavern rtsim	2023-12-07 20:08:03 +01:00
Isse	4fa52db71d	more work on tavern	2023-12-07 20:08:03 +01:00
Isse	eb2395a401	walk fixes	2023-12-07 20:08:03 +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
HEIEnthusiast	933c897450	Renamed to potion of agility, burning potion to combustion	2023-12-05 14:15:54 -04:00
HEIEnthusiast	99b5571fd8	Renamed swiftness to retreating, changed model	2023-12-05 13:09:14 -04:00
Py bit	53600a941d	Update mod.rs	2023-11-29 17:03:17 +00:00
HEIEnthusiast	db71625226	Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions	2023-11-28 10:07:00 -04:00
Michał	14120232a0	Phoenix overhaul	2023-11-28 11:13:18 +00:00
maxicarlos08	c7ee737fef	Add hit_timing to BasicMelee	2023-11-27 21:28:12 +01:00
HEIEnthusiast	bb2adfb2e5	Removed strength and regeneration potions	2023-11-27 15:16:44 -04:00
HEIEnthusiast	783cfdc719	Merge branch 'master' into More-potions	2023-11-27 07:00:48 -04:00
HEIEnthusiast	59c3162c49	Merge branch 'master' of https://gitlab.com/veloren/dev/veloren ... 12 commits behind master fix	2023-11-27 06:32:18 -04:00
HEIEnthusiast	ac4101e70d	Changed textures, added strength pot	2023-11-27 06:25:58 -04:00
Maxicarlos08	c689708ec9	fix stat UI bug while trading	2023-11-26 20:22:59 +01:00
HEIEnthusiast	0bb74f9efe	Added swiftness and regeneration potions	2023-11-26 10:54:02 -04:00
Isse	31f67a97b3	clippy fix	2023-11-23 12:06:58 +01:00
Isse	88a7e1de86	better tab completion for uid	2023-11-23 11:08:21 +01:00
Isse	4d8bcf0a92	only preprocess for entity target argument	2023-11-23 11:04:30 +01:00
Isse	5a3e6316a5	fix tethering	2023-11-23 01:01:31 +01:00
Isse	51c67d7394	client shorthands	2023-11-22 23:40:13 +01:00
Isse	1071fd0bca	entity targets	2023-11-22 22:40:56 +01:00
Sam	4e0e94b5c6	Removed spin melee character state	2023-11-16 19:17:38 -05:00
maxicarlos08	a5199a966a	Include required serde feature for enum-map in veloren-common ... This previously broke torvus builds, but worked fine for builds here since veloren-rtsim enabled the serde feature.	2023-11-16 21:47:44 +01:00
Maxicarlos08	17904d9387	crit_power -> precise_power	2023-11-14 18:07:01 -05:00
Sam	6814ce8134	Addressed review comments.	2023-11-14 18:07:00 -05:00
Sam	01d1e15be3	Fixed UI crash	2023-11-14 18:06:59 -05:00