Justin Shipsey
|
2bfbdf74e3
|
Merge branch 'Quibble/seashells-quickfix' into 'master'
Add missing seashells to the sprite manifest
Closes #1019
See merge request veloren/veloren!1990
|
2021-03-25 05:29:55 +00:00 |
|
Lippy13
|
ff2583b3b9
|
Add missing seashells to the sprite manifest
|
2021-03-25 04:37:27 +00:00 |
|
Snowram
|
027aca09c3
|
Merge branch 'snowram/escape-trades' into 'master'
Allow Escape key to cancel trades
See merge request veloren/veloren!1989
|
2021-03-25 01:39:43 +00:00 |
|
Snowram
|
0e259294d4
|
Allow Escape key to cancel trades
|
2021-03-25 01:42:14 +01:00 |
|
Marcel
|
28952f6d7b
|
Merge branch 'aweinstock/agent-retargetting' into 'master'
In `agent::Sys`, perform target selection periodically to avoid agents going...
See merge request veloren/veloren!1985
|
2021-03-24 22:22:04 +00:00 |
|
Joshua Barretto
|
5b234a3d08
|
Merge branch 'christof/de_unwrap2' into 'master'
Replace unwrap in the economy code
See merge request veloren/veloren!1988
|
2021-03-24 22:22:02 +00:00 |
|
Christof Petig
|
71b91d589b
|
fix the test
|
2021-03-24 22:37:01 +01:00 |
|
Joshua Barretto
|
5abdd0be8d
|
Merge branch 'synis/primitives' into 'master'
Primitives
See merge request veloren/veloren!1937
|
2021-03-24 21:06:33 +00:00 |
|
Samuel Keiffer
|
34e51ae00b
|
Merge branch 'aweinstock/airshipmovement-20210324' into 'master'
Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs.
See merge request veloren/veloren!1987
|
2021-03-24 21:06:30 +00:00 |
|
Christof Petig
|
a897a5aa68
|
remove the remaining unwraps
|
2021-03-24 21:59:47 +01:00 |
|
Christof Petig
|
43dec7c103
|
replace another group of unwraps
|
2021-03-24 21:43:30 +01:00 |
|
Avi Weinstock
|
650d1709d0
|
Address MR 1987 review comments.
|
2021-03-24 16:09:12 -04:00 |
|
Avi Weinstock
|
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 |
|
Christof Petig
|
3773b23836
|
remove I/O unwraps (code inactive by default)
|
2021-03-24 20:31:17 +01:00 |
|
Synis
|
d7aea52a8f
|
Rotation uses matrix and some fixes for plane primitive
|
2021-03-24 18:21:01 +01:00 |
|
Synis
|
35ef2082e2
|
Rotation primitive and some minor fixes
|
2021-03-24 18:21:01 +01:00 |
|
Synis
|
187d7d4fe7
|
Added a bunch of primitives
|
2021-03-24 18:21:01 +01:00 |
|
Joshua Yanovski
|
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 |
|
Christof Petig
|
aa6a75808f
|
adapt unit test
|
2021-03-24 07:37:46 +01:00 |
|
Christof Petig
|
acba98366a
|
loop over slots_mut instead of using an index
|
2021-03-24 07:37:46 +01:00 |
|
Christof Petig
|
a83a74d216
|
replace an unwrap by returning an Option
|
2021-03-24 07:37:45 +01:00 |
|
Avi Weinstock
|
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 |
|
Samuel Keiffer
|
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 |
|
Imbris
|
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 |
|
Joshua Yanovski
|
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 |
|
Avi Weinstock
|
19ea0c3f21
|
Fix expect-panic on failed UID lookups in inventory_manip.
|
2021-03-23 19:04:21 -04:00 |
|
Avi Weinstock
|
6b343c2af9
|
Address MR 1962 review comments.
|
2021-03-23 18:41:13 -04:00 |
|
Avi Weinstock
|
4ec6b43693
|
Add a vertical camera clamp option and toggle to voxygen.
|
2021-03-23 18:22:32 -04:00 |
|
Avi Weinstock
|
cfb55b4881
|
Add an additional kind of stairs to dungeons.
|
2021-03-23 18:17:00 -04:00 |
|
Marcel
|
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 |
|
Samuel Keiffer
|
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 |
|
steanne
|
818aaed32a
|
Update short_1.ron to make eligible for cloth scrap recipe
|
2021-03-23 18:16:30 +00:00 |
|
Joshua Barretto
|
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 |
|
Yusuf Bera Ertan
|
e9a7ff7dd7
|
build(nix): switch to naersk
|
2021-03-23 16:02:47 +03:00 |
|
Marcel
|
379ab0f341
|
Merge branch 'xMAC94x/fix_ci2' into 'master'
unittest fix
See merge request veloren/veloren!1979
|
2021-03-23 12:10:12 +00:00 |
|
Marcel Märtens
|
63dc2ea551
|
unittest fix
|
2021-03-23 11:51:00 +01:00 |
|
Marcel
|
f2c01409a2
|
Merge branch 'sam/continuous-roll' into 'master'
Roll Tweaks
See merge request veloren/veloren!1975
|
2021-03-23 09:46:21 +00:00 |
|
Avi Weinstock
|
75f1b0f5e0
|
Remove level from create_ship and CreateShip.
|
2021-03-23 10:44:42 +01:00 |
|
Avi Weinstock
|
deb9358c3a
|
Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.
|
2021-03-23 10:44:37 +01:00 |
|
Avi Weinstock
|
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 |
|
Avi Weinstock
|
e2a74c5e5c
|
Enable RtSim airships.
|
2021-03-23 10:44:22 +01:00 |
|
Marcel
|
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 |
|
Joshua Barretto
|
456ceab6d0
|
Remove eye height check for beam
|
2021-03-23 10:43:22 +01:00 |
|
Joshua Barretto
|
695f6c52fe
|
Added raycast check to beams
|
2021-03-23 10:43:18 +01:00 |
|
Marcel
|
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 |
|
Marcel
|
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 |
|
Marcel
|
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 |
|
Marcel
|
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 |
|
Marcel Märtens
|
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 |
|
Sam
|
7ede94b4c9
|
Changelog
|
2021-03-22 23:53:00 -04:00 |
|