crabman
c589bc5ca0
friendly fire and pvp at desert arenas!
2024-03-26 11:34:07 +00:00
crabman
4d67e808e1
address review comments
2024-03-26 11:34:07 +00:00
crabman
89af8facbe
fix frozen aura particles
2024-03-25 19:56:08 +00:00
crabman
8dd7e3e0d5
/aura command
2024-03-25 19:56:08 +00:00
crabman
af4f147fda
FriendlyFire and ForcePvP auras
2024-03-25 19:56:08 +00:00
crabman
7afadf5b56
Merge branch 'crabman/dependency-fix' into 'master'
...
Update outdated dependency
See merge request veloren/veloren!4393
2024-03-23 20:37:19 +00:00
crabman
a8bd0ade13
update outdated dependency
2024-03-23 20:03:24 +00:00
Isse
e22cbab7ce
Merge branch 'treeco/lod-models' into 'master'
...
Overhaul of LOD models
See merge request veloren/veloren!4390
2024-03-23 18:54:17 +00:00
Isse
9079a0e3c4
Merge branch 'synis/cave-performance' into 'master'
...
Addressing cave feedback and performance improvements
See merge request veloren/veloren!4360
2024-03-23 17:55:59 +00:00
Treeco
36cab14859
Addressed comments
2024-03-23 17:32:54 +00:00
Treeco
86a27f2ddf
Changelog
2024-03-23 17:32:54 +00:00
Treeco
954cede352
Add new LOD trees and objects
2024-03-23 17:32:54 +00:00
Treeco
62a99f2466
Use real colours for LOD trees and rooftops, lay groundwork for further additions
2024-03-23 17:32:54 +00:00
Treeco
81302a7017
Cedar rework (NOT LOD)
2024-03-23 17:32:54 +00:00
Syniis
361fb5b080
Use fixed size array for crystals
2024-03-23 18:11:42 +01:00
crabman
3d3bc74d75
Merge branch 'crabman/roll-panic-fix' into 'master'
...
Fix panic when interrupting rolls just before ending on slower clients
See merge request veloren/veloren!4392
2024-03-23 00:21:35 +00:00
crabman
0296ee1a2c
Fix panic when interrupting rolls just before ending on slower clients
2024-03-22 23:51:12 +00:00
Syniis
46af9ee489
Biome distribution tweaks
2024-03-22 23:14:18 +01:00
Syniis
81c2b7e969
Several tweaks to biome distribution
2024-03-22 21:34:30 +01:00
Syniis
87c847b108
Cleanup
2024-03-22 21:34:30 +01:00
Syniis
a07e270220
Address cave feedback
2024-03-22 21:34:30 +01:00
Syniis
767731ecb0
Cave performance improvements
2024-03-22 21:34:30 +01:00
Joshua Barretto
3c846d4d17
Merge branch 'zesterer/shader-improvements' into 'master'
...
Shader improvements
See merge request veloren/veloren!4290
2024-03-22 18:40:45 +00:00
Marcel
72106deccf
Merge branch 'xMAC/update_cache' into 'master'
...
update docker-ci cache
See merge request veloren/veloren!4388
2024-03-21 09:49:14 +00:00
Marcel Märtens
3e10ff2b1a
update cache for speed purposes
2024-03-21 09:57:08 +01:00
Marcel
fbca6d852b
Merge branch 'juliancoffee/remove-general-st' into 'master'
...
Remove health, energy and roll skills
See merge request veloren/veloren!4382
2024-03-20 22:12:47 +00:00
Marcel
710a007ab2
Merge branch 'xMAC/update_deps' into 'master'
...
xmac/update deps
See merge request veloren/veloren!4385
2024-03-20 21:35:02 +00:00
juliancoffee
c7cc287e89
Respond to review
...
- Add changelog
- Remove unused code
2024-03-20 23:12:35 +02:00
juliancoffee
7e4dcfd95a
Re-shape General ST UI
2024-03-20 23:11:33 +02:00
juliancoffee
90454b1287
Remove roll skills
2024-03-20 23:11:31 +02:00
juliancoffee
55ae460d1d
Remove health/energy increase skills
2024-03-20 23:08:45 +02:00
juliancoffee
1e6e595a87
Comment-out health/energy skills
2024-03-20 23:08:45 +02:00
Illia Denysenko
32989ffe99
Merge branch 'juliancoffee/ban-rolls' into 'master'
...
Rolls don't skip recovery anymore
See merge request veloren/veloren!4387
2024-03-20 20:49:42 +00:00
juliancoffee
6e0dec847f
Give rolls full power only during movement stage
...
+ Make roll only give hitbox reduction during movement
+ Make roll only give iframes during movement
+ Move slowly while in roll-buildup
2024-03-20 21:23:29 +02:00
juliancoffee
9528564b71
Rolls don't skip recovery anymore
...
Instead recovery of previous step flows into roll buildup
2024-03-20 21:13:29 +02:00
crabman
2beed7fd79
Merge branch 'uniior/cacti2' into 'master'
...
Revised cacti sprites
See merge request veloren/veloren!4384
2024-03-20 14:03:27 +00:00
Uniior
92e5bad450
Revised cacti sprites
2024-03-20 14:03:27 +00:00
Illia Denysenko
d1eed88aee
Merge branch 'weblate-translation' into 'master'
...
Update translation files (Weblate)
See merge request veloren/veloren!4386
2024-03-20 12:05:44 +00:00
Otto Richter
ac5ccb671a
Update translation files (Weblate)
2024-03-20 12:05:44 +00:00
Marcel Märtens
1ed2895a49
cargo upgrade all
2024-03-20 09:39:13 +01:00
Marcel Märtens
941b204681
update some dependencies manually
2024-03-20 09:36:58 +01:00
Marcel
b0011ee494
Merge branch 'walpo/update-changelog' into 'master'
...
Correct changelog format and spelling
See merge request veloren/veloren!4377
2024-03-19 22:21:40 +00:00
Javier Pérez
104c172e3e
Correct changelog format and spelling
2024-03-19 22:21:39 +00:00
Marcel
da01818c87
Merge branch 'xMAC94x/ui' into 'master'
...
add webui for veloren-server with working players
See merge request veloren/veloren!4375
2024-03-18 23:50:56 +00:00
crabman
6a76028472
Merge branch 'loot-table-balance' into 'master'
...
Loot table balance
See merge request veloren/veloren!4373
2024-03-18 21:11:49 +00:00
Isse
f46b8631b5
Merge branch 'pillar-removal' into 'master'
...
Remove pillars from Sahagin and Myrmidon dungeons
See merge request veloren/veloren!4378
2024-03-18 18:10:26 +00:00
Marcel Märtens
9e2fdb1c88
add comments to warn devs of security impacts
2024-03-18 13:37:50 +01:00
crabman
016fb0bc9b
Removed normalized ProbabilityFile tests
...
These tests no longer make sense, as multiple different items can now
drop in one roll and the probabilities can't be normalized.
These tests did not fail previously because they only checked one
specific loot table, which hasn't been touched until now.
2024-03-18 11:54:33 +00:00
Hrom
78cd928069
carapace drakes
2024-03-18 12:48:30 +01:00
Hrom
ab842beb96
deadwood fix
2024-03-18 11:48:30 +01:00
