|
|
650d1709d0
|
Address MR 1987 review comments.
|
2021-03-24 16:09:12 -04:00 |
|
|
|
c4a6875133
|
Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs.
|
2021-03-24 15:42:37 -04:00 |
|
|
|
3773b23836
|
remove I/O unwraps (code inactive by default)
|
2021-03-24 20:31:17 +01:00 |
|
|
|
d7aea52a8f
|
Rotation uses matrix and some fixes for plane primitive
|
2021-03-24 18:21:01 +01:00 |
|
|
|
35ef2082e2
|
Rotation primitive and some minor fixes
|
2021-03-24 18:21:01 +01:00 |
|
|
|
187d7d4fe7
|
Added a bunch of primitives
|
2021-03-24 18:21:01 +01:00 |
|
|
|
97912d2d0f
|
Merge branch 'christof/de_unwrap1' into 'master'
replace an unwrap by returning an Option
See merge request veloren/veloren!1983
|
2021-03-24 08:18:53 +00:00 |
|
|
|
aa6a75808f
|
adapt unit test
|
2021-03-24 07:37:46 +01:00 |
|
|
|
acba98366a
|
loop over slots_mut instead of using an index
|
2021-03-24 07:37:46 +01:00 |
|
|
|
a83a74d216
|
replace an unwrap by returning an Option
|
2021-03-24 07:37:45 +01:00 |
|
|
|
ebc8e945d4
|
In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly.
|
2021-03-23 23:00:05 -04:00 |
|
|
|
6021a746b0
|
Merge branch 'aweinstock/wallstairs' into 'master'
Add an additional kind of stairs to dungeons.
See merge request veloren/veloren!1982
|
2021-03-24 00:58:03 +00:00 |
|
|
|
cffb7ea677
|
Merge branch 'aweinstock/cameraclamp' into 'master'
Add a vertical camera clamp option and toggle to voxygen.
See merge request veloren/veloren!1962
|
2021-03-24 00:58:01 +00:00 |
|
|
|
074092025a
|
Merge branch 'aweinstock/fix-inventorymanip-expects' into 'master'
Fix expect-panic on failed UID lookups in `inventory_manip`.
See merge request veloren/veloren!1984
|
2021-03-23 23:34:55 +00:00 |
|
|
|
19ea0c3f21
|
Fix expect-panic on failed UID lookups in inventory_manip.
|
2021-03-23 19:04:21 -04:00 |
|
|
|
6b343c2af9
|
Address MR 1962 review comments.
|
2021-03-23 18:41:13 -04:00 |
|
|
|
4ec6b43693
|
Add a vertical camera clamp option and toggle to voxygen.
|
2021-03-23 18:22:32 -04:00 |
|
|
|
cfb55b4881
|
Add an additional kind of stairs to dungeons.
|
2021-03-23 18:17:00 -04:00 |
|
|
|
6b826ff7d3
|
Merge branch 'yusdacra/feat/switch-to-naersk' into 'master'
build(nix): switch to naersk
See merge request veloren/veloren!1674
|
2021-03-23 19:31:45 +00:00 |
|
|
|
8ed7da7c49
|
Merge branch 'master' into 'master'
Update short_1.ron to make eligible for cloth scrap recipe
See merge request veloren/veloren!1981
|
2021-03-23 19:29:56 +00:00 |
|
|
|
818aaed32a
|
Update short_1.ron to make eligible for cloth scrap recipe
|
2021-03-23 18:16:30 +00:00 |
|
|
|
21b20ea75e
|
Merge branch 'aweinstock/enable-rtsim-airships' into 'master'
Enable RtSim Airships.
See merge request veloren/veloren!1973
|
2021-03-23 14:29:43 +00:00 |
|
|
|
e9a7ff7dd7
|
build(nix): switch to naersk
|
2021-03-23 16:02:47 +03:00 |
|
|
|
379ab0f341
|
Merge branch 'xMAC94x/fix_ci2' into 'master'
unittest fix
See merge request veloren/veloren!1979
|
2021-03-23 12:10:12 +00:00 |
|
|
|
63dc2ea551
|
unittest fix
|
2021-03-23 11:51:00 +01:00 |
|
|
|
f2c01409a2
|
Merge branch 'sam/continuous-roll' into 'master'
Roll Tweaks
See merge request veloren/veloren!1975
|
2021-03-23 09:46:21 +00:00 |
|
|
|
75f1b0f5e0
|
Remove level from create_ship and CreateShip.
|
2021-03-23 10:44:42 +01:00 |
|
|
|
deb9358c3a
|
Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.
|
2021-03-23 10:44:37 +01:00 |
|
|
|
49f39fb752
|
Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).
|
2021-03-23 10:44:32 +01:00 |
|
|
|
e2a74c5e5c
|
Enable RtSim airships.
|
2021-03-23 10:44:22 +01:00 |
|
|
|
e73f634506
|
Merge branch 'zesterer/sceptre-raycast' into 'master'
Added raycast check to beams
See merge request veloren/veloren!1970
|
2021-03-23 09:43:46 +00:00 |
|
|
|
456ceab6d0
|
Remove eye height check for beam
|
2021-03-23 10:43:22 +01:00 |
|
|
|
695f6c52fe
|
Added raycast check to beams
|
2021-03-23 10:43:18 +01:00 |
|
|
|
6629f0e573
|
Merge branch 'sam/combat-balance' into 'master'
Combat Balance Tweaks
See merge request veloren/veloren!1974
|
2021-03-23 09:40:33 +00:00 |
|
|
|
f895b95bbe
|
Merge branch 'aweinstock/fix-agenttrade-acceptspam' into 'master'
Make merchants not virtually spamclick accept.
See merge request veloren/veloren!1976
|
2021-03-23 09:39:40 +00:00 |
|
|
|
a71684a003
|
Merge branch 'heydabop/962-duplicate-login' into 'master'
Fix #962 - kick old client and add new client on duplicate login
Closes #962
See merge request veloren/veloren!1952
|
2021-03-23 09:38:47 +00:00 |
|
|
|
8ade934db0
|
Merge branch 'xMAC94x/ci-workaround' into 'master'
ci fails sporadically, remove file so it doesnt fail that often till we have a bettter toolchain
See merge request veloren/veloren!1977
|
2021-03-23 09:38:16 +00:00 |
|
|
|
c58eb1cf50
|
ci fails sporadically, remove file so it doesnt fail that often till we have a bettter toolchain
|
2021-03-23 10:30:29 +01:00 |
|
|
|
7ede94b4c9
|
Changelog
|
2021-03-22 23:53:00 -04:00 |
|
|
|
833ab7f1a8
|
Make merchants not virtually spamclick accept.
|
2021-03-22 22:53:53 -04:00 |
|
|
|
0e3f7625a9
|
Fix #962 - kick old client and add new client on duplicate login
|
2021-03-22 19:15:24 -05:00 |
|
|
|
356bb5baee
|
If roll input remains held, allows you to keep rolling and stay in roll state.
You can now jump to interrupt the recovery portion of roll.
Jumping out of roll slightly increases jump strength.
|
2021-03-22 18:47:13 -04:00 |
|
|
|
31f4ef684d
|
Tweaked numbers
|
2021-03-22 17:26:55 -04:00 |
|
|
|
f48c1e6535
|
Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `nightly-2021-03-22`
See merge request veloren/veloren!1972
|
2021-03-22 16:07:52 +00:00 |
|
|
|
6b23101fac
|
update toolchain to nightly-2021-03-22
|
2021-03-22 16:41:04 +01:00 |
|
|
|
759c423595
|
Merge branch 'xMAC94x/slowjob_trace' into 'master'
warn when a single system takes longer than 500ms
See merge request veloren/veloren!1971
|
2021-03-22 15:07:17 +00:00 |
|
|
|
3d45262ebb
|
warn when a single system takes longer than 500ms
|
2021-03-22 14:26:05 +01:00 |
|
|
|
09c9615672
|
Merge branch 'xMAC94x/thread_names' into 'master'
xmac94x/thread names
See merge request veloren/veloren!1969
|
2021-03-22 12:56:45 +00:00 |
|
|
|
667faca5a5
|
update asset_manager
|
2021-03-22 12:37:38 +01:00 |
|
|
|
fdc40f52d9
|
give more threads a fixed name
|
2021-03-22 12:37:03 +01:00 |
|
