Samuel Keiffer
07bb4f72aa
Merge branch 'sam/multiple-contexts' into 'master'
...
Abilities can have multiple contexts, added sword abilities which use dual sword context
See merge request veloren/veloren!3898
2023-05-08 02:36:13 +00:00
Sam
d5fc65ce83
Fix ci test
2023-05-07 21:50:59 -04: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
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
Imbris
1a7e38e48b
First attempt (no success)
2023-05-06 00:30:41 -04:00
Samuel Keiffer
69089e378a
Merge branch 'Corvella/more_decheeseification' into 'master'
...
Cheesing fixes mainly focused on bosses
See merge request veloren/veloren!3897
2023-05-06 01:57:41 +00:00
Corvella
6367a51fa3
Cheesing fixes mainly focused on bosses
2023-05-06 01:57:41 +00:00
Marcel
66976c2ee9
Merge branch 'xMAC94x/more_useful_audit' into 'master'
...
better cargo audit
See merge request veloren/veloren!3915
2023-05-05 16:48:44 +00: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
Marcel Märtens
d995491f44
we are ignoreing those errors anyway, i think chrono is not using that functionality of time any more and the other 2 dependencies are very hard to get ever rid of in our codebase :/
2023-05-05 18:25:49 +02:00
Marcel
59f12ef110
Merge branch 'clap-fix' into 'master'
...
Yse correct clap macro
See merge request veloren/veloren!3917
2023-05-05 13:10:37 +00:00
Isse
eed613a50f
change other value parsers
2023-05-05 15:05:57 +02:00
Isse
a74ec7a1ad
use correct macro
2023-05-05 14:49:14 +02:00
Marcel
7a5be42926
Merge branch 'master-patch-2e28' into 'master'
...
Update ukrainian translation
See merge request veloren/veloren!3904
2023-05-05 09:51:34 +00:00
Vitalya
b3a1d7af6c
Update ukrainian translation
2023-05-05 09:51:34 +00: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
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
693684d1c9
Updated changelog
2023-05-04 22:13:14 +01:00
Joshua Barretto
ee971e4056
Added item merging
2023-05-04 22:12:25 +01:00
Marcel
32d8d25124
Merge branch 'xMAC94x/updateSQL' into 'master'
...
Update SQLlite
See merge request veloren/veloren!3862
2023-05-04 20:55:15 +00: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
4e3eb3ef44
Merge branch 'isse/accessability' into 'master'
...
Accessibility settings tab, and subtitles
See merge request veloren/veloren!3901
2023-05-03 16:26:22 +00: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
a89fcd1a38
swedish subtitles
2023-05-03 13:07:36 +02:00
Isse
8bab047c87
add to changelog
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
Marcel
65098b8066
Merge branch 'walpo/update_readme' into 'master'
...
Update README.md
See merge request veloren/veloren!3891
2023-05-02 19:48:27 +00:00
walpo
de90639e84
Update README.md
2023-05-02 19:48:27 +00:00
Isse
b37a2bf1c7
Merge branch 'hannibal/ui-change' into 'master'
...
Change Other Players to Players
See merge request veloren/veloren!3909
2023-05-02 18:35:28 +00:00
BigKhan
811061062a
Change Other Players to Players
2023-05-02 13:45:19 -04:00
Imbris
d29a1ec052
Switch back to 100 attempts for each site, optimization of
...
find_site_loc, and fix pre-existing bugs.
* In two spots, there were suspicious conversions between chunk positions
/ world positions that I removed. Everything, here should just be in
chunk positions afaict!
* Optimized by skipping further checks if `in_suitable_loc` is false
(main optimization (10x speedup for desert city site location finding
attempts)) as well as only computing `in_suitable_loc` once (minor
optimization).
2023-05-02 06:12:33 -04:00
Imbris
ddf9e0eaab
Address review on !3888
2023-05-01 21:01:50 -04:00
Joshua Barretto
37f7a0331f
Merge branch 'zesterer/rtsim-tweaks' into 'master'
...
Made NPC sentiment slightly more forgiving
See merge request veloren/veloren!3907
2023-05-01 12:16:28 +00:00
