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
8,932 Commits 151 Branches 18 Tags 2.1 GiB
0151e5aeed
Commit Graph

1560 Commits

Author SHA1 Message Date
Sam
1978b590aa Destringified consumables 2021-06-29 05:59:02 -05:00
Snowram
aaf5f89076 Merge branch 'snowram/death-outcome' into 'master' 
Adds an outcome to death with SFX and VFX

See merge request veloren/veloren!2519
 2021-06-28 23:18:45 +00:00
Snowram
3ec5306ed0 Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Imbris
20a9a420c6 Merge branch 'imbris/bind-order' into 'master' 
Ensure bind groups are ordered with the most frequently changed ones in later slots

See merge request veloren/veloren!2496
 2021-06-28 15:39:31 +00:00
Marcel
f063dcd939 Merge branch 'alphyr/assets_manager0_5' into 'master' 
Update `assets_manager` to 0.5

See merge request veloren/veloren!2501
 2021-06-27 15:50:16 +00:00
Nícolas Wildner
81010e8465 Update pt br 20210627 2021-06-27 03:26:44 +00:00
Benoît du Garreau
1cba7db9b6 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Justin Shipsey
f983295318 Merge branch 'swilliams/jewellery' into 'master' 
Gem Rings and small change to trading.

See merge request veloren/veloren!2500
 2021-06-26 02:44:04 +00:00
Scott Williams
8d0a1ad7b4 Gem Rings and small change to trading. 2021-06-26 02:44:02 +00:00
Snowram
6e8daefa97 Merge branch 'snowram/new-npcs-batch' into 'master' 
Snowram/new npcs batch

See merge request veloren/veloren!2495
 2021-06-25 20:29:41 +00:00
Snowram
379e755006 Increases base damage of husk attack, rename some cultist weapons 2021-06-25 21:18:28 +02:00
Joshua Barretto
b66957bf74 Merge branch 'AldanTanneo/smooth-layers-shader-fix' into 'master' 
Fixes a block noise issue at specific layers (z=434 among others)

See merge request veloren/veloren!2494
 2021-06-25 12:43:27 +00:00
Snowram
d7f25627ab Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
8760b69345 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4 Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Snowram
87ca00fac0 Adds new species 2021-06-24 19:29:44 +02:00
juliancoffee
1eb9c165be (uk_UA) small fitting fix 2021-06-24 19:52:38 +03:00
Imbris
58f237eaf5 Ensure bind groups are ordered with the most frequently changed ones in later slots 2021-06-24 00:47:59 -04:00
Sam
aac24ad601 Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Sam
0a32b676c8 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
AldanTanneo
f1b83962bd Fixed smooth layer at z=434 (and a few other) 2021-06-23 21:13:15 +02:00
Joshua Barretto
b84708ca75 Added chat toggle 2021-06-21 20:16:03 +01:00
Joshua Barretto
8ab222bf80 Selectively disable glow flicker for small wins on low-end systems 2021-06-21 17:06:43 +01:00
Joshua Barretto
05c375a8b0 Merge branch 'zesterer/meta' into 'master' 
Optimising for size

See merge request veloren/veloren!2468
 2021-06-18 12:35:16 +00:00
Joshua Barretto
f6d64a424f Added JPEG backgrounds 2021-06-18 12:28:55 +01:00
Joshua Barretto
0265da1074 Added support for JPEG backgrounds 2021-06-18 12:27:39 +01:00
DaforLynx
c85238014a More npc sfx 2021-06-18 06:24:57 +00:00
DaforLynx
9a5b95bc16 Added npc hurt sfx 2021-06-17 05:49:09 +00:00
jshipsey
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Joshua Barretto
b8749dc219 Added more cow noises, prepare for merge 2021-06-16 17:23:54 +01:00
Joshua Barretto
9510869870 Significantly more efficient sound effect processing, more NPC sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
e3c44ba7fe More voice kinds, more opportunities for sounds 2021-06-16 17:23:22 +01:00
Joshua Barretto
0ef29a6989 VoiceKind for better sound effect specs 2021-06-16 17:23:22 +01:00
Joshua Barretto
559311e1b0 Chasing sounds 2021-06-16 17:23:22 +01:00
K. Kisa
fbb34b7331 Veloren/veloren/master 2021-06-15 16:36:41 +00:00
Snowram
f2c7836161 Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4 Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Marcel
1b36f6cab3 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' 
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
 2021-06-14 14:42:01 +00:00
Marcel
4cafdb3bfd Merge branch 'aweinstock/mining-skill-tree' into 'master' 
Mining skill tree.

See merge request veloren/veloren!2406
 2021-06-14 14:19:06 +00:00
Marcel
0ef6cc6576 Merge branch 'Veloren_Kisa-master-patch-51169' into 'master' 
Не полный перевод навыков, исправлены оригинальные описания и названия.

See merge request veloren/veloren!2432
 2021-06-13 21:55:57 +00:00
Marcel
4ea189f056 Merge branch 'Veloren_Kisa-master-patch-14791' into 'master' 
Полный перевод на русский язык

See merge request veloren/veloren!2434
 2021-06-13 21:55:55 +00:00
Marcel
f791f19edb Merge branch 'Veloren_Kisa-master-patch-17326' into 'master' 
Upload New File

See merge request veloren/veloren!2435
 2021-06-13 21:55:53 +00:00
Monty Marz
45f79059d0 mining exp sct color and icon; add mining to skill_preset 2021-06-13 14:34:42 -04:00
Monty Marz
01a04a80fa icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de Mining skill tree. 2021-06-13 14:34:42 -04:00
K. Kisa
883297d4cc Upload New File 2021-06-13 13:30:42 +00:00
K. Kisa
acb0589277 Полный перевод на русский язык 2021-06-13 13:24:57 +00:00
K. Kisa
2e305744fe Не полный перевод навыков, исправлены оригинальные описания и названия. 2021-06-13 13:08:52 +00:00