Commit Graph

5361 Commits

Author SHA1 Message Date
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
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
Maxicarlos08
c689708ec9
fix stat UI bug while trading 2023-11-26 20:22:59 +01: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
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Sam
3f19c61426 Changed buffs from using hash maps to an enum map and a slot map. 2023-11-12 12:37:28 -05:00
Isse
48d95e7699 SnowGlitter experimental shader 2023-11-02 12:53:34 +01:00
Christof Petig
f73f52605f Support recipes and item images from plugins 2023-10-25 00:05:35 +02:00
Joshua Barretto
22b537a4e5 Fixed CI and incorrect vel 2023-10-21 14:58:13 +01:00
Joshua Barretto
ac7f6872db Fixed typo 2023-10-21 13:51:42 +01:00
Joshua Barretto
7589774967 Renamed tether renderer to rope, fixed tether lengths 2023-10-21 13:51:42 +01:00
Joshua Barretto
879a28fbb6 Fixed warnings 2023-10-21 13:51:41 +01:00
Joshua Barretto
deca7ae258 Finished adding tether graphics 2023-10-21 13:51:40 +01:00
Joshua Barretto
9a72d52c48 Began adding tether visuals 2023-10-21 13:49:04 +01:00
Joshua Barretto
5a41d7e33e Added cart, notion of rolling resistance (hacky) 2023-10-21 13:49:04 +01:00
DaforLynx
fd28f10dff Address comment by zesterer 2023-10-20 10:12:22 -07:00
jshipsey
1b8265803e comments addressed 2023-10-19 11:23:55 -04:00