Marcel Märtens
882a8d104c
Revert "extended clippy from quality.sh"
...
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741
extended clippy from quality.sh
2023-10-05 22:00:49 +02:00
Marcel Märtens
540f0d10f2
cargo clippy after toolchain-update
2023-10-05 22:00:49 +02:00
Marcel Märtens
394c8892bb
update toolchain to nightly-2023-09-28
2023-10-05 22:00:48 +02:00
Imbris
63b001959e
Merge branch 'crabman/loading-status' into 'master'
...
Add status updates to the loading screen
See merge request veloren/veloren!4119
2023-10-03 14:35:53 +00:00
Isse
d88dace5b8
Merge branch 'crabman/interaction-fix' into 'master'
...
Allow other behavior nodes to run on failed interaction
See merge request veloren/veloren!4123
2023-10-02 22:36:23 +00:00
Maxicarlos08
a3be68930e
review comments
2023-10-02 23:23:42 +02:00
flo666
445c49bd4b
large_bird: incr. sight_dist, decr. travel_speed, decr. flying_alt in attack
2023-10-02 22:44:41 +02:00
Maxicarlos08
58a379ee47
limit range of npc interactions
2023-10-02 22:44:32 +02:00
Maxicarlos08
7734b653e7
replace all uses of Arc<> with references
2023-10-02 16:52:41 +02:00
Maxicarlos08
8116e5be2c
Allow other behavior nodes to run on failed interaction
2023-10-02 16:22:46 +02:00
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
Maxicarlos08
9ababec625
fix UI issues & cleanup
2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status
2023-09-29 23:30:14 +02:00
Maxicarlos08
9a3f53c32c
added status updates to loading screen
2023-09-29 23:30:14 +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
