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 |
|
Avi Weinstock
|
833ab7f1a8
|
Make merchants not virtually spamclick accept.
|
2021-03-22 22:53:53 -04:00 |
|
heydabop
|
0e3f7625a9
|
Fix #962 - kick old client and add new client on duplicate login
|
2021-03-22 19:15:24 -05:00 |
|
Sam
|
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 |
|
Sam
|
31f4ef684d
|
Tweaked numbers
|
2021-03-22 17:26:55 -04:00 |
|
Marcel
|
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 |
|
Marcel Märtens
|
6b23101fac
|
update toolchain to nightly-2021-03-22
|
2021-03-22 16:41:04 +01:00 |
|
Marcel
|
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 |
|
Marcel Märtens
|
3d45262ebb
|
warn when a single system takes longer than 500ms
|
2021-03-22 14:26:05 +01:00 |
|
Marcel
|
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 |
|
Marcel Märtens
|
667faca5a5
|
update asset_manager
|
2021-03-22 12:37:38 +01:00 |
|
Marcel Märtens
|
fdc40f52d9
|
give more threads a fixed name
|
2021-03-22 12:37:03 +01:00 |
|
Marcel
|
c51a2b10a0
|
Merge branch 'xMAC94x/net-improve' into 'master'
defer some trace, so that we wont spam the log.
See merge request veloren/veloren!1966
|
2021-03-22 10:31:56 +00:00 |
|
Samuel Keiffer
|
4356f67bed
|
Merge branch 'loot-tables' into 'master'
Loot tables
See merge request veloren/veloren!1968
|
2021-03-22 09:39:35 +00:00 |
|
Samuel Keiffer
|
f65cd1e771
|
Loot tables
|
2021-03-22 09:39:35 +00:00 |
|
Justin Shipsey
|
f57af6f776
|
Merge branch 'slipped/animtweaks' into 'master'
airship movement bits
See merge request veloren/veloren!1967
|
2021-03-22 08:49:04 +00:00 |
|
Marcel Märtens
|
9084ac48f1
|
defer some trace, so that we wont spam the log.
|
2021-03-22 09:16:07 +01:00 |
|
Joshua Barretto
|
6690854687
|
Merge branch 'zesterer/better-particle-emission' into 'master'
Smoother particle emission for moving objects
See merge request veloren/veloren!1965
|
2021-03-22 06:15:20 +00:00 |
|
Marcel
|
dc4570def5
|
Merge branch 'sharp/texture-atlases' into 'master'
Enable allocation of new textures on atlas allocation failure.
See merge request veloren/veloren!1949
|
2021-03-22 04:35:41 +00:00 |
|
Samuel Keiffer
|
1374900928
|
Merge branch 'sam/combat-fixes' into 'master'
Fixes gaining combo by shooting loot bag
See merge request veloren/veloren!1953
|
2021-03-22 02:01:22 +00:00 |
|
jshipsey
|
31747d8ff1
|
airship movement bits
|
2021-03-21 21:43:49 -04:00 |
|
Joshua Barretto
|
f9612c1c26
|
Made pickaxe obtainable
|
2021-03-22 00:24:07 +00:00 |
|
Joshua Barretto
|
7b736640f5
|
Smoother particle emission for moving objects
|
2021-03-22 00:23:25 +00:00 |
|
Marcel
|
0372e89fb8
|
Merge branch 'xMAC94x/benches' into 'master'
reduce benches to O2 and enable incremental
See merge request veloren/veloren!1964
|
2021-03-22 00:19:44 +00:00 |
|
Joshua Barretto
|
7ae4230dc8
|
Merge branch 'zesterer/pick' into 'master'
Pickaxe
See merge request veloren/veloren!1959
|
2021-03-22 00:19:42 +00:00 |
|
Marcel Märtens
|
3d017f6a35
|
reduce benches to O2 and enable incremental
|
2021-03-21 23:25:02 +01:00 |
|