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
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
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 Märtens
377787e3c8
avoid:
...
```
PHI nodes not grouped at top of basic block!
%246 = phi <4 x float> [ <float 1.000000e+00, float 1.000000e+00, float 1.000000e+00, float 1.000000e+00>, %114 ], [ %241, <badref> ], !dbg !961029
label %243
in function _ZN14veloren_common4comp9inventory4item7modular11ModularBase4kind17h0950571ff74739d8E
LLVM ERROR: Broken function found, compilation aborted!
```
2023-05-08 18:58:54 +02:00
Marcel Märtens
95bca5418a
update toolchain to nightly-2023-04-20
2023-05-08 18:58:54 +02:00
Sam
faff715c4f
Simultaneous melee hits now show separately in SCT
2023-05-07 20:43:52 -04:00
Sam
a38f336c9e
Added dual wielding sword contextual abilities.
2023-05-07 20:43:51 -04:00
Sam
0ecf4fbe87
Dual wielding weapons of the same kind added as a context
2023-05-07 20:43:51 -04:00
Sam
9cedf854de
Abilities can now be activated from multiple contexts
2023-05-07 20:43:50 -04:00
Marcel Märtens
6a8f10bf41
fix master fmt
2023-05-05 18:26:14 +02:00
Marcel Märtens
cd7d889c13
get rid of oldtime in chrono
2023-05-05 18:25:49 +02:00
Isse
eed613a50f
change other value parsers
2023-05-05 15:05:57 +02:00
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
Marcel Märtens
d90ea8c1da
get rid of structop and update clippy in common test, now only criterion is left with version 2
2023-05-05 09:46:46 +02: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
8d9625d6ee
Addressed comments
2023-05-04 23:18:40 +01: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
Joshua Barretto
a5b1e41d8b
Make NPC interaction go via rtsim
2023-05-04 11:23:46 +01:00
Marcel Märtens
054f4f9453
update veloren deps
2023-05-04 11:58:43 +02:00
Joshua Barretto
2ff0118df0
More rtsim monsters
2023-05-04 10:13:02 +01:00
Joshua Barretto
0f92f38967
Started adding wandering rtsim monsters
2023-05-01 18:29:32 +01:00
Imbris
29f0f0d83f
Rename cheapest_score for clarity and add documentation to fields of NodeEntry
2023-04-24 22:43:40 -04: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
d18100c87a
Add a max cost parameter to the astar algorithm so that it will terminate as exausted if this limit is reached. This is used to optimize site pathfinding by exiting early from finding a novel path if we know it won't be used.
2023-04-21 23:16:24 -04:00
Imbris
ed94c1c1b6
Fix existing bug with all site route costs be computed as 0
2023-04-20 22:22:21 -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
92a42ced18
Apply experimental astar2 changes to the original impl
2023-04-20 21:53:59 -04:00
Imbris
d1ca47da41
Remove astar node clustering related code
2023-04-20 21:53:59 -04:00
Imbris
81885fe8e5
Additional optimizations (such as avoiding calling find_path when we know we won't use the result or that it will fail), cleanup of excess notes and commented code, probably other misc optimizations
2023-04-20 21:53:59 -04:00
Imbris
1f5ebbd100
mess (server startup time related experimentation, in particular with
...
pathfinding between sites)
2023-04-20 21:53:59 -04:00
Sam
4f991190d3
Removed 3rd to_owned call
2023-04-19 18:43:43 -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
63bf8f3ac7
Responded to review comments and fixed tests
2023-04-19 18:34:17 -04:00
Sam
7fdfc0e71b
Addressed review
2023-04-19 18:34:17 -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
Imbris
f525be9b3b
Update tracy-client to 0.15.2, also use tracy_client through the
...
re-export of `profiling` to make keeping the versions in-sync much less
tedious (and have `cargo update` not break this).
2023-04-18 21:28:15 -04:00
Sam
9d503d1e1f
Debug items no longer have durability
2023-04-14 18:25:24 -04:00
Sam
553aa690b4
Added repair equipment command
2023-04-14 18:09:23 -04:00
Isse
3548b464da
orient airships correctly on load
2023-04-14 11:25:59 +02:00
Isse
2208a3037e
improve flying goto
2023-04-14 11:23:17 +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
a835ce7e26
Better starting site choices
2023-04-13 18:32:21 +01: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
Joshua Barretto
16e3227f78
Correct localisation of numeric values, use coordinate conversions in rtsim
2023-04-12 10:36:11 +01:00
Isse
0bb6fa7946
add flag to clamp to ground for RepositionOnChunkLoad
2023-04-12 10:17:49 +02:00
Joshua Barretto
3582d86c70
Simplified localisation logic
2023-04-11 23:51:07 +01:00
Joshua Barretto
3484e156d1
Allowed localisation content to be recursive
2023-04-11 23:18:34 +01: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
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
Isse
efe2eb046c
add comment about a pure-proportional controller
2023-04-10 22:22:50 +02:00
Joshua Barretto
92ead1cf38
Removed vehicle riders, for now
2023-04-10 20:58:08 +01:00
Joshua Barretto
00559187d6
Fixed tests
2023-04-10 18:40:31 +01:00
Joshua Barretto
b50645c1ee
Addressed review comments
2023-04-10 17:59:43 +01:00
Joshua Barretto
efbab102a5
Make LoD towns glow
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
70538dae66
Choose random plaza tile
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
Joshua Barretto
a7a08763f2
Gave NPCs names
2023-04-09 19:25:58 +01:00
Joshua Barretto
74610833d0
Cleaned up rtsim tick handling
2023-04-09 19:25:58 +01:00
Joshua Barretto
5614eaa7a5
Cleaned up rtsim rules
2023-04-09 19:25:57 +01:00
Joshua Barretto
3e0f5295c0
Added CharacterActivity, made NPCs look at the player when speaking to them
2023-04-09 19:25:57 +01:00
Joshua Barretto
85c572f6e2
Better town layout
2023-04-09 19:25:57 +01:00
Joshua Barretto
082bcdb755
Don't hunt friendly animals
2023-04-09 19:25:57 +01:00
Joshua Barretto
9f025de27d
Addressed feedback
2023-04-09 19:25:57 +01:00
Joshua Barretto
1fcb46ae0c
Made merchants advertise wares
2023-04-09 19:25:56 +01:00
Joshua Barretto
b72d8f3192
Added the ability for rtsim to tell NPCs to speak
2023-04-09 19:25:56 +01:00
Joshua Barretto
7dfbc2bdab
Made socialising NPCs dance
2023-04-09 19:25:56 +01:00
Joshua Barretto
7175f7f02f
Hunters explore forests to hunt game
2023-04-09 19:25:56 +01:00
Joshua Barretto
b402e450cf
Added rtsim_npc, made herbalists gather ingredients
2023-04-09 19:25:56 +01:00
Joshua Barretto
364255c7fe
Allowed rtsim NPCs to greet nearby actors
2023-04-09 19:25:55 +01:00
Joshua Barretto
8d91ebb23e
Don't aim character when drinking
2023-04-09 19:25:55 +01:00
Isse
d53b344c23
make merchants use tell, and general cleanup
2023-04-09 19:25:55 +01:00
Joshua Barretto
8ba68e30f3
Merchants no longer buy/sell things they don't know the price of
2023-04-09 19:25:55 +01:00
Joshua Barretto
ea007ff702
Cleaning up
2023-04-09 19:25:55 +01:00
Joshua Barretto
64324262c7
Added /rtsim_purge command
2023-04-09 19:25:55 +01:00
Isse
1c0fdf9228
rtsim personalities
2023-04-09 19:25:55 +01:00
Isse
7ac6c6b453
fix warnings in rtsim
2023-04-09 19:25:55 +01:00
Isse
dda1be58d4
big birds!
2023-04-09 19:25:54 +01:00
Isse
259bb6fce4
fix phys test
2023-04-09 19:25:54 +01:00
Isse
1a117f1331
rtsim vehicles
2023-04-09 19:25:54 +01:00
Isse
a7588e274d
clean up mounting
2023-04-09 19:25:54 +01:00
Isse
28ebdbbe74
fix mount controller
2023-04-09 19:25:54 +01:00
