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,229 Commits 151 Branches 18 Tags 2.1 GiB
237d13dbce
Commit Graph

433 Commits

Author SHA1 Message Date
flo666
897d1e5fe5 fix_ngoubou_jaw 2023-03-20 22:07:23 +01:00
flo666
472ef6b823 fix_husk_brute_singlestrike 2023-03-15 20:32:22 +01:00
flo
704af5ef7b bird_medium_scale 2023-03-12 18:08:21 +00:00
flo
98e93d1a1c spawn and loot tweaks, tursus and werewolf anims 2023-02-22 01:32:05 +00:00
flo
bf81ffc029 frost_gigas 2023-02-15 00:10:37 +00:00
flo
0531b40fae bird_medium_2 2023-02-14 23:17:20 +00:00
flo666
9c09000256 - change bristlemane to bristleback 
- axebeak tweaks
 2023-01-31 20:34:41 +01:00
flo666
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
flo666
271b80b832 seal 2023-01-31 20:34:40 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master' 
wyverns

See merge request veloren/veloren!3720
 2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Joseph Donofry
74ee861dde Add glow to dropped lanterns 2023-01-23 16:13:43 +00:00
flo
0eba37ce6a dark_guitar & icy_talharpa 2023-01-13 13:37:45 +00:00
IsseW
54bad4b205 Creature viewpoint 2022-11-30 16:51:02 +01:00
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
Marcel Märtens
2812729b78 cargo clippy lifetimes 2022-11-28 15:19:57 +01:00
Marcel Märtens
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
flo
e7b802712d reduce mossdrake, fix woodgolem loottable 2022-11-21 14:22:15 +00:00
Marcel
997c5a4e61 Merge branch 'ythern/more_unique_abilities' into 'master' 
Ythern/roshwalr kit

See merge request veloren/veloren!3692
 2022-11-15 09:58:06 +00:00
Eternalisime
7113befe88 removed useless check 2022-11-13 22:21:32 +01:00
Eternalisime
71e59e4b81 combat: tweaks and modified shockwave animation 2022-11-13 22:04:00 +01:00
flo666
a64236f50f quadruped_medium shockwave animation WIP 2022-11-13 19:41:18 +01:00
Justin Shipsey
aa2fabcd45 Merge branch 'mossdrake' into 'master' 
Moss Drake

See merge request veloren/veloren!3693
 2022-11-12 13:00:44 +00:00
flo
0351bf1d63 Moss Drake 2022-11-12 13:00:42 +00:00
Christof Petig
a820eee289 Merge branch 'floppy-bat-wing-tweaks' into 'master' 
tweak bat wing animation

See merge request veloren/veloren!3684
 2022-11-12 10:18:11 +00:00
