Marcel
223ae7ee98
Merge branch 'xMAC94x/update_deps' into 'master'
...
update further dependencies
See merge request veloren/veloren!3913
2023-05-05 08:42:43 +00:00
Joshua Barretto
b6d8182382
Merge branch 'zesterer/item-merging' into 'master'
...
Zesterer/item merging
See merge request veloren/veloren!3912
2023-05-05 00:03:22 +00:00
Joshua Barretto
73c84dfcc2
Clippy
2023-05-05 00:04:13 +01:00
Joshua Barretto
8d9625d6ee
Addressed comments
2023-05-04 23:18:40 +01:00
Marcel Märtens
4be1e82ba9
update further dependencies
2023-05-04 23:42:05 +02:00
Joshua Barretto
ee971e4056
Added item merging
2023-05-04 22:12:25 +01:00
Marcel Märtens
27620e665b
we need a new version of refinery that needs a new version of rusqlite, so update both
2023-05-04 20:53:00 +02:00
Marcel
ce4beff7fe
Merge branch 'xMAC94x/update_deps' into 'master'
...
update veloren deps
See merge request veloren/veloren!3911
2023-05-04 18:28:59 +00:00
Imbris
60dbcf86f9
Merge branch 'imbris/server-start-faster' into 'master'
...
Improve server startup times, in particular, finding paths between sites.
See merge request veloren/veloren!3888
2023-05-04 18:06:38 +00:00
Marcel Märtens
054f4f9453
update veloren deps
2023-05-04 11:58:43 +02:00
Isse
3d3a6eab2b
Fix items not dropping when no exp is given.
2023-04-25 11:33:44 +02:00
Isse
ab4076518f
Add multiloot
2023-04-23 19:17:39 +00:00
Imbris
cd02b3a172
Apply TODO from !3883 and refactor to avoid collect in Inventory::damage_items, also reduce to iterating over the hashmap once when culling the recently unequipped items list
2023-04-22 11:37:52 -04:00
Imbris
c82e6cfc77
Cleanup, fmt, appease clippy
2023-04-20 21:53:59 -04:00
Imbris
c6f5e8dac2
Add more profiling spans to Server startup related things in order to
...
visualize where time is being spent. Make `Lod::from_world` use the same
rayon pool as other things during the server startup. Move parallel
iteration up out of structure_gen.par_iter in order to slightly optimize
Lod::from_world (saves a few hundred milliseconds on my machine)
2023-04-20 21:53:59 -04:00
Imbris
ed4643e80b
Add profiling spans for Server::new and World::generate
2023-04-20 21:53:59 -04:00
Sam
e819cd2309
Updated hashbrown, removed some to_owned calls in handling recently unequipped items
2023-04-19 18:43:40 -04:00
Sam
7fdfc0e71b
Addressed review
2023-04-19 18:34:17 -04:00
Sam
d0a902d918
Being attacked now cancels all active trades.
2023-04-19 18:34:16 -04:00
Sam
c1a64e1d69
Recently unequipped items are now tracked and durability loss on death is applied to them
2023-04-19 18:34:16 -04:00
Julian Tölle
573a2942c9
Add more info to the /rtsim_{npc,info} commands
...
- Add the name of the NPC to /rtsim_npc to help identify this NPC in the world
- Add faction & personality to /rtsim_info command to learn more about the NPC
2023-04-16 12:37:37 +02:00
Sam
553aa690b4
Added repair equipment command
2023-04-14 18:09:23 -04:00
Isse
60b626d3ee
don't load npc by themself if they're riding
2023-04-14 13:21:43 +02:00
Isse
3548b464da
orient airships correctly on load
2023-04-14 11:25:59 +02:00
Isse
d1f6e6bef6
somewhat fix airships
2023-04-14 11:22:10 +02:00
Joshua Barretto
504ea158d2
Merge branch 'zesterer/towns' into 'master'
...
Improvements to towns and NPCs
See merge request veloren/veloren!3867
2023-04-13 21:03:02 +00:00
Joshua Barretto
daacadaedb
Made NPCs give directions to nearby towns, fixed player death propagation
2023-04-13 14:34:31 +01:00
Samuel Keiffer
7aa43e9e8a
Merge branch 'taoist/better-dullahan' into 'master'
...
taoist&floppy/cyclops&dullahan
See merge request veloren/veloren!3859
2023-04-12 22:53:38 +00:00
Tao In Way
e32460f9ee
taoist&floppy/cyclops&dullahan
2023-04-12 22:53:38 +00:00
Joshua Barretto
9e17042bf6
Merge branch 'rtsim2' into 'master'
...
Initial implementation of rtsim2
Closes #1476
See merge request veloren/veloren!3517
2023-04-12 16:17:52 +00:00
Isse
f13ae63985
make reposition_on_load join immutable
2023-04-12 17:08:16 +02:00
Isse
fc3f7590c7
clamp chase_tgt to ground if we can't fly
2023-04-12 17:04:25 +02:00
Joshua Barretto
16e3227f78
Correct localisation of numeric values, use coordinate conversions in rtsim
2023-04-12 10:36:11 +01:00
Isse
0c688a9b50
remove comment
2023-04-12 10:19:19 +02:00
Isse
0bb6fa7946
add flag to clamp to ground for RepositionOnChunkLoad
2023-04-12 10:17:49 +02:00
Isse
6be4a2b33f
only add RepositionOnChunkLoad to rtsim npcs and don't add Waypoint if it doesn't exist
2023-04-12 09:24:07 +02:00
Joshua Barretto
cf701fb604
Localised rtsim NPC speech
2023-04-11 17:00:08 +01:00
Joshua Barretto
edcc2f1870
Overhauled chat message representation to allow for more exhaustive localisation
2023-04-11 15:46:36 +01:00
Joshua Barretto
08afe26112
Directly compare rtism resources to avoid unnecessary hooks
2023-04-11 11:49:10 +01:00
Joshua Barretto
81b52298f0
Addressed review feedback
2023-04-11 10:34:06 +01:00
Imbris
4ea635cc8d
Merge branch 'imbris/random-tweaks-35902u8' into 'master'
...
Some misc tweaks
See merge request veloren/veloren!3861
2023-04-11 02:07:35 +00:00
Joshua Barretto
92ead1cf38
Removed vehicle riders, for now
2023-04-10 20:58:08 +01:00
Joshua Barretto
b50645c1ee
Addressed review comments
2023-04-10 17:59:43 +01:00
Joshua Barretto
859eb95033
Log error instead of panicking
2023-04-09 19:25:58 +01:00
Joshua Barretto
c6a7d7aa9b
Synchronise rtsim saves
2023-04-09 19:25:58 +01:00
Joshua Barretto
d751a22af7
Fixed buggy NPC aggro behaviour
2023-04-09 19:25:58 +01:00
Joshua Barretto
251ab95ac5
Neater rtsim_npc
2023-04-09 19:25:58 +01:00
Joshua Barretto
326aa3f8ff
Made /rtsim_npc order NPCs by distance
2023-04-09 19:25:58 +01:00
Joshua Barretto
2fbddafd0a
Added report system, information sharing, made NPCs act on sentiments
2023-04-09 19:25:58 +01:00
Joshua Barretto
08338436ea
Added sentiments
2023-04-09 19:25:58 +01:00
