Forest Anderson
54eb2a3ff7
Merge branch 'aylana/asp-sfx' into 'master'
...
Princess-Lana - Add asp sound effects for the game
See merge request veloren/veloren!2611
2021-07-17 01:49:20 +00:00
Avi Weinstock
13fc4de561
Add per-species head offsets.
2021-07-16 19:22:28 -04:00
Avi Weinstock
0a33c98268
Basic implementation of hat visuals.
2021-07-16 18:49:40 -04:00
Samuel Keiffer
f38cde9d40
Merge branch 'knightresspaladin/healing-aura' into 'master'
...
Knightresspaladin/healing aura
See merge request veloren/veloren!2587
2021-07-16 21:32:03 +00:00
Monty Marz
01c9d6d6d0
icon
2021-07-16 18:39:14 +02:00
Marcel
1aa816a780
Merge branch 'zesterer/sfx' into 'master'
...
Clipped arrow sound effects for more immediate feedback
See merge request veloren/veloren!2476
2021-07-16 10:32:29 +00:00
Aylana
a3da5b31d6
Add asp sound effects
2021-07-15 20:15:36 +02:00
Sam
997da21001
Particles for healing aura
2021-07-13 20:54:43 -05:00
Monty Marz
e379aacf8c
char selection frames, adjustments
2021-07-13 13:31:01 +02:00
Knightress Paladin
42c3872528
Added healing aura duration skill to voxygen UI
2021-07-10 20:02:36 -07:00
Szabó Lambert
0140e75ed4
Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files)
2021-07-10 17:25:56 +00:00
Samuel Keiffer
351a68944b
Merge branch 'juliancoffee/skill_truth' into 'master'
...
Move skill boost modifiers to skills module
See merge request veloren/veloren!2540
2021-07-09 23:05:48 +00:00
Monty Marz
7c8d73a0c6
Minimap modes, Danari customizations update & bald hairstyles
2021-07-08 00:01:08 +00:00
juliancoffee
20c0c7f44f
Use code-spliced values for i18n skill description
2021-07-07 17:51:30 +03:00
Swagazaki
cb3e932832
Just updated common.ron to correct a few French translations!
2021-07-07 10:55:15 +00:00
Ács Zoltán
9fbd8ae5ce
Add Hungarian translation
2021-07-05 15:14:35 +02:00
Ács Zoltán
5f3251ce60
Add support for ő and ű to the haxrcorp font
2021-07-05 15:12:27 +02:00
Joshua Barretto
269c6171e4
Merge branch 'DaforLynx/aeh' into 'master'
...
Sfx fixes and new test
See merge request veloren/veloren!2529
2021-06-30 11:43:01 +00:00
DaforLynx
a757bf3dbd
Sfx fixes and new test
2021-06-30 11:43:00 +00:00
juliancoffee
21a29ecf74
Add CorruptionSpores
...
- New lootable food which you can find as husk or darkhound drop
2021-06-30 03:33:06 +03:00
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
e41a62aadc
Clipped arrow sound effects for more immediate feedback
2021-06-18 16:01:00 +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
Monty
c17e3ad996
Cactus Colada
...
Made cacti lootable
Cactus colada recipe and item
price balance
fmt
"make it 8 and drop it to 20 or 25? Not really sure tbh"
2021-06-13 13:52:56 +02:00
Avi Weinstock
d02ff2db20
Don't apply e2e pushback during a forced movement character state.
2021-06-12 11:10:06 -04:00
João Victor Cardoso Kdouk
228d2f05a6
Small fixes to pt_br language.
2021-06-09 14:36:10 +00:00
Marcel Märtens
e96dc21d30
fix swedish ron files
2021-06-07 12:02:02 +02:00
Marcel
97b7c8d68a
Merge branch 'master' into 'master'
...
Update Swedish translation
See merge request veloren/veloren!2380
2021-06-07 09:42:09 +00:00
Sam
0488b2fcd0
Adressed comments on energy and armor functions.
2021-06-07 11:06:25 +02:00
Snowram
76ca99ece4
Derive str from Material, better deserialization
2021-06-07 11:03:50 +02:00
jshipsey
4deeb42155
cave adjustments
2021-06-07 11:02:34 +02:00
jshipsey
1d23b7aebf
finalize stats
...
t
2021-06-07 11:02:03 +02:00
jshipsey
9034d0f25d
comment addressing, cave tweaks
2021-06-07 11:01:46 +02:00
jshipsey
0e269b59d7
tooltip work
2021-06-07 11:01:32 +02:00
jshipsey
5fdb2ac01d
migration
2021-06-07 11:01:04 +02:00
Snowram
29a38e6d4f
Split tags into material class and material
2021-06-07 11:00:57 +02:00
Snowram
3fa7d0b6d4
Add material and armor class tags
2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7
proper recipes, tanning racks, various fixes
2021-06-07 11:00:14 +02:00
jshipsey
8acd3832e3
more loot tables, overworld ores, more items
2021-06-07 11:00:00 +02:00
jshipsey
05de96c94b
ore deposits, flower drops
2021-06-07 10:59:50 +02:00
jshipsey
1c17d8fe5e
cave changes
2021-06-07 10:59:44 +02:00
jshipsey
754b60d810
crafting stations
2021-06-07 10:59:35 +02:00
jshipsey
58bd51a9e8
icon work, more models
2021-06-07 10:58:27 +02:00
jshipsey
18e9b5b890
recipes, re-organization, cleanup
2021-06-07 10:58:05 +02:00
jshipsey
74fbe9a123
cloth/metallic armor
2021-06-07 10:56:54 +02:00
jshipsey
ffc9a0ae22
more drops, armors
2021-06-07 10:56:16 +02:00
jshipsey
f387b8d259
hides/leathers
2021-06-07 10:56:04 +02:00
jshipsey
451ccf8d73
more meat
2021-06-07 10:55:50 +02:00
jshipsey
ca907f1b87
added some meat
2021-06-07 10:55:34 +02:00
Monty
336d83fc49
new bgs
2021-06-06 19:30:37 +02:00
Marcel
521e1eacf3
Merge branch 'aweinstock/add-models-20210603' into 'master'
...
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
See merge request veloren/veloren!2371
2021-06-06 16:56:21 +00:00
hqurve
39fc48ac17
Widened recipe list in crafting menu and added quality indicators to names in the list
2021-06-06 15:55:11 +00:00
Filip Bengtsson
172c96d83d
Missed strings
2021-06-06 17:48:09 +02:00
Snowram
edfe713076
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
Filip Bengtsson
cba9affbb3
Strings in various files
2021-06-06 01:05:08 +02:00
Filip Bengtsson
fcc266bfa8
Translate trade.ron
2021-06-06 00:42:50 +02:00
Filip Bengtsson
1b6c43dfe2
Translate social.ron
2021-06-06 00:42:07 +02:00
Filip Bengtsson
3e37549518
Translate sct.ron
2021-06-06 00:40:30 +02:00
Filip Bengtsson
5191a90432
Translate misc.ron
2021-06-06 00:39:55 +02:00
Filip Bengtsson
3cbf362462
Translate hud/map.ron
2021-06-06 00:34:06 +02:00
Filip Bengtsson
28c44b6bb9
Translate hud/hud_setting.ron
2021-06-06 00:32:16 +02:00
Filip Bengtsson
12ba5e1848
Translate hud/group.ron
2021-06-06 00:07:53 +02:00
Filip Bengtsson
1841923795
Translate hud/crafting.ron
2021-06-06 00:07:03 +02:00
Filip Bengtsson
f9e42f4107
Translate hud/chat.ron
2021-06-06 00:06:05 +02:00
Filip Bengtsson
10ac6b3d4c
Translate hud/char_window.ron
2021-06-06 00:00:51 +02:00
Filip Bengtsson
fd608ccb6f
Translate hud/bag.ron
2021-06-05 23:39:24 +02:00
Filip Bengtsson
f111b87fe5
template.ron boilerplate
2021-06-05 23:33:54 +02:00
Filip Bengtsson
6277106e78
Start translating skills.ron
2021-06-05 23:25:11 +02:00
Filip Bengtsson
cf051fd9fb
Translate main.ron
2021-06-05 23:13:42 +02:00
Filip Bengtsson
37c12977c1
Translate most of gameinput.ron
2021-06-05 23:08:59 +02:00
Filip Bengtsson
cb0f00d447
Translate esc_menu.ron
2021-06-05 23:04:55 +02:00
Filip Bengtsson
35f7c206e5
Translate most of common.ron
2021-06-05 23:03:48 +02:00
Filip Bengtsson
8db65e0554
Translate char_selection.ron
2021-06-05 22:45:55 +02:00
Filip Bengtsson
d663d05f4f
Translate buff.ron
2021-06-05 22:28:01 +02:00
Filip Bengtsson
d0bb260057
Translate _manifest.ron
2021-06-05 14:26:00 +02:00
Filip Bengtsson
6df35564c2
Copy files from English
2021-06-05 13:26:41 +02:00
Sam
93f90d514c
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
81f7e690fd
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
a82984b925
Added base ability set
2021-06-04 18:17:14 -05:00
Sam
eaf87a53bb
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
5bf99eac11
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Sam
c81e1534f7
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
05c699878f
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Imbris
2b8eaae572
Update wgpu, cleanup a bit of commented shader code, improve sprite LOD selection code
2021-06-03 00:10:06 -04:00
Imbris
01aa6af1fd
Address various TODOs introduced in wgpu transition
2021-06-03 00:10:06 -04:00
Imbris
8403e4c483
address/remove TODOs, fix comment typos, enable wgpu/trace feature by default (So no recompile is needed to collect an API trace)
2021-06-03 00:10:06 -04:00
Avi Weinstock
cf6717ac90
Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it.
2021-06-03 00:10:06 -04:00
Avi Weinstock
7b04599a3b
Implement a Debug pipeline for hitboxes and pathfinding lines.
...
- Implements mesh generation for cylinders and lines.
- Implements an Id-allocator so that clients can mutate positions efficiently.
- Is split into pipeline and scene modules.
- Contains simple shaders that just pass through a position and color.
2021-06-03 00:10:06 -04:00
Imbris
b84c8b2915
Remove weird syntax in cloud shader that was probably introduced when switching to textureLod
2021-06-03 00:10:06 -04:00
Imbris
5749983868
Make shadow vert shaders always contain their content but ensure they are never used when shadow maps are disabled, remove uneeded shadow frag shader
2021-06-03 00:10:06 -04:00
Imbris
d7683673ee
Properly account for negative sun_dir.z in pow use in sky shaders
2021-06-03 00:10:06 -04:00
Imbris
d8520c8743
Add localization text for GPU timing checkbox
2021-06-03 00:10:06 -04:00
Imbris
9ec4fd5b4b
Remove commented out sprite code, including the code for getting verts for sprites with a texture rather than a storage buffer
2021-06-03 00:10:06 -04:00
Imbris
9be424de53
Remove unused waves texture
2021-06-03 00:10:05 -04:00
Imbris
7f9ba17dee
Remove unused shadow bind group from the cloud pipeline
2021-06-03 00:10:05 -04:00
Imbris
77689d1420
Comment out lod depth tweaks not designed for reverse depth, convert waves image to rgba before constructing a texture, misc fix after rebase
2021-06-02 23:59:50 -04:00
Synis
c7cab3e19e
Fix missing include
2021-06-02 23:59:50 -04:00
Imbris
086ea42ad7
Cloud and sprite shader fixes after rebase
2021-06-02 23:59:50 -04:00
Imbris
aa1e292b03
Fix dx12 shader issues
2021-06-02 23:59:50 -04:00
Imbris
577caa3047
Implement screenshots
2021-06-02 23:59:50 -04:00
Imbris
64398f6c0a
Try out using storage buffer for sprite vertices
2021-06-02 23:59:50 -04:00
Imbris
b9931588e4
Fix bugs with sprite rendering
2021-06-02 23:59:50 -04:00
