Christof Petig
|
bab8c713fb
|
simplify cache handling
|
2024-01-27 12:40:25 +01:00 |
|
flo
|
77af5ef097
|
Merge branch 'sea_decor_block_fix' into 'master'
sea_decor_block_fix
See merge request veloren/veloren!4278
|
2024-01-26 18:34:41 +00:00 |
|
maxicarlos08
|
bfba00e39f
|
Merge branch 'crabman/lossy-compression-sprites' into 'master'
Store sprite data separately for compressed chunks
See merge request veloren/veloren!4277
|
2024-01-26 17:46:53 +00:00 |
|
flo666
|
7714bd0445
|
sea_decor_block_fix
|
2024-01-26 18:41:24 +01:00 |
|
Maxicarlos08
|
76627cd544
|
only use hash cache, fix compression benchmark, fixed be/le bug
|
2024-01-26 17:48:37 +01:00 |
|
Maxicarlos08
|
c5ddf73dc2
|
optimize sprites in compressed chunks
|
2024-01-26 16:26:26 +01:00 |
|
Maxicarlos08
|
b4ac1f7036
|
fix chunk compression benchmarks
|
2024-01-26 14:33:42 +01:00 |
|
Maxicarlos08
|
e2c2e1bce1
|
store sprite data separately for compressed chunks
|
2024-01-26 11:16:06 +01:00 |
|
Imbris
|
fd2e45cfde
|
Merge branch 'crabman/terrain-persistence-crash' into 'master'
don't remove blocks when applying changes for new chunks
See merge request veloren/veloren!4276
|
2024-01-26 02:08:59 +00:00 |
|
Maxicarlos08
|
47a909e94d
|
fix the *actual* crash
|
2024-01-26 02:31:21 +01:00 |
|
Illia Denysenko
|
34a53fd71c
|
Merge branch 'weblate-translation' into 'master'
Update translation files
See merge request veloren/veloren!4275
|
2024-01-26 00:01:07 +00:00 |
|
Illia Denysenko
|
353351e16a
|
Update translation files
|
2024-01-26 00:01:07 +00:00 |
|
Maxicarlos08
|
f759fd5059
|
don't remove blocks when applying changes for new chunks
|
2024-01-26 00:57:21 +01:00 |
|
maxicarlos08
|
880e9044d5
|
Merge branch 'burnpot-model' into 'master'
New bed and door sprites
See merge request veloren/veloren!4184
|
2024-01-25 21:12:36 +00:00 |
|
Illia Denysenko
|
e1aae75dc3
|
Merge branch 'weblate-translation' into 'master'
Translated using Weblate (Spanish (Latin America))
See merge request veloren/veloren!4274
|
2024-01-25 20:36:52 +00:00 |
|
Illia Denysenko
|
4ab0717e71
|
Translated using Weblate (Spanish (Latin America))
|
2024-01-25 20:36:52 +00:00 |
|
unknown
|
015f43ca87
|
Merge branch 'burnpot-model' of https://gitlab.com/veloren/dev/veloren into burnpot-model
|
2024-01-25 15:54:46 -03:00 |
|
unknown
|
47694f6896
|
Updated bed sprite offsets
|
2024-01-25 15:54:07 -03:00 |
|
Maxicarlos08
|
4276dbd628
|
updated bed sprite height
|
2024-01-25 19:40:58 +01:00 |
|
unknown
|
10fab1f508
|
New bed and door sprites
|
2024-01-25 14:47:56 -03:00 |
|
unknown
|
928a3bb6ca
|
New bed and door sprites
|
2024-01-25 14:42:42 -03:00 |
|
unknown
|
962bbcb045
|
Update Burning Potion model
|
2024-01-25 14:37:26 -03:00 |
|
Imbris
|
b6dfa349bb
|
Merge branch 'timvinc/1912_3rd_person_view_jumping' into 'master'
Fixes #1912 - stops centering the cursor to prevent camera jumping when the cursor grab is released
Closes #1912
See merge request veloren/veloren!4271
|
2024-01-24 07:43:53 +00:00 |
|
maxicarlos08
|
8d3cd277b9
|
Merge branch 'jcoxeye/price-entries' into 'master'
Lots of price entries for miscellaneous items
See merge request veloren/veloren!4231
|
2024-01-24 06:57:07 +00:00 |
|
Tim Vincent
|
2ac2f2d45e
|
stops centering the cursor to prevent camera jumping when the cursor grab is released
|
2024-01-23 20:09:23 -08:00 |
|
maxicarlos08
|
ef84ab6603
|
Merge branch 'jcoxeye/item-tiering-fixes' into 'master'
Adjusted tiers of various items
See merge request veloren/veloren!4249
|
2024-01-23 21:58:14 +00:00 |
|
JCoxeye
|
d017844416
|
Adjusted tiers of various items
|
2024-01-23 21:58:14 +00:00 |
|
JCoxeye
|
3207df3762
|
Rebalances, and moved sandals to cloth armor loot table, in line with other starter armor.
|
2024-01-23 16:46:24 -05:00 |
|
Joshua Barretto
|
92a8bc2806
|
Merge branch 'zesterer/toggle-light-sprites' into 'master'
Added the ability to toggle light sources on and off
See merge request veloren/veloren!4267
|
2024-01-22 09:39:31 +00:00 |
|
Joshua Barretto
|
49ba880af0
|
Removed irrelevant test
|
2024-01-21 22:14:40 +00:00 |
|
Samuel Keiffer
|
6c5e0a698e
|
Merge branch 'do-no-van/sword-rebalancing' into 'master'
sword ability rebalancing
See merge request veloren/veloren!4268
|
2024-01-21 22:12:49 +00:00 |
|
Joshua Barretto
|
d836461f8d
|
Use SpriteInteract state for toggling lights
|
2024-01-21 21:30:08 +00:00 |
|
Joshua Barretto
|
4a89d88e9b
|
Added default sprite attribute state
|
2024-01-21 21:30:08 +00:00 |
|
Joshua Barretto
|
ad8965fdd7
|
Don't use distinct event system for handling sprite interactions
|
2024-01-21 21:30:08 +00:00 |
|
Joshua Barretto
|
4cbec5d93c
|
Interaction distance check, better text
|
2024-01-21 21:30:08 +00:00 |
|
Joshua Barretto
|
e231b8f9c1
|
Apply watcher properties more sensibly
|
2024-01-21 21:30:08 +00:00 |
|
Joshua Barretto
|
e0ebe6939e
|
Added the ability to toggle light sources on and off
|
2024-01-21 21:30:06 +00:00 |
|
do-no-van
|
646c57501f
|
make fortitude scale of difference from maximum health
|
2024-01-21 20:18:19 +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 |
|
Samuel Keiffer
|
9998dbd587
|
Merge branch 'sam/expose-charms' into 'master'
Charms now have crafting recipes.
See merge request veloren/veloren!4179
|
2024-01-21 17:39:37 +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 |
|
Isse
|
0755f339a2
|
Merge branch 'woeful/1923-wrong-digging-tooltip' into 'master'
Fixes #1923 - Pickaxe tooltip wrong for digging
Closes #1923
See merge request veloren/veloren!4263
|
2024-01-21 14:21:46 +00: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 |
|
Illia Denysenko
|
727d32c104
|
Merge branch 'master' into 'master'
Prevent time until next battlemode change from being displayed as negative
See merge request veloren/veloren!4205
|
2024-01-21 13:35:09 +00:00 |
|