flo
df70381a7c tweak bat wing animation 2022-11-12 10:18:10 +00:00
Monty Marz
a763a865fe Musical Instruments part 2 2022-11-10 20:59:53 +00:00
Sam
937db8706c Made animations when dual wielding less bad 2022-10-27 20:07:00 -04:00
Sam
ac2e2fd724 Added animations for recover section of all abilities 2022-10-27 20:06:55 -04:00
Sam
b09b0222c4 Animation for reaching flurry, tweaked animation for balanced combo. 2022-10-27 20:06:54 -04:00
Sam
9091d46554 Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge. 2022-10-27 20:06:53 -04:00
Sam
2e5dfd86de Animation for reaching skewer 2022-10-27 20:06:53 -04:00
Sam
035f9135d6 Animation for reaching combo 2022-10-27 20:06:52 -04:00
Sam
77f891dc99 Animation for mobility agility 2022-10-27 20:06:52 -04:00
Sam
73a36235fc Animation for mobility feint 2022-10-27 20:06:52 -04:00
Sam
09de0ec483 Animation for mobility combo 2022-10-27 20:06:51 -04:00
Sam
1621521232 Animation for heavy fortitude. Tweaked animation for defensive bulwark. 2022-10-27 20:06:51 -04:00
Sam
eb7c2337dd Animation for heavy finisher 2022-10-27 20:06:50 -04:00
Sam
be3f2dca92 Animation for heavy pommel strike 2022-10-27 20:06:49 -04:00
Sam
ba4c28e83a Animation for heavy combo 2022-10-27 20:06:49 -04:00
Sam
d7a0a6e743 Animation for parrying counter 2022-10-27 20:06:49 -04:00
Sam
632941e99d Animation for parrying riposte 2022-10-27 20:06:48 -04:00
Sam
7c22847009 Animation for parrying parry 2022-10-27 20:06:48 -04:00
Sam
dd37a699c0 Animation for parrying combo 2022-10-27 20:06:47 -04:00
Sam
571c64a4bb Animation for defensive bulwark 2022-10-27 20:06:47 -04:00
Sam
0c8480ac92 Defensive retreat animation 2022-10-27 20:06:47 -04:00
Sam
19948ad6fd Animation for defensive combo 2022-10-27 20:06:46 -04:00
Sam
0dea91e57f Animation for cleaving dive 2022-10-27 20:06:46 -04:00
Sam
d907cd5e51 Animation for cleaving finisher 2022-10-27 20:06:45 -04:00
Sam
83829d1e1b Animation for cleaving spin 2022-10-27 20:06:45 -04:00
Sam
8d252b7168 Cleaving combo animation 2022-10-27 20:06:44 -04:00
Sam
36287b7469 Animation for crippling strike 2022-10-27 20:06:44 -04:00
Sam
43b2e6bb70 Crippling gouge animation 2022-10-27 20:06:44 -04:00
Sam
4bbd7da929 Crippling finisher animation 2022-10-27 20:06:43 -04:00
Sam
919e515098 Animation for crippling combo 2022-10-27 20:06:43 -04:00
Sam
2bfc222793 Offensive finisher animation 2022-10-27 20:06:42 -04:00
Sam
894710d8c6 Offensive advance animation 2022-10-27 20:06:42 -04:00
Sam
1e959706a5 Animation for offensive combo 2022-10-27 20:06:41 -04:00
Sam
a64895d8c5 Animations for balanced abilities 2022-10-27 20:06:41 -04:00
Sam
da21e1cb02 Removed air slash stance and abilities 2022-10-27 20:06:40 -04:00
Sam
67fa03dc23 Fixed unintentional recovery from preceding strikes 2022-10-27 20:06:40 -04:00
jshipsey
1ae230c194 anim testing 2022-10-27 20:06:39 -04:00
Sam
4f2b1d37f8 Fixed consecutive strikes carrying animation over 2022-10-27 20:06:39 -04:00
Sam
c4987c3c48 Animations should use the state from the previous strike 2022-10-27 20:06:38 -04:00
jshipsey
0c054837f9 animation setup 2022-10-27 20:06:38 -04:00
Sam
ea287136cf Hot anim fix 2022-10-27 20:06:37 -04:00
Sam
0ff06edcdc Combo melee skips recover if continuously striking. Combo animations consolidated to one file. 2022-10-27 20:06:27 -04:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
flo
050150e7e8 floppy_instruments_foot_animation_fix 2022-10-22 22:47:25 +00:00
Marcel Märtens
cf6a764aa4 update toolchain to 2022-09-23 2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1 update toolchain to 2022-09-08 
This reverts commit 6c9deee491.
This reverts commit a32b269252.
 2022-09-24 00:04:40 +02:00
Sam
3d6c9a780d Removed redundant package parameter from init function of hot reloading 2022-09-17 00:55:28 -04:00
Sam
cfeb197f85 Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead. 2022-09-17 00:50:59 -04:00
Sam
23c51af437 Consolidated voxygen and server dynlibs into a common dynlib 2022-09-16 23:43:26 -04:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
Joshua Yanovski
aea4aca057 Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master' 
Xmac94x/steal sharps clippy improvements

See merge request veloren/veloren!3612
 2022-09-11 19:56:35 +00:00
Marcel Märtens
a32b269252 steal sharps clippy improvements to the old nightly 2022-09-11 16:10:56 +02:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
Joshua Yanovski
986d104faa Update Rust toolchain. 2022-09-08 15:43:53 -07:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
Forest Anderson
67534488b3 Merge branch 'tygyh/CleanUp' into 'master' 
Tygyh/clean up

See merge request veloren/veloren!3480
 2022-07-17 14:04:45 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
