Isse
|
6ddfd631d6
|
don't sit through walls
|
2023-05-09 19:43:09 +02:00 |
|
Isse
|
7eba16a2d7
|
use mount key
|
2023-05-09 19:43:08 +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
|
95bca5418a
|
update toolchain to nightly-2023-04-20
|
2023-05-08 18:58:54 +02:00 |
|
Sam
|
d5fc65ce83
|
Fix ci test
|
2023-05-07 21:50:59 -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 |
|
Imbris
|
95a38ff8f6
|
Merge branch 'imbris/revert-some' into 'master'
Revert some of the updates to make windows cross compile directx work
See merge request veloren/veloren!3918
|
2023-05-06 05:12:20 +00:00 |
|
Imbris
|
af0d0f3ea4
|
Second attempt (success)
|
2023-05-06 00:30:54 -04:00 |
|
Marcel Märtens
|
cd7d889c13
|
get rid of oldtime in chrono
|
2023-05-05 18:25:49 +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
|
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 |
|
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 |
|
Isse
|
44bf8f19f1
|
combine into one filter_map
|
2023-05-03 16:29:56 +02:00 |
|
Isse
|
922ba9ed5c
|
add note about using threshold for subtitle duration
|
2023-05-03 16:15:28 +02:00 |
|
Isse
|
77b7d1a49e
|
localize after distance filter
|
2023-05-03 16:10:14 +02:00 |
|
Isse
|
54a7367cb2
|
Maintain all subtitles, limit calls to state.update
|
2023-05-03 13:07:36 +02:00 |
|
Isse
|
f60c44d812
|
nicer ui
|
2023-05-03 13:07:36 +02:00 |
|
Isse
|
99463a37f8
|
subtitles
|
2023-05-03 13:07:35 +02:00 |
|
Isse
|
1c9b502f69
|
move flashing lights to accessability settings tab
|
2023-05-03 13:07:35 +02:00 |
|
Isse
|
ab4076518f
|
Add multiloot
|
2023-04-23 19:17:39 +00:00 |
|
ubruntu
|
b53bfd4246
|
Hide display name of mount while mounted (at full hp)
|
2023-04-22 18:13:13 +00: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
|
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 |
|
Christof Petig
|
4c1c84030f
|
introduce optional model indices for drop items as well (fixing orichalcum armor drops)
|
2023-04-16 22:56:04 +02:00 |
|
Sam
|
9d503d1e1f
|
Debug items no longer have durability
|
2023-04-14 18:25:24 -04: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 |
|
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 |
|
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
|
edcc2f1870
|
Overhauled chat message representation to allow for more exhaustive localisation
|
2023-04-11 15:46:36 +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
|
70538dae66
|
Choose random plaza tile
|
2023-04-09 19:25:58 +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
|
5aaee96cb1
|
Removed special-casing of merchants
|
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 |
|
Isse
|
57efd24573
|
fix bench
|
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
|
b022076a5c
|
Fallback for non-trades
|
2023-04-09 19:25:55 +01:00 |
|