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
14,215 Commits 151 Branches 18 Tags 2.1 GiB
2d616352a2
Commit Graph

14215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxicarlos08
2d616352a2
grey walled dungeons 2023-08-15 12:24:17 +02:00
Maxicarlos08
73a79b32a1
no dungeons = no dungeons with caves! 2023-08-15 12:24:17 +02:00
Joshua Barretto
38c986fa59 Merge branch 'TelepathicWalrus/stay_follow_pets' into 'master' 
Add stay/follow option for pets

See merge request veloren/veloren!3906
 2023-08-15 10:19:58 +00:00
Joshua Barretto
4b5dd58c2e Merge branch 'treant_sapling_disable_flee' into 'master' 
treant_sapling: disable flee

See merge request veloren/veloren!4074
 2023-08-15 09:53:29 +00:00
flo
9a50a2452e treant_sapling: disable flee 2023-08-15 09:53:28 +00:00
Maxicarlos08
2446ec8940
added changelog entry 2023-08-15 11:11:20 +02:00
Maxicarlos08
13dbf679c5
review 2023-08-15 11:10:54 +02:00
Michal Sroczynski
b7c56c9057
Hud fix 2023-08-15 11:10:54 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent 2023-08-15 11:10:54 +02:00
TelepathicWalrus
2cb8e2ca84
Update code quality 2023-08-15 11:10:53 +02:00
Joshua Barretto
62d998252d
sync 2023-08-15 11:10:53 +02:00
TelepathicWalrus
6adca217fe
Clean code 2023-08-15 11:10:53 +02:00
TelepathicWalrus
6a080c242c
Add server side check to stop stay when mounted 
Add filter to allow telling other pets to stay when mounted
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
0648ba1bc6
Clean Code 
Remove option to mount if pet is told to stay
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
25f1f8f6cb
Changed to .filter and .min_by_key for iterator 2023-08-15 11:10:53 +02:00
TelepathicWalrus
5894913ede
Changed mod.rs to use CachedSpatialGrid 2023-08-15 11:10:53 +02:00
TelepathicWalrus
d6496c999d
Removed is_stay variable 
Added server side owner and distance checks
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
d9d364fe79
Add stay position to PetState 
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
9597810e3d
Remove is_stay function 
Clean code
 2023-08-15 11:10:53 +02:00
TelepathicWalrus
6f0997705f
Clean code 2023-08-15 11:10:53 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets 2023-08-15 11:10:52 +02:00
Isse
c6e9d3a202 Merge branch 'neutralmodder/zoom-keybind' into 'master' 
Add keybinding for zooming the camera

See merge request veloren/veloren!4050
 2023-08-10 16:55:09 +00:00
Youser Nayme
5ef300c72c Add keybinding for zooming the camera 2023-08-10 16:55:09 +00:00
Isse
02e67a0f4a Merge branch 'qsto/new_backpack' into 'master' 
Reliable leather pack

See merge request veloren/veloren!4066
 2023-08-09 20:44:52 +00:00
Michał
97725a3147 Reliable leather pack 2023-08-09 20:44:51 +00:00
Isse
ea89f27658 Merge branch 'qsto/desert_hum_fix' into 'master' 
Desert hum fix

See merge request veloren/veloren!4065
 2023-08-09 15:53:17 +00:00
Michał
5762e62704 Desert hum fix 2023-08-09 15:53:16 +00:00
Isse
58b541490b Merge branch 'fix_sea_wyvern_head_offset' into 'master' 
fix sea wyvern head offset

See merge request veloren/veloren!4059
 2023-08-09 12:44:27 +00:00
Isse
b3899d6966 Merge branch 'isse/usable-shovel' into 'master' 
Usable shovel

See merge request veloren/veloren!4060
 2023-08-08 18:45:10 +00:00
Isse
d74a743d4f update shovel voxel files to fit animations better 2023-08-08 20:44:37 +02:00
Isse
ba1cee4fd2 more animation 2023-08-06 21:39:38 +02:00
DaforLynx
3ddc3f5f72 Merge branch 'DaforLynx/repair_sfx' into 'master' 
Play sfx on successful repair

See merge request veloren/veloren!4062
 2023-08-05 18:49:49 +00:00
DaforLynx
16f53d33ed Play sfx on successful repair 2023-08-05 18:49:49 +00:00
Isse
98385b3b15 animation 2023-08-04 13:59:22 +02:00
Marcel
aaaa8c13b0 Merge branch 'xMAC94x/fix_gittag_ci_step' into 'master' 
try to fix gittag job

See merge request veloren/veloren!4042
 2023-08-04 09:23:43 +00:00
flo666
db6ebcd685 remove shovel outcome trigger from combomelee state 2023-08-03 23:00:32 +02:00
flo666
607af6f227 shovel sfx & particles 2023-08-03 21:52:55 +02:00
Isse
b06960ce1c fix interaction_text 2023-08-03 20:56:26 +02:00
flo666
5f7895ffa0 wyverns: parallel loot drops - All() 2023-08-03 20:11:51 +02:00
Isse
d890190af4 add animations 2023-08-03 19:45:23 +02:00
Isse
5e225d7f35 add to changelog 2023-08-03 19:38:31 +02:00
Isse
a39923e4d6 digging shovel 2023-08-03 19:32:09 +02:00
flo666
9bd5003d31 fix sea wyvern head offset 2023-08-03 19:25:55 +02:00
Isse
8abb93040c Merge branch 'qsto/chests-cleanup' into 'master' 
Qsto/chests cleanup

See merge request veloren/veloren!4039
 2023-08-02 21:37:16 +00:00
UncomfySilence
4c953cd36a teeny tweak 2023-08-02 22:53:49 +02:00
Isse
54bd7791e5 changelog entry 2023-08-02 18:48:31 +02:00
Isse
254c1c7145 ResourceSprite Fill, so we can track giant tree IronWood in rtsim 2023-08-02 18:48:01 +02:00
Michal Sroczynski
0d4fc62468 Code quality fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
1301761445 Scatter changes and fixes 2023-08-02 18:48:01 +02:00