tygyh
120ee6b6c0 Fix typos 2022-07-15 18:59:37 +02:00
tygyh
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
Ben Wallis
af04843a20 Re-enabled mimalloc for non msvc builds 2022-07-10 14:50:35 +01:00
Isse
7e18384e1c Disable mimalloc for non msvc builds 2022-07-06 19:08:19 +02:00
Isse
16c5c657cc Fix mimalloc for hot reloading 2022-07-04 10:08:27 +00:00
Marcel Märtens
697673bcca update toolchain to nightly-2022-04-25 2022-05-03 15:22:28 +02:00
Marcel Märtens
fa49248c31 switch to upstream vek again 2022-04-28 09:10:55 +02:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
Sam
0a0fffd5ed Addressed review comments 2022-03-03 01:11:17 -05:00
Sam
5a60562eee Addressed review comments 2022-03-03 01:11:16 -05:00
Sam
48c97cd829 Glider trails 2022-03-03 01:11:13 -05:00
Sam
eacd43be16 Moved weapon offset functions up a level. Should allow gliders and arrows to be handled better. 2022-03-03 01:11:12 -05:00
jshipsey
6ba8af5434 anim additions 2022-03-03 01:11:11 -05:00
Sam
f3c5c2b5e3 Pointy trails 2022-03-03 01:11:10 -05:00
Sam
b3a19ebc00 Weapon trails now works with dual wielding 2022-03-03 01:11:08 -05:00
Sam
a967daa2f5 Trails now controlled and enabled from animation files. 2022-03-03 01:11:07 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Sam
d23dd6c9e9 Fixed a few errors 2022-03-03 01:10:54 -05:00
Sam
5018a9f476 Game now runs, still doesn't work 2022-03-03 01:10:53 -05:00
Sam
33419c7b4c Trails are now hackily created. 2022-03-03 01:10:51 -05:00
ninefox
61913402a2 add code to center item drops 
reduce size of coins
 2022-02-23 17:16:10 -08:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
jshipsey
3a35dcc77f brick texture colors 2022-02-10 14:58:34 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
jshipsey
7ae85aef50 tweaks 2022-02-09 19:34:24 -05:00
jshipsey
6d34a6b544 wallrunning 2022-02-09 19:34:23 -05:00
jshipsey
6f8cadc847 wall contact, run anim tweaks 2022-02-09 19:34:22 -05:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
juliancoffee
fba89517de Move Veloren to 2021 edition 2022-01-26 16:46:40 +02:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
jshipsey
067f06561f hold weapon while rolling 2022-01-24 03:55:00 -05:00
Joshua Barretto
53574bb6ec Tweaked lantern offsets 2022-01-19 20:08:13 -05:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
Snowram
f6d7ba33ef Arthropods spawns and loots 2022-01-19 19:01:16 +01:00
jshipsey
82df5f23c3 spit anim 2022-01-19 19:01:16 +01:00
jshipsey
269b1fcd00 summon an 2022-01-19 19:01:15 +01:00
Snowram
fd3ed89899 More arthropod animations 2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2 Arthropod basic attack 2022-01-19 19:01:14 +01:00
Snowram
6da42e61ab Arthropod jump attack, hitboxes 2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005 Arthropod charge 2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60 More arthropod work 2022-01-19 19:01:13 +01:00
Snowram
2871fa83bc Arthropod run 2022-01-19 19:01:12 +01:00
Snowram
fa549eece7 Adds new arthropod species 2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539 Adds arthropod skeleton 2022-01-19 19:01:11 +01:00
jshipsey
1d76d484bb anim tweaks 2022-01-17 06:45:26 -05:00
Joshua Barretto
d0c101ed06 Remove redundant orientation 2022-01-17 09:25:46 +00:00
jshipsey
41ed0f284f swivel, quadsmall/quadlow offsets 2022-01-17 03:42:56 -05:00
jshipsey
0ea1e6862e animation tweaking 2022-01-16 15:46:17 -05:00
Joshua Barretto
7f3d9898db More sensible turn rate in air 2022-01-16 19:43:13 +00:00
jshipsey
ed9de26f27 jump anim, quad med 2022-01-16 14:09:55 -05:00
Joshua Barretto
b3e2d825ed Overhauled mounting to make it more reliable 2022-01-16 17:53:13 +00:00
jshipsey
475fc1631f akhlut 2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
ubruntu
65f9d18fb7 Dagger UX 2021-12-28 22:09:34 +00:00
Snowram
66a5f9fded Fixes animation hot reloading (credit to Imbris) 2021-12-18 20:36:14 +01:00
Jonathan Berglin
596307c9b7 Remove unused clippy suppressions 2021-12-05 17:59:02 +00:00
Joshua Barretto
46ec4203a2 Arbitrary volume airships 2021-11-13 17:13:08 +00:00
DemonicOnPc
b1476071b1 Added new Spots, Shrubs and Ships. 
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.

Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs

Galleon ship added
 2021-10-24 08:10:44 -04:00
Bryant Deters
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Joshua Barretto
bfbca3e517 Added sail boat 2021-10-05 00:02:03 +01:00