Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,213 Commits 151 Branches 18 Tags 2.1 GiB
759c423595
Commit Graph

2306 Commits

Author SHA1 Message Date
Marcel Märtens
3d45262ebb warn when a single system takes longer than 500ms 2021-03-22 14:26:05 +01: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
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
7ae4230dc8 Merge branch 'zesterer/pick' into 'master' 
Pickaxe

See merge request veloren/veloren!1959
 2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b Faster pick, less vibrant block selection 2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Joshua Barretto
003e76113f Fetch InputAttr from controller 2021-03-21 19:11:44 +00:00
Marcel
983523c463 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
e64258afcf 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
a77578a25b harden slowjob code 2021-03-21 18:45:23 +01:00
Joshua Barretto
b45df7fe10 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0 Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Vincent Foulon
e06870702f Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Vincent Foulon
9e11a574d2 remove CharacterAbility::Climb 2021-03-21 00:35:34 +01:00
Vincent Foulon
d0df01fe51 move climbing skill adjustment into climb module 2021-03-21 00:22:04 +01:00
Avi Weinstock
1351b9515c Update fall damage calculations. 2021-03-20 18:46:34 -04:00
Vincent Foulon
8b01abde67 address comments 2021-03-20 22:56:54 +01:00
Sam
d7090315ff Increased combo duration by 50% 2021-03-20 16:44:18 -04:00
Sam
92c9e8c477 Fixed gaining combo by shooting loot bags 2021-03-20 16:26:10 -04:00
Vincent Foulon
d0aa68a9d2 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Marcel Märtens
2733ba2e27 Change the version number to 0.9 2021-03-20 13:07:09 +01:00
Samuel Keiffer
d489ade082 Parallelized beam 2021-03-19 20:18:36 +00:00
Imbris
9fb44e5674 More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations 2021-03-18 21:20:22 -04:00
Snowram
e5afb2fcf7 Various visual fixes 2021-03-18 22:53:06 +01:00
Marcel Märtens
e6e56f19f9 cleanup faster physics calc 2021-03-18 15:22:28 +01:00
Imbris
bf383d9562 Combine 5 things into 1 2021-03-18 14:26:32 +01:00
Imbris
99805f9a8d 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
a6cae66a54 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
6c939b35b8 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
64c8f75a4f 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
5384e5a01e Fixed dash 2021-03-17 20:13:12 -04:00
DaforLynx
fbf4defa04 Adds sfx for Sceptre aura 2021-03-17 23:54:49 +00:00
Joshua Barretto
e8b053a09f Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage 2021-03-17 21:31:07 +00:00
Sam
2bceb2d3a6 Shockwaves and beams no longer use last position in calculating if they hit. 2021-03-17 17:24:39 -04:00
Marcel Märtens
49e5fe96df 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
529eae2e9d slowjob: allow at least 1 job of every type 2021-03-17 08:26:43 +01:00
Imbris
198cc7e75a Remove extra instrumentation and the old voxel collider loop 2021-03-16 23:42:13 -04:00
Imbris
e70f097738 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
e9cbac387e 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
b534282dcc fix ci 2021-03-16 23:31:40 +01:00
Marcel
34b194d179 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
ac904f59f0 Merge branch 'sam/invuln-fixes' into 'master' 
Safezone fixes

See merge request veloren/veloren!1920
 2021-03-16 22:20:42 +00:00
Sam
18173caefe 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
4d6fb0584a Fix mounting by making deferred {pos,vel} writes optional in physics. 2021-03-16 14:04:28 -04:00
Avi Weinstock
62de0816e0 Apply ForcedUpdate messages to the interpolation system, potentially improving the handling of teleports. 2021-03-16 11:55:01 -04:00
Marcel Märtens
a286eb084a create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it 2021-03-16 13:31:04 +01:00
Marcel Märtens
0ec863b236 further experiments via a special Group 2021-03-16 09:59:05 +01:00