Commit Graph

4599 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
Maxicarlos08
551d783cac
Use correct scaling for volume entity collisions 2024-01-02 23:42:14 +01: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
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
8e76aaceb8 make_crustaceans_tameable 2023-12-26 19:55:21 +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
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
Uniior
737b5761f6 Crate and Barrel sprites 2023-12-17 16:17:14 +00:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
f55a70a2a8 fix doctest 2023-12-16 14:40:26 +01:00
Christof Petig
4b7f3d07d2 add hirdrasil ornament variants and fix clippy 2023-12-16 12:10:17 +01:00
Christof Petig
9b485456eb Calendar based gear for villagers 2023-12-14 16:31:48 +01:00
Isse
8569f30336 review fixes 2023-12-12 19:41:40 +01:00
Isse
a3a19ecc3a tavern rtsim 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
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
HEIEnthusiast
7d7937df36 , 2023-11-28 13:42:24 -04:00
HEIEnthusiast
2497c04a63 Code quality fix :( 2023-11-28 12:11:34 -04:00
HEIEnthusiast
5001c4a262 Added swiftness debuffs 2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0 Swiftness potion changes 2023-11-28 10:03:07 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +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
c7ee737fef
Add hit_timing to BasicMelee 2023-11-27 21:28:12 +01:00
HEIEnthusiast
b6c67a7f41 Made handle_jump use it's own jump_modifier stat 2023-11-27 16:15:29 -04:00
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
Py bit
e0de63dbf8 Update buff.rs 2023-11-27 12:25:23 +00:00
Py bit
16b873590b Update buff.rs 2023-11-27 12:02:54 +00:00
Py bit
0074be2339 Update buff.rs 2023-11-27 11:39:30 +00: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
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
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Isse
a151a6f550 tether length argument 2023-11-23 22:22:34 +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
maxicarlos08
4456643867
Don't use attacker orientation for calculating melee precision 2023-11-23 00:55:17 +01:00
Isse
34edfdb7a2 link related commands 2023-11-22 23:10:32 +01:00
Isse
1071fd0bca entity targets 2023-11-22 22:40:56 +01:00
Isse
456c0ad3e8 Merge branch 'isse/rtsim-vehicles' into 'master'
Unify RTSim vehicles and NPCs

See merge request veloren/veloren!4168
2023-11-22 14:53:58 +00: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