Joshua Barretto
4cbec5d93c
Interaction distance check, better text
2024-01-21 21:30:08 +00:00
do-no-van
8c5759cb5e
balance sword abilities
2024-01-21 20:18:19 +00:00
Illia Denysenko
5137966940
Merge branch 'evgenkot/follow-up-processing-of-i18n-items' into 'master'
...
i18n items processing
See merge request veloren/veloren!4260
2024-01-21 18:45:08 +00:00
Evgen Kot
7ea133e4b5
Correcting comments for i18n changes and moving debug.ftl to admin.ftl
2024-01-21 22:03:17 +05:00
Evgen Kot
5a1efcc964
Move npc and unused armor to npc.ftl and lanterns, bags, gliders to other.ftl
2024-01-21 21:33:44 +05:00
evgenkot
7fb8506565
Split i18n items by category
2024-01-21 21:29:27 +05:00
evgenkot
799d636833
Change names of items with the same vox descriptor
...
| old | new |
|-|-|
| object-key_rusty-0-ancient | object-key_quarry_ancient |
| object-key_rusty-0-backdoor | object-key_quarry_backdoor |
| items-keeper_goggle | object-key_quarry_keeper_goggle_left |
| items-keeper_goggle-flamekeeper_right | object-key_quarry_keeper_goggle_right |
| object-key_rusty-0-overseer | object-key_quarry_overseer |
| object-key_rusty-0-smelting | object-key_quarry_smelting |
| weapon-staff-firestaff_starter | weapon-staff-firestaff_humble_stick |
| weapon-staff-firestaff_starter_gnarled | weapon-staff-firestaff_starter |
| weapon-hammer-2hhammer_rusty-starter_hammer | weapon-hammer-2hhammer_starter |
| armor-misc-chest-worker_green-worker_orange_0 | armor-misc-chest-worker_orange_0 |
| armor-misc-chest-shirt_white-worker_orange_1 | armor-misc-chest-worker_orange_1 |
| armor-misc-chest-worker_green-worker_purple_0 | armor-misc-chest-worker_purple_0 |
| armor-misc-chest-shirt_white-worker_purple_1 | armor-misc-chest-worker_purple_1 |
| armor-misc-chest-worker_green-worker_red_0 | armor-misc-chest-worker_red_0 |
| armor-misc-chest-shirt_white-worker_red_1 | armor-misc-chest-worker_red_1 |
| armor-misc-chest-worker_green-worker_yellow_0 | armor-misc-chest-worker_yellow_0 |
| armor-misc-chest-shirt_white-worker_yellow_1 | armor-misc-chest-worker_yellow_1 |
| armor-misc-back-backpack-backpack | armor-misc-back-backpack-traveler |
| armor-tabard_admin-admin | armor-tabard-admin_tabard |
| armor-misc-back-admin-admin_back | armor-misc-back-admin_back |
| weapon-sword-frost-1-admin_sword | weapon-sword-frost-admin_sword |
| armor-velorite_battlemage-belt-cultist_belt | armor-velorite-belt |
| armor-velorite_battlemage-foot-cultist_boots | armor-velorite-boots |
| armor-velorite_battlemage-chest-cultist_chest_blue | armor-velorite-chest |
| armor-velorite_battlemage-hand-cultist_hands_blue | armor-velorite-hands |
| armor-velorite_battlemage-pants-cultist_legs_blue | armor-velorite-legs |
| armor-velorite_battlemage-shoulder-cultist_shoulder_blue | armor-velorite-shoulder |
| armor-velorite_battlemage-back-dungeon_purple | armor-velorite-back |
| weapon-bow-velorite-velorite_bow_debug | weapon-bow-velorite-debug |
| sprite-mineral-ore-coal | sprite-mineral-stone-coal |
| sprite-mineral-ore-coal-coal | sprite-mineral-ore-coal |
| sprite-crafting_ing-animal_misc-grim_eyeball | sprite-crafting_ing-animal_misc-cyclops_eyeball |
| sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball | sprite-crafting_ing-animal_misc-grim_eyeball |
| object-potion_red-potion_big | object-potion_big |
| object-potion_red-potion_med | object-potion_med |
| object-potion_red-potion_minor | object-potion_minor |
| sprite-flowers-sunflower_1-yellow | sprite-flowers-yellow |
2024-01-21 21:21:10 +05:00
Maxicarlos08
0b1f8dc29a
add charm buff icons
2024-01-21 15:05:31 +01:00
maxicarlos08
83a24acc1e
Add charm animation
2024-01-21 15:00:06 +01:00
Sam
95835887e1
Charms now have crafting recipes.
2024-01-21 15:00:06 +01:00
Marcel
d4f993ca1d
Merge branch 'minor-fixes' into 'master'
...
Correct/improve some en-US text.
See merge request veloren/veloren!4246
2024-01-21 10:12:20 +00:00
flo666
a849286563
fix_adlet_elder_sword
2024-01-20 21:07:38 +01:00
Samuel Keiffer
3224bc5147
Merge branch 'crabman/earthsplitter-nerf' into 'master'
...
earthsplitter nerf
See merge request veloren/veloren!4264
2024-01-20 18:30:55 +00:00
flo
48a79b3e78
haniwa
2024-01-20 17:45:23 +00:00
Maxicarlos08
d30fed3961
earthsplitter nerf
2024-01-20 18:32:29 +01:00
Isse
99154897b2
Merge branch 'fvasco-command' into 'master'
...
Add assets/voxygen/i18n/it/command.ftl
See merge request veloren/veloren!4124
2024-01-18 18:00:51 +00:00
Francesco Vasco
0e9630bd13
Add assets/voxygen/i18n/it/command.ftl
2024-01-18 18:00:51 +00:00
Codeberg Translate
b91d37a5ee
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Translation: Veloren/voxygen-hud-subtitles
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/
2024-01-17 18:56:43 +00:00
Codeberg Translate
ff73a9b3cc
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/
Translation: Veloren/voxygen-npc
2024-01-17 18:56:43 +00:00
Joshua Barretto
a852298010
Merge branch 'zesterer/better-char-select-scene' into 'master'
...
Render render LoD terrain on char select, remove old backdrop figure
See merge request veloren/veloren!4254
2024-01-16 18:51:04 +00:00
Isse
4f084506c0
Merge branch 'juliancoffee/item-i18n' into 'master'
...
Add Item i18n
Closes #903
See merge request veloren/veloren!4250
2024-01-16 17:58:35 +00:00
juliancoffee
d3fcade857
Rename ItemL10n to ItemI18n
2024-01-16 19:14:14 +02:00
Maxicarlos08
25c7169991
Renamed share_with_server -> send_to_server
...
requested by @juliancoffee
2024-01-16 17:21:52 +01:00
JCoxeye
941e953348
Merge branch veloren:master into jcoxeye/price-entries
2024-01-15 22:47:06 +00:00
Joshua Barretto
d51b5c5bea
Add airship to char select
2024-01-15 22:35:42 +00:00
Joshua Barretto
43d935a150
Render render LoD terrain on char select, remove old backdrop figure
2024-01-15 19:06:17 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen
2024-01-15 00:03:23 +01:00
Joshua Barretto
f99bf91617
Added rules menu when connecting to server
2024-01-15 00:02:43 +01:00
juliancoffee
7228543fbf
Mark legacy item asset content
2024-01-14 21:25:15 +02:00
juliancoffee
28b400825e
Add item localization assets
2024-01-14 21:25:15 +02:00
juliancoffee
b8e6840bf6
Enhance /kit all
...
- "all" is now in proposed completions
- `/kit all` gives all imaginable items, it's not limited to assets
anymore
2024-01-14 21:25:15 +02:00
juliancoffee
aba8ec7558
Implement item localization
...
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
try_all_item_defs() covers only items in asset folder.
Required assets will go in next commit
2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a
Make sfx.ron use ItemKey
2024-01-14 21:25:15 +02:00
Samuel Keiffer
dc215ace34
Merge branch 'juliancoffee/buff-misc-cmd' into 'master'
...
Add /buff_complex command
See merge request veloren/veloren!4243
2024-01-14 17:35:21 +00:00
JCoxeye
be951e747c
Merge branch veloren:master into jcoxeye/price-entries
2024-01-11 14:21:23 +00:00
Hrom
88c5a2e009
renamed twiggy shoulders
2024-01-09 23:54:32 +00:00
juliancoffee
296f70c1b2
Unify /buff_complex and /buff
...
Turns out parse_cmd_args allows omitting arguments, /buff <buff>
[misc_data] will be idential to /buff <buff> [strength] [duration]
[misc_data]
2024-01-08 20:13:17 +02:00
juliancoffee
2746a98f40
Add /buff_complex command
2024-01-08 20:13:17 +02:00
juliancoffee
5aa30b0175
Warn about complex buffs when using /buff
2024-01-08 20:13:17 +02:00
Isse
12a4c5a256
Merge branch 'the_dimasmith/update-uk' into 'master'
...
update Ukrainian translation
See merge request veloren/veloren!4215
2024-01-08 16:39:08 +00:00
Dmytro Kovalchuk
95f63e46e6
update Ukrainian translation
2024-01-08 16:39:08 +00:00
Darren Salt
7051ba5c89
Correct/improve some en-US text.
2024-01-05 11:47:27 +00:00
Pybit
f6204f9d04
Merge branch 'master' into 'More-potions'
...
# Conflicts:
# CHANGELOG.md
2024-01-04 11:48:30 +00:00
Isse
100568f955
Merge branch 'feat/time_length_on_map_settings' into 'master'
...
Feat: Day duration slider on map creation UI (#1909 )
Closes #1909
See merge request veloren/veloren!4204
2024-01-03 22:21:53 +00:00
Joaquin Tornello
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00:00
Darren Salt
dc0725e104
Avoid a wgpu SPIR-V warning about BitFieldUExtract
...
premultiply-alpha-vert.glsl contains a function unpack() which, without this
change, causes the following warnings:
WARN wgpu_core::device: Failed to parse shader SPIR-V code for Some("premultiply-alpha-vert.glsl …"): UnsupportedInstruction(Function, BitFieldUExtract)
WARN wgpu_core::device: Proceeding unsafely without validation
This avoids that warning (and removes now-unnecessary type conversions).
2024-01-03 16:33:02 +00:00
Samuel Keiffer
5bd089c56d
Merge branch 'sam/remove-combo-melee' into 'master'
...
Deprecated combo melee character state
See merge request veloren/veloren!4233
2023-12-29 17:29:44 +00:00
DaforLynx
0b62898060
Audio fixes and new music
2023-12-29 00:25:08 +00:00
Sam
f65d449aa3
Deprecated combo melee character state
2023-12-28 19:02:10 -05:00
JCoxeye
49994af136
Added glacial crystal to unsellable_materials.ron, and buffed price of boreal armor by 5x.
2023-12-27 08:34:27 -05:00
JCoxeye
0f46eeaa78
Added price entries for glass and bone dungeon keys to collection.ron, and listed their good type as default in trade_pricing.rs
2023-12-27 07:59:03 -05:00
JCoxeye
41bec15bc5
Added price entries for blue falcon, moonrise glider, and eerie pumpkin lantern to collection.ron, and added price entries for liana kit and heavy seabag to misc_armor.
2023-12-27 07:59:03 -05:00
JCoxeye
3f747b5ab3
Reverted grim salvager loot table changes, added bandanas and hoods to misc_armor, and roughly adjusted file weighting accordingly.
2023-12-27 07:59:02 -05:00
JCoxeye
3dc2c04491
Reduced price of abyssal heart.
2023-12-27 07:59:02 -05:00
JCoxeye
9334c7a2f9
Added price entries for coral, brinestone, abyssal hearts, and pearls in unsellable_materials.
2023-12-27 07:59:01 -05:00
JCoxeye
a7562b1baf
Added a loot table in assets/common/trading for misc_armor, containing a variety of assorted armor.
2023-12-27 07:59:01 -05:00
JCoxeye
5c90797ee1
Moved grim salvager armor drops to their own loot table, and gave said loot table a price entry.
2023-12-27 07:59:00 -05:00
JCoxeye
853165e465
Added price entries for cultist and boreal armor loot tables. Removed redundant jewellery price table.
2023-12-27 07:59:00 -05:00
flo
c123bdaef5
various_small_fixes
2023-12-27 07:30:22 +00:00
Jeffrey Cox
31c04f1ffb
Small leather pouches salvage into simple leather as opposed to thick leather
2023-12-25 21:55:41 +00:00
Froggy
7c66fff767
Froggy/armor offset fixes
2023-12-25 12:14:24 +00:00
Christof Petig
5af8c4687e
Merge branch 'christof/christmas23' into 'master'
...
Christmas theme revival
See merge request veloren/veloren!4209
2023-12-20 17:02:01 +00:00
Froggy
8cfd65ff76
fixed armor offsets to enable mix'n'match armor
2023-12-20 12:05:58 +00:00
Froggy
01ac73b73e
fixed headwear offsets and some vox files
2023-12-18 20:42:52 +11:00
flo
ecde64a30f
Merge branch 'jcoxeye/resin-seeds-embers-selling' into 'master'
...
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron
See merge request veloren/veloren!4212
2023-12-17 22:49:56 +00:00
do-no-van
b5eaa58728
fix typo and armor offsets
2023-12-17 22:44:43 +00:00
flo
0a42a51810
Merge branch 'poise_resilience_buffs' into 'master'
...
poise_resilience_buffs_for_dagon_and_wyverns
See merge request veloren/veloren!4207
2023-12-17 20:12:13 +00:00
flo
6f5e385d2a
poise_resilience_buffs_for_dagon_and_wyverns
2023-12-17 20:12:13 +00:00
JCoxeye
00434f55c9
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron
2023-12-17 12:41:27 -05:00
Uniior
737b5761f6
Crate and Barrel sprites
2023-12-17 16:17:14 +00:00
flo
569ab5c5ed
crustacean-skeleton and crab
2023-12-16 13:47:55 +00:00
Christof Petig
4b7f3d07d2
add hirdrasil ornament variants and fix clippy
2023-12-16 12:10:17 +01:00
Christof Petig
9b485456eb
Calendar based gear for villagers
2023-12-14 16:31:48 +01:00
Isse
ba02d083da
Merge branch 'isse/walk-toggle' into 'master'
...
Roleplay stuff
See merge request veloren/veloren!4171
2023-12-12 19:59:58 +00:00
Neras
10513091e0
added 10 armor stat for cobalt and bloodstone sets
2023-12-08 14:40:42 +00:00
Isse
b60ebd4131
don't show red text when walking
2023-12-07 20:08:03 +01:00
Isse
63e500d3d8
laying and steering animation
2023-12-07 20:08:02 +01:00
Isse
5320f83462
configurable walking speed
2023-12-07 20:08:02 +01:00
HEIEnthusiast
933c897450
Renamed to potion of agility, burning potion to combustion
2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8
Renamed swiftness to retreating, changed model
2023-12-05 13:09:14 -04:00
HEIEnthusiast
76b2d7d0e0
Recipe change
2023-11-29 06:56:35 -04:00
HEIEnthusiast
4659a66cfe
Further tweaks
2023-11-29 06:43:46 -04:00
HEIEnthusiast
cc013d7b77
Changing values
2023-11-29 06:25:20 -04:00
HEIEnthusiast
a01d7485e4
Small speed tweak
2023-11-28 11:43:12 -04:00
HEIEnthusiast
5001c4a262
Added swiftness debuffs
2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226
Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions
2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0
Swiftness potion changes
2023-11-28 10:03:07 -04:00
Michał
14120232a0
Phoenix overhaul
2023-11-28 11:13:18 +00:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee
2023-11-27 21:28:12 +01:00
HEIEnthusiast
bb2adfb2e5
Removed strength and regeneration potions
2023-11-27 15:16:44 -04:00
HEIEnthusiast
783cfdc719
Merge branch 'master' into More-potions
2023-11-27 07:00:48 -04:00
HEIEnthusiast
4d87a9ab44
General potion modifications
2023-11-27 06:57:42 -04:00
HEIEnthusiast
59c3162c49
Merge branch 'master' of https://gitlab.com/veloren/dev/veloren
...
12 commits behind master fix
2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d
Changed textures, added strength pot
2023-11-27 06:25:58 -04:00
Isse
69e827dfda
Merge branch 'isse/very-cool-commands' into 'master'
...
Target any entity with commands, and a few new commands.
See merge request veloren/veloren!4192
2023-11-26 15:13:45 +00:00
HEIEnthusiast
0bb74f9efe
Added swiftness and regeneration potions
2023-11-26 10:54:02 -04:00
flo
756ac0eefe
troll_caves_and_camps_into_sites
2023-11-24 07:53:15 +00:00
Isse
5a3e6316a5
fix tethering
2023-11-23 01:01:31 +01:00
Sam
4e0e94b5c6
Removed spin melee character state
2023-11-16 19:17:38 -05:00
Maxicarlos08
17904d9387
crit_power -> precise_power
2023-11-14 18:07:01 -05:00
Maxicarlos08
1d1b51fa51
Adjust precision power
2023-11-14 18:07:01 -05:00
Sam
d3b3bca621
Added precision
2023-11-14 18:06:59 -05:00
Sam
62464dbe11
Removed crit chance stat
2023-11-14 18:06:58 -05:00
Samuel Keiffer
9b878586bf
Merge branch 'poperigby/fire-potion' into 'master'
...
Add Burning Potion that applies the Burning effect to the user
See merge request veloren/veloren!4174
2023-11-14 02:00:52 +00:00
PopeRigby
688fd67c33
Add Burning Potion that applies the Burning effect to the user
2023-11-14 02:00:50 +00:00
Samuel Keiffer
fdb28ec2dd
Merge branch 'sam/buff-maps' into 'master'
...
Changed buffs from using hash maps to an enum map and a slot map.
See merge request veloren/veloren!4182
2023-11-14 01:49:49 +00:00
Sam
3f19c61426
Changed buffs from using hash maps to an enum map and a slot map.
2023-11-12 12:37:28 -05:00
Maxicarlos08
7382f70f1e
Re-enable buff stacking for short buffs
2023-11-12 17:17:20 +01:00
Isse
db1480b564
put ice_reflections under REFLECTION_MODE_HIGH
2023-11-10 12:53:09 +01:00
Christof Petig
424006e000
Merge branch 'site_rock_circle' into 'master'
...
site_rock_circle
See merge request veloren/veloren!4175
2023-11-10 00:31:04 +00:00
flo
9d52110a49
site_rock_circle
2023-11-10 00:31:03 +00:00
Christof Petig
0ddd40336a
Merge branch 'zesterer/worldgen' into 'master'
...
Various worldgen improvements
See merge request veloren/veloren!4152
2023-11-10 00:15:29 +00:00
Sorann753
a63debe1b7
Fixed French Translation
2023-11-09 19:41:05 +00:00
Joshua Barretto
84e59c52fb
Made portal fizz better convey access
2023-11-08 23:19:02 +01:00
Joshua Barretto
83dc22dfbf
Made ice reflective
2023-11-08 23:19:00 +01:00
Joshua Barretto
05863eb1ef
Better mesa layer colours
2023-11-08 23:17:34 +01:00
Uniior
1d8a23c30e
Starter glider.
2023-11-04 22:09:00 +00:00
Isse
7a8e363df1
better way to show glitter
2023-11-02 15:22:32 +01:00
Isse
48d95e7699
SnowGlitter experimental shader
2023-11-02 12:53:34 +01:00
flo
e88d61eb44
npc_spawn_fixes
2023-11-01 18:39:24 +00:00
Maxicarlos08
5f547d62d3
Remove halloween dullahans
2023-10-24 18:34:02 +02:00
Isse
f98e4331a1
Fix LoD reflections for nvidea + vulkan
2023-10-23 19:48:30 +00:00
Joshua Barretto
7589774967
Renamed tether renderer to rope, fixed tether lengths
2023-10-21 13:51:42 +01:00
Joshua Barretto
a5ec81a2ab
Better tether pattern, account for mass
2023-10-21 13:51:41 +01:00
Joshua Barretto
deca7ae258
Finished adding tether graphics
2023-10-21 13:51:40 +01:00
Joshua Barretto
9a72d52c48
Began adding tether visuals
2023-10-21 13:49:04 +01:00
Joshua Barretto
5a41d7e33e
Added cart, notion of rolling resistance (hacky)
2023-10-21 13:49:04 +01:00
Justin Shipsey
c422616f70
Merge branch 'slipped/lavanoise' into 'master'
...
lava noise
See merge request veloren/veloren!4147
2023-10-20 18:11:24 +00:00
Joshua Barretto
cfc5a5c0f0
Stop dullahan spawning in the overworld
2023-10-19 18:24:54 +01:00
jshipsey
cf425a09c8
setup
2023-10-19 00:14:12 -04:00
Joshua Barretto
e81516a154
Log shader warnings
2023-10-18 21:50:40 +01:00
Joshua Barretto
cea7636e29
Reverted bad shader changes
2023-10-18 21:20:15 +01:00
Joshua Barretto
321cc030ad
Better LoD giant trees
2023-10-18 09:58:00 +01:00
Joshua Barretto
ba763f2da5
Make no terrain pop the default
2023-10-18 09:58:00 +01:00
Joshua Barretto
6a82fcf703
Added block noise to LoD objects
2023-10-18 09:58:00 +01:00
Joshua Barretto
8036ffa374
Removed unnecessary shader code
2023-10-18 09:58:00 +01:00
Joshua Barretto
c07d7a212b
Better LoD effects, performance improvements
2023-10-18 09:58:00 +01:00
Joshua Barretto
4d6c3a00f3
Testing better LoD voxelisation techniques
2023-10-18 09:57:59 +01:00
Isse
b6c234b26e
fix puddle details
2023-10-15 00:48:37 +02:00
Raul Wagner Costa
46cf1f1914
Linearize light colors on the CPU
2023-10-14 18:10:35 +00:00
Isse
d620206f37
fix reflection mode low
2023-10-14 09:52:46 +02:00
Joshua Barretto
32b0b33abe
Merge branch 'zesterer/backpack-fixes' into 'master'
...
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
See merge request veloren/veloren!4131
2023-10-13 22:21:53 +00:00
Isse
e0c67c470b
Merge branch 'isse/small-fixes' into 'master'
...
Client local time, used for fluid shaders
See merge request veloren/veloren!4128
2023-10-13 12:17:51 +00:00
Isse
56175c2730
rename client_time to local_time
2023-10-13 13:17:52 +02:00
Joshua Barretto
9dd5cd24d1
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
2023-10-13 11:57:49 +01:00
Joshua Barretto
0f2d4c261a
Merge branch 'zesterer/better-anims' into 'master'
...
Improving some animations
See merge request veloren/veloren!4127
2023-10-12 20:18:11 +00:00
Joshua Barretto
0b1ffb6695
Fixed footstep timings
2023-10-12 20:31:10 +01:00
Isse
3e19c847f1
use client local time for water
2023-10-12 01:46:43 +02:00
Isse
72db9b61b3
client local time
2023-10-12 01:46:12 +02:00
Isse
472b996c8e
Merge branch 'isse/shader-fp-fixes' into 'master'
...
Shader floating point fixes
See merge request veloren/veloren!4120
2023-10-11 23:04:33 +00:00
Isse
a1afd5c62f
fix signs in particle-vert.glsl
2023-10-11 20:46:44 +02:00
Isse
d12f0acd1c
fix uses of time of day, which are scaled wrong
2023-10-11 20:39:17 +02:00
Isse
65e6eb4e38
add comments explaining the elements of time_of_day and tick in shaders
2023-10-11 20:29:37 +02:00
maxicarlos08
8a5f237e9c
Frost gigas tweaks
2023-10-08 11:35:01 +00:00
Uniior
cd91943ebf
Revamps for some object/sprite models
2023-10-07 18:49:06 +00:00
Isse
7d37646dac
renames and comments
2023-10-07 19:53:55 +02:00
Isse
2eae780e71
vectorize wave functions
2023-10-07 19:53:55 +02:00
Isse
bc436e2c9f
make particles only use 1 float for inst time again
2023-10-07 19:53:55 +02:00
Isse
a152e4dfb4
time-proof usages of tick
2023-10-07 19:53:55 +02:00
Isse
6d4be9bd01
time proof time of day in shaders
2023-10-07 19:53:55 +02:00
Maxicarlos08
a3be68930e
review comments
2023-10-02 23:23:42 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup
2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status
2023-09-29 23:30:14 +02:00
Maxicarlos08
9a3f53c32c
added status updates to loading screen
2023-09-29 23:30:14 +02:00
Laura
f4d48d2689
New Arena building and visit site for NPCs
2023-09-26 12:29:14 +00:00
Maxicarlos08
772dd660a1
testing
2023-09-20 23:29:24 +02:00
Maxicarlos08
91284565a2
addressed review comments
2023-09-20 23:29:24 +02:00
Maxicarlos08
fd42b3f767
localize commands
2023-09-20 23:29:24 +02:00
Isse
f4ca60cbb6
Map selector and generation UI
2023-09-17 17:11:19 +00:00
Christof Petig
744ede6a0b
Merge branch 'master' into 'master'
...
fixed item quality to match others
See merge request veloren/veloren!3511
2023-09-12 21:33:21 +00:00
Francesco Vasco
d9b7f202f5
Italian: common-sprite-crate and typo
2023-09-10 11:35:30 +00:00
Maxicarlos08
5fe5440ce2
use All grouping for phoenix drops
2023-09-08 12:21:34 +02:00
Maxicarlos08
e1da740394
updated dungeon cyclops loot table
2023-09-08 00:08:39 +02:00
Maxicarlos08
22a8f3ca89
make adlet elder drop only 1 bone key
2023-09-07 13:33:32 +02:00
Maxicarlos08
2559afa51b
Fixed dungeon cyclops loot table
2023-09-07 13:26:59 +02:00
Maxicarlos08
f26fc8a137
made sagitta and orange monarch obtainable again
2023-09-07 13:05:36 +02:00
Marcel
19742bb930
Merge branch 'translation_fr' into 'master'
...
rename fr/quest.ftl
See merge request veloren/veloren!4096
2023-09-01 18:14:24 +00:00
Marcel
1b7d5f0915
Merge branch 'xMAC94x/fluent_stances' into 'master'
...
add back stances removed by weblate
See merge request veloren/veloren!4095
2023-08-31 16:20:43 +00:00
Marcel Märtens
c9a7e6e072
ad back stances removed by weblate, and register them in EN file, hopefully that weblate accepts them now
2023-08-31 15:51:06 +02:00
Joshua Barretto
d0b3d6a181
Merge branch 'xiretza/better-buff-death-messages' into 'master'
...
Better buff-death messages
Closes #1654
See merge request veloren/veloren!4092
2023-08-31 08:22:56 +00:00
flo
78b2443edc
Merge branch 'qsto/bosses_loot_overhaul' into 'master'
...
Bosses loot overhaul
See merge request veloren/veloren!4072
2023-08-30 12:08:52 +00:00
flo666
579daf77a8
review fixes 2: elder and chieftain: armor drops same tier as weapon drops
2023-08-29 20:45:13 +02:00
flo666
9e44f77a73
review fixes
2023-08-29 20:15:00 +02:00
Xiretza
06111612a3
voxygen: better translation of buff-death messages
...
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.
Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.
```
function getbuff --argument langfile buff
grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end
set buffs burning bleeding curse crippled frozen mysterious
function replacebuffs --argument langfile entity
set slug 'hud-chat-died_of_'$entity'_buff_msg'
for buff in $buffs[-1..1]
set bstr (getbuff $langfile $buff)
or continue
sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
end
sed -i -E 's/('$slug' \=).*/\1/' $langfile
end
function dofile --argument langfile
sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
for entity in pvp npc nonexistent
replacebuffs $langfile $entity
end
sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
sed -i -e /hud-outcome-/d $langfile
sed -i -e '/#.*outcomes/d' $langfile
end
for langfile in assets/voxygen/i18n/*/hud/chat.ftl
echo doing $langfile
dofile $langfile
end
```
2023-08-29 17:09:48 +00:00
Sanctorum Thomas
c0f33efa98
rename quest.ftl
2023-08-29 17:40:48 +02:00
Marcel
0c2b4148fe
Merge branch 'master' into 'master'
...
add fr translations
See merge request veloren/veloren!3979
2023-08-29 10:14:49 +00:00
Thomas S
4d21fbaea5
add fr translations
2023-08-29 10:14:48 +00:00
Marcel
0383fdd626
Merge branch 'master' into 'master'
...
Translation: Update zh_Hans
See merge request veloren/veloren!3970
2023-08-29 10:14:46 +00:00
心慌慌脸红红
65b251436f
Translation: Update zh_Hans
2023-08-29 10:14:45 +00:00
Marcel
0413dfdec2
Merge branch 'vasco-welcome-aboard' into 'master'
...
Italian translation (axe abilities, buffs and others...)
See merge request veloren/veloren!3976
2023-08-29 07:32:39 +00:00
Francesco Vasco
bb4b91244e
Italian translation (axe abilities, buffs and others...)
2023-08-29 07:32:39 +00:00
Marcel
2f1597e2cb
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!4025
2023-08-29 07:28:28 +00:00
walpo
c3a993f93a
fix(i18n): fix mistranslations caused by weblate
2023-08-28 22:59:39 +02:00
Christof Petig
a09637c80d
Merge branch 'master' into 'weblate-translation'
...
# Conflicts:
# assets/voxygen/i18n/uk/buff.ftl
# assets/voxygen/i18n/uk/common.ftl
# assets/voxygen/i18n/uk/hud/settings.ftl
2023-08-28 19:43:06 +00:00
Marcel
b1ebac9c9c
Merge branch 'gaxrodi/ukrainian-translation' into 'master'
...
Update the Ukrainian translation
See merge request veloren/veloren!4083
2023-08-28 18:10:29 +00:00
Codeberg Translate
e103b078c3
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Translation: Veloren/voxygen-hud-misc
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/
2023-08-28 17:37:37 +00:00
Codeberg Translate
cdd2d00017
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
dcabc0ff6a
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
37f9ac31a9
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
da7e379398
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
1b6569ebab
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
a503c5e54d
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Maxicarlos08
fc8a10f551
model update 2
2023-08-27 19:40:49 +02:00
Maxicarlos08
f2958954b9
new model for portal & use cultist particles
2023-08-27 19:40:49 +02:00
Joshua Barretto
6fbca74e88
Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
...
Cheesing fixes to old-style dungeons
See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event
2023-08-19 11:44:58 +02:00
Gaxrodi
b7f92eb6e1
correction of mistakes #2
2023-08-18 21:10:32 +03:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666)
2023-08-17 22:47:35 +02:00
Gaxrodi
3e348ee33c
Update of subtitles.ftl
2023-08-17 20:51:46 +03:00
Gaxrodi
448aa70929
correction of mistakes
2023-08-17 20:26:37 +03:00
Gaxrodi
dccea51b50
translation of stay/follow
2023-08-17 19:52:17 +03:00
Isse
5a9b83aeb0
Merge branch 'evgenkot/si-prefixes-condition' into 'master'
...
Settings for Si prefixes in the interface menu
See merge request veloren/veloren!4061
2023-08-17 15:24:05 +00:00
Evgen Kot
9f213019d1
Settings for Si prefixes in the interface menu
2023-08-17 15:24:05 +00:00
Maxicarlos08
ce8be9596b
fix pets not following after making them stay and translation
2023-08-17 12:10:32 +02:00
Maxicarlos08
8c77356ec1
reduced large cacti sizes
2023-08-16 20:19:35 +02:00
Gaxrodi
0f9feb0a7e
tiny letter correction #2
2023-08-16 18:11:26 +03:00
Gaxrodi
9231123be6
tiny letter correction
2023-08-16 18:04:34 +03:00
tygyh
387d8b47c6
Update swedish translations
2023-08-16 15:13:51 +02:00
flo
fdea283f98
JungleRuin
2023-08-16 12:35:27 +00:00
flo
21bf0a5572
Merge branch 'pirate_hideout_site' into 'master'
...
site pirate_hideout
See merge request veloren/veloren!4057
2023-08-16 06:59:59 +00:00
flo
fba1976dee
site pirate_hideout
2023-08-16 06:59:58 +00:00
Maxicarlos08
0c9a942027
refactor teleporter system and include nearby pets
2023-08-15 12:24:49 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation
2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction
2023-08-15 12:24:49 +02:00
Maxicarlos08
bb2034ca92
portal particles
2023-08-15 12:24:48 +02:00
Maxicarlos08
09f7087ac6
buildup time adjustments
2023-08-15 12:24:48 +02:00
Maxicarlos08
3343ddf4cc
go into blink state at half buildup time
2023-08-15 12:24:48 +02:00
Maxicarlos08
25fcb04ad3
buildup times and portal model update
2023-08-15 12:24:48 +02:00
Maxicarlos08
0f2db68498
added portals
2023-08-15 12:24:17 +02:00
Maxicarlos08
ed8fe545f8
Fixed temperate dungeon entrance height and wall artifacts around dungeons
2023-08-15 12:24:17 +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
e611d695b1
Add stay/follow option for pets
2023-08-15 11:10:52 +02:00
Gaxrodi
e54ca7e80d
ukrainian translation of all files
2023-08-14 21:54:31 +03:00
Gaxrodi
1c8d62f147
ukrainian translation of ability.ftl, trade.ftl
2023-08-12 13:17:33 +03:00
tygyh
67dcb2a778
Update swedish translations
2023-08-11 15:04:56 +02:00
Michal Sroczynski
3a6c3ac669
Small adjustments
2023-08-11 14:09:31 +02:00
Michal Sroczynski
daa1e1b00d
Small adjustments
2023-08-11 11:55:25 +02:00
Michal Sroczynski
c8feb568ba
Bosses loot overhaul p1
2023-08-11 09:47:13 +02:00
Youser Nayme
5ef300c72c
Add keybinding for zooming the camera
2023-08-10 16:55:09 +00:00
Michał
97725a3147
Reliable leather pack
2023-08-09 20:44:51 +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
d74a743d4f
update shovel voxel files to fit animations better
2023-08-08 20:44:37 +02:00
flo666
607af6f227
shovel sfx & particles
2023-08-03 21:52:55 +02:00
flo666
5f7895ffa0
wyverns: parallel loot drops - All()
2023-08-03 20:11:51 +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
UncomfySilence
4c953cd36a
teeny tweak
2023-08-02 22:53:49 +02:00
Michal Sroczynski
2c23781d22
Remove tiers from dungeons names
2023-08-02 18:48:01 +02:00
