2307 Commits

Author SHA1 Message Date
Marcel Märtens
8838bddefe update toolchain to nightly-2021-03-22 2021-03-22 16:41:04 +01:00
Marcel Märtens
bb8c7f46fb warn when a single system takes longer than 500ms 2021-03-22 14:26:05 +01:00
Samuel Keiffer
639a40558f Merge branch 'loot-tables' into 'master'
Loot tables

See merge request veloren/veloren!1968
2021-03-22 09:39:35 +00:00
Samuel Keiffer
b0dbdbdf9f Loot tables 2021-03-22 09:39:35 +00:00
Justin Shipsey
fef5607829 Merge branch 'slipped/animtweaks' into 'master'
airship movement bits

See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
Samuel Keiffer
d495459a12 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
87b3cb8270 airship movement bits 2021-03-21 21:43:49 -04:00
Joshua Barretto
17548c3ddb Merge branch 'zesterer/pick' into 'master'
Pickaxe

See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
abdba70178 Faster pick, less vibrant block selection 2021-03-21 20:38:08 +00:00
Joshua Barretto
0f201c5e09 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Joshua Barretto
677a8d0c21 Fetch InputAttr from controller 2021-03-21 19:11:44 +00:00
Marcel
88c156a3ac Merge branch 'vfoulon80/climbing-skill' into 'master'
Add climbing speed and cost

See merge request veloren/veloren!1950
2021-03-21 18:35:44 +00:00
Marcel
174c755740 Merge branch 'xMAC94x/tracing_slowjob' into 'master'
harden slowjob code

See merge request veloren/veloren!1961
2021-03-21 18:34:21 +00:00
Marcel Märtens
1b5aa47e03 harden slowjob code 2021-03-21 18:45:23 +01:00
Joshua Barretto
4b7f69f850 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
3aad8818fa Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Vincent Foulon
50af548636 Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Vincent Foulon
d0dcf5228e remove CharacterAbility::Climb 2021-03-21 00:35:34 +01:00
Vincent Foulon
2e76966868 move climbing skill adjustment into climb module 2021-03-21 00:22:04 +01:00
Avi Weinstock
49bf730c91 Update fall damage calculations. 2021-03-20 18:46:34 -04:00
Vincent Foulon
e35099fd84 address comments 2021-03-20 22:56:54 +01:00
Sam
73bb583235 Increased combo duration by 50% 2021-03-20 16:44:18 -04:00
Sam
e18c22a197 Fixed gaining combo by shooting loot bags 2021-03-20 16:26:10 -04:00
Vincent Foulon
902029e977 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Marcel Märtens
fcb00df6b8 Change the version number to 0.9 2021-03-20 13:07:09 +01:00
Samuel Keiffer
c96b191e6f Parallelized beam 2021-03-19 20:18:36 +00:00
Imbris
af56fb272b More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations 2021-03-18 21:20:22 -04:00
Snowram
0dabf089f2 Various visual fixes 2021-03-18 22:53:06 +01:00
Marcel Märtens
94410ddedd cleanup faster physics calc 2021-03-18 15:22:28 +01:00
Imbris
03f02f5829 Combine 5 things into 1 2021-03-18 14:26:32 +01:00
Imbris
2072d00c7b Merge branch 'imbris/voxel-collider-broadphase' into 'master'
Spatial grid for voxel colliders as well as a basic bounding sphere test

See merge request veloren/veloren!1927
2021-03-18 07:03:04 +00:00
Marcel
76fee3aa54 Merge branch 'sam/fix-dash' into 'master'
Fixed dash

See merge request veloren/veloren!1933
2021-03-18 03:09:46 +00:00
Joshua Barretto
dc40803f1f Merge branch 'zesterer/network-tweaks' into 'master'
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage

See merge request veloren/veloren!1935
2021-03-18 01:47:29 +00:00
Joshua Barretto
55bab83f5d Merge branch 'sam/remove-combat-last-pos' into 'master'
Shockwaves and beams no longer use last position in calculating if they hit.

See merge request veloren/veloren!1934
2021-03-18 01:07:18 +00:00
Sam
440ccdfdd2 Fixed dash 2021-03-17 20:13:12 -04:00
DaforLynx
53362d02ed Adds sfx for Sceptre aura 2021-03-17 23:54:49 +00:00
Joshua Barretto
b514f4fe92 Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage 2021-03-17 21:31:07 +00:00
Sam
42c700bd2a Shockwaves and beams no longer use last position in calculating if they hit. 2021-03-17 17:24:39 -04:00
Marcel Märtens
65352d771d add a check that at least 1 thread works for slowJobPool and for every configuration 2021-03-17 14:36:58 +01:00
Marcel Märtens
0c97984a9e slowjob: allow at least 1 job of every type 2021-03-17 08:26:43 +01:00
Imbris
1792068e4e Remove extra instrumentation and the old voxel collider loop 2021-03-16 23:42:13 -04:00
Imbris
d3f30fbfdb Spatial grid for voxel colliders as well as a basic bounding sphere test
before doing any actual expensive voxel collision checking
2021-03-16 23:32:03 -04:00
Monty Marz
d8d965a66a new loading bg, staff models
item images

fix paths

loot tables, adjustments

Update main.ron
2021-03-16 23:23:24 +00:00
Marcel Märtens
f5ba496cd0 fix ci 2021-03-16 23:31:40 +01:00
Marcel
03b90d67c9 Merge branch 'aweinstock/forcedupdate-interpolation' into 'master'
Apply ForcedUpdate messages to the interpolation system, potentially improving...

See merge request veloren/veloren!1917
2021-03-16 22:23:04 +00:00
Marcel
61aa7660ee Merge branch 'sam/invuln-fixes' into 'master'
Safezone fixes

See merge request veloren/veloren!1920
2021-03-16 22:20:42 +00:00
Sam
11a43f232e NPCs no longer target players inside safezones (and consider them to be defeated)
Warding aura no longer sometimes bypasses safezone invulnerability
2021-03-16 15:17:08 -04:00
Avi Weinstock
9bb42e0e99 Fix mounting by making deferred {pos,vel} writes optional in physics. 2021-03-16 14:04:28 -04:00
Avi Weinstock
67368dbc58 Apply ForcedUpdate messages to the interpolation system, potentially improving the handling of teleports. 2021-03-16 11:55:01 -04:00
Marcel Märtens
0f405626e8 create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it 2021-03-16 13:31:04 +01:00