Marcel Märtens
|
3a19669d53
|
use workspace dependencies to make our life easier maintaining them :)
|
2023-05-10 18:16:25 +02:00 |
|
Marcel
|
5ade37e0a5
|
Merge branch 'tygyh/Update-swedish-translations' into 'master'
Tygyh/update swedish translations
See merge request veloren/veloren!3922
|
2023-05-10 15:25:12 +00:00 |
|
Jonathan Berglin
|
448b06ca0a
|
Tygyh/update swedish translations
|
2023-05-10 15:25:12 +00:00 |
|
Marcel
|
1592847ce0
|
Merge branch 'xMAC94x/fix_windows' into 'master'
fix windows lib ci copy
See merge request veloren/veloren!3926
|
2023-05-10 15:16:32 +00:00 |
|
Marcel Märtens
|
fd681ea041
|
fix windows lib ci copy
|
2023-05-10 16:38:46 +02:00 |
|
Isse
|
2bc63d22ae
|
Merge branch 'isse/sittable-sprites' into 'master'
Sprites on airships, and mountable sprites
See merge request veloren/veloren!3886
|
2023-05-10 13:55:51 +00:00 |
|
Isse
|
9fa4c7217e
|
more info on todo comment and allow clippy lint
|
2023-05-10 15:22:35 +02:00 |
|
Marcel
|
dc55701c20
|
Merge branch 'vasco/far-far-again' into 'master'
Italian translation
See merge request veloren/veloren!3923
|
2023-05-10 10:31:17 +00:00 |
|
Francesco Vasco
|
9508fd05bb
|
Italian translation
|
2023-05-10 08:17:13 +02:00 |
|
Joshua Barretto
|
5d464ba035
|
Merge branch 'maxicarlos08/terrain-persistance-perf' into 'master'
Performance improvements for persisted terrain
See merge request veloren/veloren!3914
|
2023-05-09 21:52:03 +00:00 |
|
maxicarlos08
|
5c4c47b517
|
Use LRU cache for caching presistent chunks instead of time-based cache
|
2023-05-09 20:06:53 +02:00 |
|
maxicarlos08
|
4e136e2961
|
Performance improvements for persisted terrain
- Only save terrain to disk if it actually has been modified
- Keep a 10 minute cache with recently unloaded persistent chunks
|
2023-05-09 20:06:53 +02:00 |
|
Isse
|
1617c180ef
|
small changes
|
2023-05-09 19:55:52 +02:00 |
|
Isse
|
bcc8c55b5e
|
change 'force from mount' to 'force from volume' in commands
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
6219b52f87
|
rename Vox trait to FilledVox, and change is_empty to is_filled
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
7dde25df39
|
fix rebase oopsie
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
1d60d72c01
|
format line
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
87b2f0fd26
|
don't apply move state velocity if volume riding, don't mount sprites on interact
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
a0ed18c3db
|
add doc comments
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
61ecd2c178
|
various small fixes
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
f6f332af6a
|
send full matrix to shader
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
c4cffff92f
|
apply shader changes from zesterer
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
b4c3868dd4
|
different translation key for mounting Helm
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
8fa46139f5
|
add to changelog
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
a6665ed988
|
some comments
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
2e2e5680bc
|
use spacial grid for interactables
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
78dc394c48
|
use sitting animation by default when sprite mounted
|
2023-05-09 19:43:10 +02:00 |
|
Isse
|
192356f6c5
|
use interpolated pos and ori
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
facea64a58
|
remove todo!
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
b6c7316de9
|
place rtsim on sprite controllers
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
57551c479c
|
force of mount in teleporting commands
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
e39790e9e4
|
make sprites work on multiple ships at once
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
134d0f0c04
|
varius fixes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
b3a70627e5
|
fix volumes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
a35a1a34c4
|
more sprites on airships
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
6674cce2cc
|
intercat with sprites on ships
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
7fbe2cd5ec
|
particles on volume
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
1710dcc111
|
fix shadows
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
d292234c47
|
lod for sprites on volumes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
fcb7011cde
|
sprites on volumes
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
458acce5ac
|
set vel to zero when sprite mounted
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
6ddfd631d6
|
don't sit through walls
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
7eba16a2d7
|
use mount key
|
2023-05-09 19:43:08 +02:00 |
|
Isse
|
2928eb8d15
|
sit on sprites
|
2023-05-09 19:43:08 +02:00 |
|
Joshua Barretto
|
1cc221f653
|
Merge branch 'zesterer/rtsim-tweaks' into 'master'
Started adding wandering rtsim monsters
See merge request veloren/veloren!3908
|
2023-05-09 14:51:15 +00:00 |
|
Marcel
|
9ac654baa9
|
Merge branch 'tygyh/Update-swedish-translations' into 'master'
Update swedish translations
See merge request veloren/veloren!3920
|
2023-05-09 13:22:43 +00:00 |
|
Marcel
|
f7519974b6
|
Merge branch 'xMAC94x/update_toolchain' into 'master'
update rust toolchain to 2023-04-20
See merge request veloren/veloren!3916
|
2023-05-09 13:18:08 +00:00 |
|
Marcel Märtens
|
c164c7979a
|
update cache docker image
|
2023-05-09 11:57:23 +02:00 |
|
Marcel
|
8e1f40895b
|
Merge branch 'vasco-quest' into 'master'
Italian translation for quest and sword abilities
See merge request veloren/veloren!3822
|
2023-05-08 18:33:35 +00:00 |
|
Francesco Vasco
|
232d4c932e
|
Italian translation
|
2023-05-08 19:29:24 +02:00 |
|