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
Imbris
a90373604e
Fix sprite vertex lookup, normalize sprite
...
normals in vert shader
2021-06-02 23:59:50 -04:00
Imbris
8d63446300
Almost implement instance merging for sprites (validation error), rebase
...
fix
2021-06-02 23:59:50 -04:00
Imbris
0f1c4080c4
Start sprite refactor
2021-06-02 23:59:49 -04:00
Imbris
ad2b6c9014
Fix texture sampling syntax
2021-06-02 23:59:49 -04:00
Imbris
a8851b6561
Switch to index rendering for most quad-like things
2021-06-02 23:59:49 -04:00
Imbris
e1af485e5f
Add setting for the PresentMode
2021-06-02 23:59:49 -04:00
Imbris
2f69c41b00
fix nametag depth culling as well as a tweak to maybe make the main menu not flicker on intel iGPU
2021-06-02 23:59:49 -04:00
Imbris
261fd24dfd
Fix lod alt texture filtering
2021-06-02 23:59:49 -04:00
Imbris
c532f50e64
Remove wgpu patch/update wgpu, rebase fixes, remove use of deprecated
...
vek functions for left, right, up, down, forward_rh, forward_lh
2021-06-02 23:59:49 -04:00
Joshua Yanovski
93568754a0
Inverse depth planes.
...
Also added a function that has extensive details about what the
projection options mean, and set our near plane much closer (0.25 to
0.0625) and far plane much farther (100000.25 to 524288.0625). In the
future we may completely remove the far plane (opting for an infinite
one) and may possibly improve accuracy elsewhere using analysis of other
floating point values.
2021-06-02 23:59:48 -04:00
Joshua Yanovski
adf3f83b4b
Fix point shadows.
2021-06-02 23:59:48 -04:00
Joshua Yanovski
868293a802
More frustration with shadows.
2021-06-02 23:59:48 -04:00
Joshua Yanovski
c97a42fdb7
Various fixes for shadows.
2021-06-02 23:59:48 -04:00
Capucho
23f1144fe2
Fix the shadow drawing code
...
Very poorly optimized
2021-06-02 23:59:48 -04:00
Capucho
b6c37be299
Re enable sprite rendering
2021-06-02 23:59:48 -04:00
Imbris
97bed5752b
Fix clouds
2021-06-02 23:59:48 -04:00
Imbris
f30588ea94
Fix flipping in post-processing stages and precompute the uv in those in the vert shader
2021-06-02 23:59:48 -04:00
Imbris
bae0310cc7
Somewhat fix lod, prevent particles spamming new buffers when disabled
2021-06-02 23:59:48 -04:00
Imbris
553c1c18a9
Add skybox
2021-06-02 23:59:48 -04:00
Capucho
1083d04c73
Reenable terrain rendering
...
Refractor col lights
2021-06-02 23:59:48 -04:00
Capucho
0db2a35955
Fix the orientation of the rendering
...
Reenable the rendering of the player
2021-06-02 23:59:47 -04:00
Capucho
1668e834f8
Renable the figure and terrain drawing code (not working yet)
2021-06-02 23:59:47 -04:00
Capucho
4c83e19c83
Remove the depth buffer from the Third drawer
2021-06-02 23:59:47 -04:00
Capucho
2c7d49b69f
Shader fixes
2021-06-02 23:59:47 -04:00
Imbris
da0423ab2a
Almost make clouds/postproccess run
2021-06-02 23:59:47 -04:00
Imbris
124d69d7ad
Render Ui
2021-06-02 23:59:45 -04:00
Imbris
97ca278d89
fixed validation errors when creating pipelines
2021-06-02 23:56:43 -04:00
Imbris
f540366676
Made shaders compile by adding locations and bindings and splitting textures and samplers out into two things and adding guards for double including shaders
2021-06-02 23:56:43 -04:00
Avi Weinstock
6d3dcc3835
Address MR 2301 review comments.
...
- Replace tabs with spaces in map-related i18n.
- Use `retain` in `remove_unloaded_chunks`.
2021-06-02 00:39:58 -04:00
Avi Weinstock
cbe7521259
Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry.
2021-06-02 00:39:04 -04:00
Adam Whitehurst
77cb2ae783
fix: commas
2021-05-30 14:47:42 -07:00
Adam Whitehurst
9eefa89f90
feat: add frozen debuff icon, en strings
2021-05-30 08:49:32 -07:00
Justin Shipsey
d7c7f6bf5d
Merge branch 'sam/rework-bow' into 'master'
...
Bow Rework
See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
juliancoffee
940655dcb6
Adding different chests for each dungeon
2021-05-24 23:00:44 +03:00
hqurve
854930bc1a
Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up
2021-05-22 20:47:08 +00:00
Sam
7828112486
Balance tweaks.
2021-05-22 15:00:05 -05:00
Illia Denysenko
1b5f06cff9
update uk ua
2021-05-22 18:58:11 +00:00
Sam
1014ac45bf
Made new skills for reworked bow.
...
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Monty Marz
30bcc6aaa3
Ferocious armour for t5-dungeon minibosses
2021-05-22 10:55:36 +00:00
Samuel Keiffer
a0599ac046
Merge branch 'sam/extra-equip-slots' into 'master'
...
Added Extra Loadout Slots
See merge request veloren/veloren!2295
2021-05-21 20:28:53 +00:00
hqurve
6974ab9199
Added swap_equipped_weapons icon and resized inactive weapons
2021-05-17 15:35:27 -04:00
Nícolas Wildner
68f3359238
Update pt br 20210517
2021-05-17 18:12:20 +00:00
hqurve
a4384b81c7
Add offhand weapons to bag ui
2021-05-16 20:43:19 -04:00
Marcel
740ec3208d
Merge branch 'xMAC94x/czech' into 'master'
...
add czech language. fixed #1044
Closes #1044
See merge request veloren/veloren!2297
2021-05-16 16:39:51 +00:00
Marcel
695ffa96b9
Merge branch 'juliancoffee/update-it_IT' into 'master'
...
update Italian translation by 'Чингис Хан'
See merge request veloren/veloren!2305
2021-05-14 15:35:05 +00:00
juliancoffee
776f772b58
update Italian translation by 'Чингис Хан'
2021-05-14 17:31:01 +03:00
Marcel
7d5ca0e7bf
Revert "Merge branch 'snowram/hacky-mount' into 'master'"
...
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Marcel
7fe0db2261
Merge branch 'snowram/hacky-mount' into 'master'
...
Allow for collars to make QuadMed npcs mountable
See merge request veloren/veloren!2219
2021-05-14 12:27:19 +00:00
hqurve
95a6e35a3a
Added chat tabs
2021-05-14 12:27:15 +00:00
Snowram
8745fb803a
Use Body to determine mountee offsets
2021-05-14 00:11:54 +02:00
Marcel Märtens
962f8b982c
add czech language. fixed #1044
2021-05-12 22:36:11 +02:00
Sam
7acd953923
Changed particles to a switch statement.
2021-05-10 19:58:32 -05:00
jshipsey
770d07ac90
anims
2021-05-10 18:54:03 -05:00
Snowram
47a2bf7de8
Adds haniwa sentry object
2021-05-10 18:53:48 -05:00
Sam
5fa4358e74
Clay golem attacks done.
2021-05-10 18:53:01 -05:00
Monty Marz
fab3794bf3
Fix 1h-axes
2021-05-10 20:44:09 +00:00
Monty Marz
a17bb0ad73
Better inactive/active audio slider logic
2021-05-09 09:51:41 +00:00
Snowram
ad3a63fc80
Merge branch 'snowram/craftmats-ron-fix' into 'master'
...
Fixes object manifest
See merge request veloren/veloren!2273
2021-05-07 21:06:37 +00:00
Nícolas Wildner
f517b06d50
Update pt br 20210507
2021-05-07 20:07:14 +00:00
Snowram
ec3fa365d0
Fixes object manifest
2021-05-07 22:04:57 +02:00
Snowram
831bfd0be9
Snowram/craft mats
2021-05-07 17:03:45 +00:00
Illia Denysenko
07ba3e659d
Update uk_UA
2021-05-07 14:32:03 +00:00
Sam
062c290e49
Made buff commands exhaustive
2021-05-04 09:54:28 -04:00
Sam
d99623b298
Buff icons
2021-05-04 08:45:14 -04:00
Sam
2652660a58
Addressed comments and more testing feedback.
2021-05-04 08:45:14 -04:00
Sam
5c241850f1
Added sfx. Addressed comments.
2021-05-04 08:45:12 -04:00
Sam
164fd0de04
Particles for frenzy buff and ground cleave.
2021-05-04 08:45:10 -04:00
jshipsey
c886accaf1
anims
2021-05-04 08:45:08 -04:00
Sam
d1139c3b7c
Added frenzy ability to minotaur.
...
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
2021-05-04 08:45:07 -04:00
Illia Denysenko
f04a4f907a
Add possibility to translate buff outcomes
2021-05-03 23:02:59 +00:00
Avi Weinstock
be39054767
Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic.
2021-05-03 00:09:44 -04:00
James Melkonian
f553700e8c
Add map markers for lakes and mountains
2021-05-03 02:00:23 +00:00
Joshua Barretto
d0953fcab0
Added map marker
2021-05-01 16:26:13 +00:00
Jan Dre
8f5370f372
German translation
2021-04-30 11:58:31 +00:00
DaforLynx
7334cce426
Poise (stun) SFX and fix for town music
2021-04-29 23:36:22 +00:00
Sam
91bb6392bb
Removed old 2h variants of 1h weapons.
2021-04-29 13:18:04 -04:00
DaforLynx
2e0272ce28
Town music
2021-04-28 05:07:59 +00:00
Marcel
aa963493e8
Merge branch 'james/sound-unwraps' into 'master'
...
Remove an unwrap and move outcome sfx to ron
See merge request veloren/veloren!2206
2021-04-27 21:01:06 +00:00
James Melkonian
2f00af83d8
Remove an unwrap and move outcome sfx to ron
2021-04-27 21:01:06 +00:00
Marcel
876686893b
Merge branch 'duelsik/translations-PL-27-04-2021' into 'master'
...
Polish translations update.
See merge request veloren/veloren!2205
2021-04-27 20:54:48 +00:00
Daniel Mizerski
ec55c176fe
Polish translations update.
2021-04-27 17:33:30 +02:00
Ludvig Böklin
34660462e9
Glider physics
2021-04-27 14:41:48 +00:00
Samuel Keiffer
3f451ef7b3
Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master'
...
Fix campfire heal buff description
See merge request veloren/veloren!2165
2021-04-25 23:06:48 +00:00
Illia Denysenko
efd54021a7
Fix campfire heal buff description
2021-04-25 23:06:47 +00:00
Joshua Barretto
559e16e035
Apply flat earth hack to mist
2021-04-25 23:28:19 +01:00
Joshua Barretto
3e4afc5a45
Capped light access
2021-04-25 22:49:20 +01:00
Joshua Barretto
98f660e486
More realistic cloud light extinction model
2021-04-25 22:26:07 +01:00
Joshua Barretto
fa262d2a5c
Fixed near cloud bug
2021-04-25 20:04:00 +01:00
Monty
2e24fcf165
Add i18n, change SCT Blocked col and string
2021-04-25 13:09:09 -04:00
Sam
d2d8d43410
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
alfy
73cb6d19ff
Fixed the sounds since they were seemingly empty, as well as a new more organic wind sound
2021-04-25 13:09:06 -04:00
alfy
9f79c80072
block and parry sounds added
2021-04-25 13:09:06 -04:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Ada Lovegirls
01c30868eb
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee
Merge branch 'xvar/server-version-check' into 'master'
...
Added client/server version mismatch warnings
See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f
Added client/server version mismatch message when a network error is encountered during client init.
...
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
holychowders
516f2fec4a
Fix grammatical error in NPC message
2021-04-23 22:43:37 -07:00
Illia Denysenko
4e7aba5b3f
update uk_UA localization
2021-04-23 21:30:46 +00:00
Nícolas Wildner
6188bb9e96
update pt_br 20210422
2021-04-23 01:00:41 +00:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
Joshua Barretto
19184a49a7
Made the pit of tartarus less bad
2021-04-21 22:18:44 +01:00
Joshua Barretto
81ba200e48
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
Monty
a1b4e0bdaf
remove old craftsman hammer, add migration
2021-04-20 03:34:11 +02:00
Joshua Barretto
11ba02130c
Made sprite/block selection effect more subtle
2021-04-20 02:46:07 +02:00
Joshua Barretto
483276b082
Made sprite/block selection effect more subtle
2021-04-20 02:46:06 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
Joshua Barretto
c5455fa1a1
Merge branch 'zesterer/small-fixes' into 'master'
...
Small fixes
See merge request veloren/veloren!2163
2021-04-19 21:54:26 +00:00
Joshua Barretto
4ad5257e40
Rebalanced mist
2021-04-19 22:26:56 +01:00
Joshua Barretto
86287e8f0a
Fixed negative cloud density bug
2021-04-19 22:02:47 +01:00
Imbris
8c9d4dc3dd
Merge branch 'capucho/inactive-master' into 'master'
...
Lower volume of window on focus loss
See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
Marcel
c5caec4921
Merge branch 'capucho/map-kb-zoom' into 'master'
...
Add keybindings for map/minimap zoom
See merge request veloren/veloren!2161
2021-04-19 19:52:27 +00:00
João Capucho
164411cb43
Voxygen: Added translations for map zoom
2021-04-19 20:27:02 +01:00
Marcel
3c3aa3d325
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for uk_UA
See merge request veloren/veloren!2155
2021-04-19 19:26:20 +00:00
Illia Denysenko
ef8926bc5c
Update localization for uk_UA
2021-04-19 19:26:20 +00:00
João Capucho
f23b515dd8
Voxygen: Add master volume sliders to the settings
2021-04-19 19:58:14 +01:00
Joshua Barretto
f0f3da529b
Fixed water shader, sky shader
2021-04-19 14:42:49 +01:00
Sam
ce7581037c
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
Samuel Keiffer
60d38cc03b
Merge branch 'aweinstock/dodgesplosion' into 'master'
...
Unlock dodge roll iframes and staff explosion by default.
See merge request veloren/veloren!2146
2021-04-18 20:46:15 +00:00
Avi Weinstock
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Marcel
62fcdcd998
Merge branch 'nwildner/update_pt_BR_20210417' into 'master'
...
update pt_br 20210417
See merge request veloren/veloren!2143
2021-04-18 19:33:39 +00:00
Nícolas Wildner
24b55d0f07
update pt_br 20210417
2021-04-18 19:33:39 +00:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Marcel
2a0c8e575f
Merge branch 'kinggred-master-patch-80352' into 'master'
...
Update main.ron
See merge request veloren/veloren!2123
2021-04-17 18:28:31 +00:00
Samuel Keiffer
a1d9ba15d9
Merge branch 'DaforLynx/normalize' into 'master'
...
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
f441c8c206
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
c962c5f12e
Merge branch 'gGmMsS/Burning' into 'master'
...
Added burning debuff for Staff M2
See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
gGmMsS123
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
gGmMsS123
0d956610ec
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Avi Weinstock
2fb7575d60
Address MR 2126 comments.
2021-04-15 15:17:39 -04:00
Avi Weinstock
50d0314a75
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Stanisław Grupiński
fd7bf41678
Update main.ron
2021-04-14 12:40:02 +00:00
jshipsey
ea9b871374
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb
alpha attacks
2021-04-13 20:18:59 -04:00
jshipsey
b53e1653f6
initial wield testing
2021-04-13 20:18:58 -04:00
Yuri Socher Bichibichi
c6dea3acca
Updates the Brazilian Portuguese (pt-BR) translation
2021-04-13 11:56:58 -03:00
Samuel Keiffer
e1020945dd
Merge branch 'aweinstock/combat-music' into 'master'
...
Add combat music transitions based on number of enemies in player radius.
See merge request veloren/veloren!2077
2021-04-12 06:01:19 +00:00
Marcel
e4a67a9ba2
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for Ukrainian
See merge request veloren/veloren!2107
2021-04-12 02:28:56 +00:00
Illia Denysenko
4ac8015ed9
Update localization for Ukrainian
2021-04-12 02:28:55 +00:00
Avi Weinstock
df4f44d946
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
7c34a96934
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
Avi Weinstock
f1b022cdee
Add new version of combat soundtrack, and change details of how transitions between tracks work.
2021-04-11 22:08:41 -04:00
Avi Weinstock
5bfdd5f1af
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
54024ce401
Merge branch 'DaforLynx/more-music' into 'master'
...
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
9db290d4ea
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
2021-04-12 00:43:08 +00:00
Marcel
5e7adc6767
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
8a25ebb59a
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Marcel
d7a9ab7e23
Merge branch 'master' into 'master'
...
Update and fix zh_CN
See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
