Commit Graph

15137 Commits

Author SHA1 Message Date
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05:00
Imbris
d8a0e83d61 Merge branch 'crabman/veloren-common-dep-fix' into 'master'
Fix enum-map dependency of veloren-common

See merge request veloren/veloren!4185
2023-11-16 21:42:57 +00: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
Isse
e0e7fe499d despawn with volume mount 2023-11-15 11:58:26 +01:00
Isse
7856aac713 Remove dead code and factor out into Dir::random_2d 2023-11-15 11:58:26 +01:00
Isse
78120e4db5 remove trailing whitespace 2023-11-15 11:58:26 +01:00
Isse
e0dbba0279 clippy fixes 2023-11-15 11:58:26 +01:00
Isse
7fd255ec6c bug fixes and airships land at airship stations 2023-11-15 11:58:26 +01:00
Isse
1f195fd848 Make vehicles npcs and npc uid used in rtsim commands 2023-11-15 11:58:26 +01:00
unknown
bd8fd35e62 Update Burning Potion model 2023-11-14 23:07:10 -03:00
Samuel Keiffer
b9bfb3f1dd Merge branch 'sam/precision' into 'master'
Changed criticals to precision

See merge request veloren/veloren!4154
2023-11-14 23:53:57 +00:00
Sam
13148bd436 Changed how max precision was calculated to make it more compact. 2023-11-14 18:16:42 -05:00
Sam
fb3d0208b9 Changelog 2023-11-14 18:10:51 -05:00
Sam
49756ac37c Headshots from above are less precise, headshots from below are no longer precise. 2023-11-14 18:07:02 -05:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Maxicarlos08
1d1b51fa51 Adjust precision power 2023-11-14 18:07:01 -05:00
Sam
f47b61d446 Adjusted precision multipliers. 2023-11-14 18:07:00 -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
d3b3bca621 Added precision 2023-11-14 18:06:59 -05:00
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Samuel Keiffer
9b878586bf Merge branch 'poperigby/fire-potion' into 'master'
Add Burning Potion that applies the Burning effect to the user

See merge request veloren/veloren!4174
2023-11-14 02:00:52 +00:00
PopeRigby
688fd67c33 Add Burning Potion that applies the Burning effect to the user 2023-11-14 02:00:50 +00:00
Samuel Keiffer
fdb28ec2dd Merge branch 'sam/buff-maps' into 'master'
Changed buffs from using hash maps to an enum map and a slot map.

See merge request veloren/veloren!4182
2023-11-14 01:49:49 +00:00
Samuel Keiffer
a4ff592547 Merge branch 'sam/agent-combat-state' into 'master'
Split action state into two sets of state, one each for combat and behavior.

See merge request veloren/veloren!4183
2023-11-12 18:19:07 +00:00
Sam
a4df3f8ad5 Split action state into two sets of state, one each for combat and behavior. 2023-11-12 12:45:03 -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
Samuel Keiffer
ef858ef72b Merge branch 'crabman/buff-stacking' into 'master'
Re-enable buff stacking for short buffs

See merge request veloren/veloren!4181
2023-11-12 16:56:10 +00:00
Maxicarlos08
7382f70f1e
Re-enable buff stacking for short buffs 2023-11-12 17:17:20 +01:00
Samuel Keiffer
d7b07ee250 Merge branch 'sam/beam-collision-fix' into 'master'
Fix beam collision

See merge request veloren/veloren!4178
2023-11-11 21:13:43 +00:00
Sam
e37f085114 Changed terrain check to use beam position instead of entity position. 2023-11-11 15:17:59 -05:00
Isse
2703f4031d Merge branch 'terrain-frag-hotfix' into 'master'
Put ice_reflections under REFLECTION_MODE_HIGH

See merge request veloren/veloren!4177
2023-11-10 12:39:19 +00:00
Isse
db1480b564 put ice_reflections under REFLECTION_MODE_HIGH 2023-11-10 12:53:09 +01:00
Christof Petig
424006e000 Merge branch 'site_rock_circle' into 'master'
site_rock_circle

See merge request veloren/veloren!4175
2023-11-10 00:31:04 +00:00
flo
9d52110a49 site_rock_circle 2023-11-10 00:31:03 +00:00
Christof Petig
0ddd40336a Merge branch 'zesterer/worldgen' into 'master'
Various worldgen improvements

See merge request veloren/veloren!4152
2023-11-10 00:15:29 +00:00
Joshua Barretto
1cf811b366 Merge branch 'master' into 'master'
Fixed French Translation

See merge request veloren/veloren!4172
2023-11-09 19:41:06 +00:00
Sorann753
a63debe1b7 Fixed French Translation 2023-11-09 19:41:05 +00:00
Joshua Barretto
5418f49ecb Fixed broken savannah pit altitude 2023-11-08 23:19:02 +01:00
Joshua Barretto
84e59c52fb Made portal fizz better convey access 2023-11-08 23:19:02 +01:00
Joshua Barretto
23e239275c Better mesa basement 2023-11-08 23:19:02 +01:00
Joshua Barretto
83dc22dfbf Made ice reflective 2023-11-08 23:19:00 +01:00
Joshua Barretto
05863eb1ef Better mesa layer colours 2023-11-08 23:17:34 +01:00
Joshua Barretto
48ebe004c0 Added mesa generation 2023-11-08 23:17:34 +01:00
Christof Petig
d193e03a03 Merge branch 'christof/kits_in_plugins' into 'master'
support adding kits, presets and resource experience by plugins

See merge request veloren/veloren!4173
2023-11-07 23:06:17 +00:00
Christof Petig
e7e4c20445 fix test and code quality 2023-11-07 22:54:19 +01:00
Christof Petig
2fbdf42360 support adding kits, presets and resource experience by plugins 2023-11-07 20:24:13 +01:00
Samuel Keiffer
08171b378c Merge branch 'crabman/disable-buff-stacking' into 'master'
Disable selfbuff stacking

See merge request veloren/veloren!4163
2023-11-05 19:18:12 +00:00
flo
bae450146b Merge branch 'uniior/starter-glider' into 'master'
Starter glider.

See merge request veloren/veloren!4160
2023-11-04 22:09:00 +00:00
Uniior
1d8a23c30e Starter glider. 2023-11-04 22:09:00 +00:00