Sam
|
99b5631d9d
|
Turn towards center of sprite instead of corner.
|
2021-09-01 17:24:09 -04:00 |
|
juliancoffee
|
2f6d029d44
|
(en) i18n cleaning
|
2021-09-01 19:38:59 +03:00 |
|
Joshua Barretto
|
418b9928bd
|
Merge branch 'zesterer/tiny-fixes' into 'master'
Worldgen hotfix
See merge request veloren/veloren!2797
|
2021-09-01 12:47:50 +00:00 |
|
Samuel Keiffer
|
1c61153b81
|
Merge branch 'knightresspaladin/block-tweaks' into 'master'
Make parrying refund the block stamina cost and cancel the recover animation
See merge request veloren/veloren!2792
|
2021-09-01 11:50:49 +00:00 |
|
Joshua Barretto
|
71f30d7b68
|
Tree trunk color differences
|
2021-09-01 12:49:35 +01:00 |
|
Joshua Barretto
|
2081c20a88
|
Improved tree hanging and cedar distribution
|
2021-09-01 12:09:15 +01:00 |
|
Joshua Barretto
|
4b7fc1f4bb
|
Made ore streams mineable
|
2021-09-01 12:05:00 +01:00 |
|
Marcel
|
ca518c15c5
|
Merge branch 'xMAC94x/CodeOfConduct' into 'master'
add smaller variant of the code of conduct and include feedback
See merge request veloren/veloren!2701
|
2021-09-01 10:03:00 +00:00 |
|
Knightress Paladin
|
ae0be40dd5
|
Make parrying refund the block stamina cost and cancel the recover animation
|
2021-08-31 23:46:33 -07:00 |
|
Imbris
|
0b922deed6
|
Merge branch 'capucho/naga' into 'master'
Replace shaderc with naga
See merge request veloren/veloren!2749
|
2021-08-31 22:38:17 +00:00 |
|
João Capucho
|
0476f9ce0b
|
Replace shaderc with naga
|
2021-08-31 22:53:10 +01:00 |
|
Joshua Barretto
|
33db9281e6
|
Merge branch 'sam/sprite-interaction' into 'master'
Sprite Interaction
See merge request veloren/veloren!2790
|
2021-08-31 18:42:16 +00:00 |
|
Sam
|
8bc237142a
|
Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite.
|
2021-08-31 13:57:17 -04:00 |
|
Sam
|
f1a9f5cfed
|
Moved pathfinding check to after distance check. Added a clear fallback for cases where sprite is not added to match statement.
|
2021-08-31 13:37:57 -04:00 |
|
Sam
|
689c69b8fc
|
Sprites that are colelctible but not explciitly added to SpriteInteractKind match statement have a default value to allow collection.
|
2021-08-31 13:37:56 -04:00 |
|
Sam
|
6d27b6eeea
|
No longer send collect inventory event if interactable sprite kind cannot be found.
|
2021-08-31 13:37:56 -04:00 |
|
Sam
|
c8459dbdcb
|
Removed distance check from sprite colelction event handling as it is already checked when entering state.
|
2021-08-31 13:37:56 -04:00 |
|
Sam
|
878bea8091
|
Fixed interaction to work underwater.
|
2021-08-31 13:37:55 -04:00 |
|
Sam
|
0d87e00956
|
Changelog and added arm length (body radius) to sprite pickup range.
|
2021-08-31 13:37:53 -04:00 |
|
Sam
|
e8636a8350
|
Sprite interaction now uses pathfinding to check that it can be picked up.
|
2021-08-31 13:37:36 -04:00 |
|
Sam
|
21f75f31a2
|
Added simple distance check for sprite interaction.
|
2021-08-31 13:37:36 -04:00 |
|
Sam
|
018f9ae53f
|
Entities will now attempt to orient towards the sprite they are interacting with.
|
2021-08-31 13:37:36 -04:00 |
|
jshipsey
|
0acd5c6d92
|
finished anim
|
2021-08-31 13:37:35 -04:00 |
|
Sam
|
ac6f00cbae
|
Added attack hook event, attacks now cancel item use and sprite interaction.
|
2021-08-31 13:37:32 -04:00 |
|
Sam
|
0f7e0b4152
|
Fixed compile error when importing sprite position.
|
2021-08-31 13:36:05 -04:00 |
|
jshipsey
|
c7690958b6
|
anim basics
|
2021-08-31 13:36:04 -04:00 |
|
Sam
|
984e39f1a2
|
Sprites now go through a character state to be picked up.
|
2021-08-31 13:36:04 -04:00 |
|
Joshua Barretto
|
ea04c17cf7
|
Merge branch 'xvar/fix-egui-toggle' into 'master'
Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled
See merge request veloren/veloren!2793
|
2021-08-31 17:07:13 +00:00 |
|
Ben Wallis
|
3a27787b21
|
Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled
|
2021-08-31 17:21:13 +01:00 |
|
Joshua Barretto
|
5ac13d6875
|
Merge branch 'zesterer/tiny-fixes' into 'master'
Tiny fixes
See merge request veloren/veloren!2791
|
2021-08-31 13:15:29 +00:00 |
|
Joshua Barretto
|
ab3c6989b4
|
Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed
|
2021-08-31 13:31:52 +01:00 |
|
Joshua Barretto
|
03f852542b
|
Make arrows 'bonk' hanging sprites
|
2021-08-31 13:31:27 +01:00 |
|
Joshua Barretto
|
fe09ddfd67
|
Merge branch 'zesterer/spots' into 'master'
Spots
See merge request veloren/veloren!2695
|
2021-08-31 12:03:47 +00:00 |
|
Joshua Barretto
|
caebc891f8
|
Removed unused tree assets
|
2021-08-31 10:15:52 +01:00 |
|
Monty Marz
|
2e5414d3e0
|
fix witch hut smoke
|
2021-08-30 12:03:13 +02:00 |
|
Joshua Barretto
|
f6da0ca2f0
|
Improved giant trees
|
2021-08-30 00:03:16 +01:00 |
|
Joshua Barretto
|
32807f6019
|
Smaller acacia
|
2021-08-29 20:38:40 +01:00 |
|
Joshua Barretto
|
e6ec217c7c
|
Snow on spots
|
2021-08-29 20:09:48 +01:00 |
|
Joshua Barretto
|
1a5457b59f
|
Added tree roots
|
2021-08-29 19:17:58 +01:00 |
|
Joshua Barretto
|
bfbcb8bb57
|
More tree variety
|
2021-08-29 18:38:34 +01:00 |
|
Joshua Barretto
|
7d23b9c9ea
|
More spot detailing
|
2021-08-29 14:54:01 +01:00 |
|
Joshua Barretto
|
a6a8a8ae48
|
Improved giant trees
|
2021-08-29 14:37:11 +01:00 |
|
Joshua Barretto
|
2e72d97b5e
|
Multiple color gradient options
|
2021-08-29 13:57:36 +01:00 |
|
Joshua Barretto
|
d10ecc0ddf
|
Better spot density
|
2021-08-29 13:08:13 +01:00 |
|
Joshua Barretto
|
51d8b14790
|
Added spot loot
|
2021-08-29 12:50:35 +01:00 |
|
Samuel Keiffer
|
2107481021
|
Merge branch 'sam/fix-arrow-terrain-bug' into 'master'
Arrows no longer deal damage seconds after colliding with terrain
See merge request veloren/veloren!2786
|
2021-08-28 23:11:50 +00:00 |
|
Sam
|
42e9548806
|
Renamed variable to make more explicit what it does.
|
2021-08-28 18:31:44 -04:00 |
|
Joshua Barretto
|
d22db59274
|
More spots
|
2021-08-28 16:48:34 +01:00 |
|
Monty Marz
|
70ddb8ec14
|
witch lantern
|
2021-08-28 14:53:31 +01:00 |
|
Monty Marz
|
6e36d2e6c3
|
witch kit
|
2021-08-28 14:53:31 +01:00 |
|