c7dc51d52b
Fix swarm binary to use clap
2023-09-21 22:59:50 -04:00
e526ca7c8e
changelog entry
2023-09-21 00:04:51 +02:00
772dd660a1
testing
2023-09-20 23:29:24 +02:00
91284565a2
addressed review comments
2023-09-20 23:29:24 +02:00
fd42b3f767
localize commands
2023-09-20 23:29:24 +02:00
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
bc9219d2b7
moved comment
2023-09-20 17:05:04 +02:00
dccbfc4595
Soft loot protection
2023-09-20 17:02:25 +02:00
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
3f6d23ad7f
remove unwrap from controller modifier handler
2023-09-18 18:34:57 +02:00
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
f4ca60cbb6
Map selector and generation UI
2023-09-17 17:11:19 +00:00
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
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
b9731b57ce
Update to specs 0.19
2023-09-15 16:32:59 -04:00
cd29170bea
Update todo about wildlife density option
2023-09-15 16:32:59 -04:00
afe97f4d67
Make sure we use one version of tracy-client!!!!!
2023-09-15 16:32:59 -04:00
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
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
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
d67817068e
fix auth, needed to set correct Config for argon to fix the hashing
2023-09-13 12:23:36 +02:00
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
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
b6e421facc
correct location names after editing and creation
2023-09-12 22:34:25 +02:00
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
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
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
d9b7f202f5
Italian: common-sprite-crate and typo
2023-09-10 11:35:30 +00:00
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
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
5fe5440ce2
use All grouping for phoenix drops
2023-09-08 12:21:34 +02:00
e1da740394
updated dungeon cyclops loot table
2023-09-08 00:08:39 +02:00
22a8f3ca89
make adlet elder drop only 1 bone key
2023-09-07 13:33:32 +02:00
2559afa51b
Fixed dungeon cyclops loot table
2023-09-07 13:26:59 +02:00
f26fc8a137
made sagitta and orange monarch obtainable again
2023-09-07 13:05:36 +02:00
0613cd8dc1
Changelog entry
2023-09-06 17:54:43 +02:00
ec42b9b5ce
don't store group id in ChatMode
2023-09-06 17:47:16 +02:00
ec92b2c33b
Fix group chat leak
2023-09-03 21:25:44 +02:00
19742bb930
Merge branch 'translation_fr' into 'master'
...
rename fr/quest.ftl
See merge request veloren/veloren!4096
2023-09-01 18:14:24 +00:00
1b7d5f0915
Merge branch 'xMAC94x/fluent_stances' into 'master'
...
add back stances removed by weblate
See merge request veloren/veloren!4095
2023-08-31 16:20:43 +00:00
c9a7e6e072
ad back stances removed by weblate, and register them in EN file, hopefully that weblate accepts them now
2023-08-31 15:51:06 +02:00
d0b3d6a181
Merge branch 'xiretza/better-buff-death-messages' into 'master'
...
Better buff-death messages
Closes #1654
See merge request veloren/veloren!4092
2023-08-31 08:22:56 +00:00
78b2443edc
Merge branch 'qsto/bosses_loot_overhaul' into 'master'
...
Bosses loot overhaul
See merge request veloren/veloren!4072
2023-08-30 12:08:52 +00:00
579daf77a8
review fixes 2: elder and chieftain: armor drops same tier as weapon drops
2023-08-29 20:45:13 +02:00
9e44f77a73
review fixes
2023-08-29 20:15:00 +02:00
60538e0664
server: fix kill source for buff deaths without origin
2023-08-29 17:09:49 +00:00
06111612a3
voxygen: better translation of buff-death messages
...
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.
Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.
```
function getbuff --argument langfile buff
grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end
set buffs burning bleeding curse crippled frozen mysterious
function replacebuffs --argument langfile entity
set slug 'hud-chat-died_of_'$entity'_buff_msg'
for buff in $buffs[-1..1]
set bstr (getbuff $langfile $buff)
or continue
sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
end
sed -i -E 's/('$slug' \=).*/\1/' $langfile
end
function dofile --argument langfile
sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
for entity in pvp npc nonexistent
replacebuffs $langfile $entity
end
sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
sed -i -e /hud-outcome-/d $langfile
sed -i -e '/#.*outcomes/d' $langfile
end
for langfile in assets/voxygen/i18n/*/hud/chat.ftl
echo doing $langfile
dofile $langfile
end
```
2023-08-29 17:09:48 +00:00
9ef2875db7
voxygen: avoid unnecessary allocation
...
Cow::to_string() goes through &str even for an Owned variant,
Cow::into_owned() passes Owned variants through as-is. As it happens,
the values here are always Owned (see comment in try_msg_ctx()
implementation).
2023-08-29 17:09:31 +00:00
c0f33efa98
rename quest.ftl
2023-08-29 17:40:48 +02:00
804e24adef
Merge branch 'isse/fix-airships' into 'master'
...
Fix rtsim airships
See merge request veloren/veloren!4064
2023-08-29 12:56:25 +00:00
