Commit Graph

14957 Commits

Author SHA1 Message Date
BigKhan
7dce9513c1 cleaned description 2024-01-28 14:37:08 +00:00
BigKhan
69f549deab made the trees maples instead. renamed the ForestKind to match. 2024-01-28 14:34:11 +00:00
BigKhan
9d36a1446d adding autumn trees to temperate forest 2024-01-27 22:52:57 +00:00
BigKhan
f626fdc496 Added Autumn Trees 2024-01-27 21:12:51 +00:00
maxicarlos08
d11c58b75b Merge branch 'synis/item-tabcomplete' into 'master'
Incremental item path autocomplete

See merge request veloren/veloren!4281
2024-01-27 18:03:21 +00:00
Isse
2023786f5e Merge branch 'isse/optimize-weather' into 'master'
Optimize weather

See merge request veloren/veloren!4270
2024-01-27 17:20:53 +00:00
Syniis
04acb82d75 Fix asset prefix not working with sudo 2024-01-27 17:34:25 +01:00
Syniis
488922ac94 Cleaner code 2024-01-27 16:16:30 +01:00
Syniis
b97e27df9a Allow specifiying prefix for AssetPath command argument 2024-01-27 15:44:03 +01:00
Syniis
d46dbb9708 Incremental item path autocomplete 2024-01-27 13:41:39 +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
Isse
61a568ab53 weather/tick.rs fixes 2024-01-25 00:40:04 +01:00
Isse
ef59e57347 round to nearest integer for compressed weather 2024-01-25 00:35:14 +01:00
Isse
a7282f9f2e add back removed comment 2024-01-25 00:34:13 +01: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
Isse
5e37697f0c add comment about lightning 2024-01-23 23:20:10 +01:00
Isse
497cb13e50 always use players weather, and fix weather fr this time 2024-01-23 23:18:14 +01: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
Isse
8f15dedc3b fix weather_zone command, and only send local wind once every 30 ticks 2024-01-23 22:21:33 +01:00
Isse
b55038a526 rename SharedWeather to CompressedWeather 2024-01-23 21:05:57 +01:00
Isse
268215b301 make weather not block main thread, and lessen the amount of data shared with client. 2024-01-22 19:53:36 +01: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