Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,965 Commits 151 Branches 18 Tags
Commit Graph

9965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Monty Marz
b501c06471 emergency single voxel window fix 2021-08-28 14:53:30 +01:00
Monty Marz
5e9782b288 fixes 2021-08-28 14:53:30 +01:00
Monty Marz
57746d7083 fixes 2021-08-28 14:53:30 +01:00
Joshua Barretto
a31eee0148 Better entity placement for spots 2021-08-28 14:53:30 +01:00
Joshua Barretto
4501faa505 Fixed missing sprites 2021-08-28 14:53:30 +01:00
Monty Marz
f3b56796ed witch stuff 2021-08-28 14:53:30 +01:00
Joshua Barretto
7ae50e3a9f Reduced leaf noise for spots 2021-08-28 14:53:30 +01:00
Monty Marz
599aa8135a taiga and savannah definitions 2021-08-28 14:53:30 +01:00
Joshua Barretto
61df16bfe2 Removed quirky tree-like structures 2021-08-28 14:53:30 +01:00
Monty Marz
df46f5bcb0 lion rock 
fixes
 2021-08-28 14:53:30 +01:00
Joshua Barretto
00f896b280 Prevented trees spawning near spots 2021-08-28 14:53:30 +01:00
Monty Marz
856349ee45 Update spot.rs 2021-08-28 14:53:30 +01:00
Monty Marz
0594ffc4ae More spots 2021-08-28 14:53:30 +01:00
Joshua Barretto
3a7c3eabad Added random units for spots 2021-08-28 14:53:30 +01:00