Joshua Barretto
1b07c198ad
Merge branch 'crabman/airship-fix' into 'master'
...
Update rtsim vehicle position on unload
See merge request veloren/veloren!4122
2023-09-30 15:57:38 +00:00
Maxicarlos08
99d95ad105
add physics system dependency to RtSim
...
This previously caused a bug where the position of rtsim vehicles was
one tick behind causing airships to be loaded once more when being
unloaded after leaving the view distance of a player.
For more context view the comment removed in the previous commit.
2023-09-30 14:13:12 +02:00
Maxicarlos08
d4427832f0
Update rtsim vehicle position on unload
2023-09-30 14:12:27 +02:00
flo
b2f1a53865
Merge branch 'fix_desert_city_library_windowsill' into 'master'
...
fix_desert_city_library_windowsill
See merge request veloren/veloren!4117
2023-09-26 16:45:12 +00:00
Imbris
91a7cf796d
Merge branch 'imbris/specs-refactor' into 'master'
...
Adjust for changes in specs safety refactor
See merge request veloren/veloren!4113
2023-09-26 14:01:28 +00:00
flo666
a470b016fb
fix_desert_city_library_windowsill
2023-09-26 15:27:08 +02:00
flo
36ade10427
Merge branch 'lle-bout/npc-arena' into 'master'
...
New Arena building and visit site for NPCs
See merge request veloren/veloren!4063
2023-09-26 12:29:15 +00:00
Laura
f4d48d2689
New Arena building and visit site for NPCs
2023-09-26 12:29:14 +00:00
Imbris
9c398cb06d
djust for changes in specs safety refactor
2023-09-24 23:46:59 -04:00
Marcel
5d311e13bd
Merge branch 'crabman/localize-commands' into 'master'
...
Localize server side commands
See merge request veloren/veloren!4110
2023-09-22 14:50:43 +00:00
Imbris
3b3ac15f55
Merge branch 'imbris/unused-deps' into 'master'
...
Remove unused deps
See merge request veloren/veloren!4116
2023-09-22 14:38:20 +00:00
Imbris
cd98dd5245
Remove unused deps flagged by cargo-machete
2023-09-21 22:59:50 -04:00
Imbris
c7dc51d52b
Fix swarm binary to use clap
2023-09-21 22:59:50 -04:00
Maxicarlos08
e526ca7c8e
changelog entry
2023-09-21 00:04:51 +02: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
94aa4ce8b1
Merge branch 'maxicarlos08/soft-loot-protection' into 'master'
...
Soft loot protection
See merge request veloren/veloren!4086
2023-09-20 19:16:04 +00:00
Maxicarlos08
bc9219d2b7
moved comment
2023-09-20 17:05:04 +02:00
Maxicarlos08
dccbfc4595
Soft loot protection
2023-09-20 17:02:25 +02:00
Imbris
256b3d1e16
Merge branch 'crabman/controller-modifier-unwrap' into 'master'
...
Get rid of unwrap in controller modifier handler
See merge request veloren/veloren!4115
2023-09-18 23:57:26 +00:00
Maxicarlos08
3f6d23ad7f
remove unwrap from controller modifier handler
2023-09-18 18:34:57 +02:00
Isse
b9c33df635
Merge branch 'isse/world-gen-ui' into 'master'
...
Map selector and generation UI
See merge request veloren/veloren!3925
2023-09-17 17:11:19 +00:00
Isse
f4ca60cbb6
Map selector and generation UI
2023-09-17 17:11:19 +00:00
Isse
478c37f6f1
Merge branch 'james/min-initial-civ-count' into 'master'
...
Always generate at least one civilization
See merge request veloren/veloren!3927
2023-09-17 16:57:06 +00:00
Imbris
b372a0c836
Merge branch 'imbris/specs-bench' into 'master'
...
Add server-cli bench command for profiling and update specs
See merge request veloren/veloren!4112
2023-09-15 22:09:47 +00:00
Imbris
b9731b57ce
Update to specs 0.19
2023-09-15 16:32:59 -04:00
Imbris
cd29170bea
Update todo about wildlife density option
2023-09-15 16:32:59 -04:00
Imbris
afe97f4d67
Make sure we use one version of tracy-client!!!!!
2023-09-15 16:32:59 -04:00
Imbris
aabf67a72a
Add server-cli bench command for profiling that automates loading a certain area, running for a specific time, and then exiting.
2023-09-15 16:32:59 -04:00
Christof Petig
6c57d17714
Merge branch 'christof/location_fix' into 'master'
...
Correct location names after editing and creation
See merge request veloren/veloren!4108
2023-09-13 23:05:16 +00:00
Marcel
93fc044b03
Merge branch 'mm/fix_auth' into 'master'
...
Mm/fix auth
See merge request veloren/veloren!4109
2023-09-13 10:25:00 +00:00
Marcel Märtens
d67817068e
fix auth, needed to set correct Config for argon to fix the hashing
2023-09-13 12:23:36 +02:00
Marcel
c25e8536ab
Merge branch 'xMAC94x/update_uuid_authc' into 'master'
...
update uuid via authc
See merge request veloren/veloren!4093
2023-09-13 08:47:27 +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
Christof Petig
b6e421facc
correct location names after editing and creation
2023-09-12 22:34:25 +02:00
Imbris
28dc1dc7b0
Merge branch 'imbris/prefer-lock' into 'master'
...
Prefer locking the cursor when grabbing it (if that option is supported)
See merge request veloren/veloren!4106
2023-09-10 21:58:11 +00:00
Imbris
34ee35c524
Prefer locking the cursor when grabbing it (if that option is supported)
...
over just confining it to the window.
This prevents the cursor from moving around when controlling the camera.
2023-09-10 16:51:31 -04:00
Marcel
a07ec63a53
Merge branch 'vasco-crate' into 'master'
...
Italian: common-sprite-crate and typo
See merge request veloren/veloren!4105
2023-09-10 11:35:30 +00:00
Francesco Vasco
d9b7f202f5
Italian: common-sprite-crate and typo
2023-09-10 11:35:30 +00:00
Christof Petig
e2de8bcd3e
Merge branch 'qsto/bosses_loot_overhaul' into 'master'
...
Made sagitta and orange monarch obtainable again
See merge request veloren/veloren!4104
2023-09-09 09:06:20 +00:00
Imbris
f368845cfd
Merge branch 'crabman/group-fixes' into 'master'
...
Fix group chat leak
See merge request veloren/veloren!4102
2023-09-08 14:54:05 +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
Maxicarlos08
0613cd8dc1
Changelog entry
2023-09-06 17:54:43 +02:00
Maxicarlos08
ec42b9b5ce
don't store group id in ChatMode
2023-09-06 17:47:16 +02:00
Maxicarlos08
ec92b2c33b
Fix group chat leak
2023-09-03 21:25:44 +02:00
