aljazerzen
|
8263d47f19
|
cleanup login provider
|
2021-03-27 13:29:17 +01:00 |
|
aljazerzen
|
96449f18d6
|
move already-logged-in check to register
|
2021-03-26 11:41:03 +01:00 |
|
aljazerzen
|
06f860e2a0
|
refactor handling of duplicate login
|
2021-03-25 12:33:56 +01:00 |
|
Justin Shipsey
|
2edeabae4a
|
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
|
41f3bcee97
|
Add missing seashells to the sprite manifest
|
2021-03-25 04:37:27 +00:00 |
|
Snowram
|
5034b0340c
|
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
|
6e4c897d82
|
Allow Escape key to cancel trades
|
2021-03-25 01:42:14 +01:00 |
|
Marcel
|
f01114f47a
|
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
|
3ba439994e
|
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
|
11aaf90845
|
fix the test
|
2021-03-24 22:37:01 +01:00 |
|
Joshua Barretto
|
76d40981db
|
Merge branch 'synis/primitives' into 'master'
Primitives
See merge request veloren/veloren!1937
|
2021-03-24 21:06:33 +00:00 |
|
Samuel Keiffer
|
ef2affb458
|
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
|
76fa685b9a
|
remove the remaining unwraps
|
2021-03-24 21:59:47 +01:00 |
|
Christof Petig
|
3049c6daf5
|
replace another group of unwraps
|
2021-03-24 21:43:30 +01:00 |
|
Avi Weinstock
|
7aaa22cc8b
|
Address MR 1987 review comments.
|
2021-03-24 16:09:12 -04:00 |
|
Avi Weinstock
|
67dedf409a
|
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
|
5bc6dca0d7
|
remove I/O unwraps (code inactive by default)
|
2021-03-24 20:31:17 +01:00 |
|
Synis
|
5b9b5c5101
|
Rotation uses matrix and some fixes for plane primitive
|
2021-03-24 18:21:01 +01:00 |
|
Synis
|
b91ee0476d
|
Rotation primitive and some minor fixes
|
2021-03-24 18:21:01 +01:00 |
|
Synis
|
e3d956adfb
|
Added a bunch of primitives
|
2021-03-24 18:21:01 +01:00 |
|
Joshua Yanovski
|
0a40dc1e2c
|
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
|
88a6dfbaee
|
adapt unit test
|
2021-03-24 07:37:46 +01:00 |
|
Christof Petig
|
c207403465
|
loop over slots_mut instead of using an index
|
2021-03-24 07:37:46 +01:00 |
|
Christof Petig
|
d67ff9ee1d
|
replace an unwrap by returning an Option
|
2021-03-24 07:37:45 +01:00 |
|
Avi Weinstock
|
35e729d919
|
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
|
d1e087bd53
|
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
|
5ca6a881b2
|
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
|
6c7af119e4
|
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
|
8f42c5a34b
|
Fix expect-panic on failed UID lookups in inventory_manip.
|
2021-03-23 19:04:21 -04:00 |
|
Avi Weinstock
|
761435e0fc
|
Address MR 1962 review comments.
|
2021-03-23 18:41:13 -04:00 |
|
Avi Weinstock
|
db7d0af951
|
Add a vertical camera clamp option and toggle to voxygen.
|
2021-03-23 18:22:32 -04:00 |
|
Avi Weinstock
|
2edb78afd9
|
Add an additional kind of stairs to dungeons.
|
2021-03-23 18:17:00 -04:00 |
|
Marcel
|
df68d0286f
|
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
|
a7828e14e9
|
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
|
1eb00cabff
|
Update short_1.ron to make eligible for cloth scrap recipe
|
2021-03-23 18:16:30 +00:00 |
|
Joshua Barretto
|
ee9eba542d
|
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
|
e5aabf1830
|
build(nix): switch to naersk
|
2021-03-23 16:02:47 +03:00 |
|
Marcel
|
ee74623fc4
|
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
|
cb23ab95f3
|
unittest fix
|
2021-03-23 11:51:00 +01:00 |
|
Marcel
|
ba0a2ce63c
|
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
|
657f6d6185
|
Remove level from create_ship and CreateShip.
|
2021-03-23 10:44:42 +01:00 |
|
Avi Weinstock
|
e389c3597f
|
Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.
|
2021-03-23 10:44:37 +01:00 |
|
Avi Weinstock
|
503f9c087b
|
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
|
57cbf8ce90
|
Enable RtSim airships.
|
2021-03-23 10:44:22 +01:00 |
|
Marcel
|
855306e954
|
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
|
4401230d4b
|
Remove eye height check for beam
|
2021-03-23 10:43:22 +01:00 |
|
Joshua Barretto
|
d09ee61834
|
Added raycast check to beams
|
2021-03-23 10:43:18 +01:00 |
|
Marcel
|
161b5927d3
|
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
|
68e50132d0
|
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
|
e2b98b1b77
|
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 |
|