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,191 Commits 151 Branches 18 Tags 2.1 GiB
7ae4230dc8
Commit Graph

1339 Commits

Author SHA1 Message Date
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
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
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
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
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
Marcel
eabddd7263 Merge branch 'christof/trading_fix2' into 'master' 
fix merchant getting stuck in non-existant trade when declining after accepting

See merge request veloren/veloren!1941
 2021-03-19 09:29:45 +00:00
Christof Petig
fb40cd93a9 fix merchant getting stuck in non-existant trade when declining after accepting 2021-03-19 00:43:23 +01:00
Avi Weinstock
a770ef0f4a Fix agent flight by enabling flight mode at the start of each tick of the agent system. 2021-03-18 18:54:23 -04:00
Joshua Barretto
e8b053a09f Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage 2021-03-17 21:31:07 +00:00
Marcel
afa11d03e5 Merge branch 'james/fix-npc-chat-spam' into 'master' 
Correct npc chat spam

See merge request veloren/veloren!1921
 2021-03-16 23:22:48 +00:00
James Melkonian
ba196c4345 merchants no longer run away while trading 
(this time without refactoring)
 2021-03-16 23:22:48 +00:00
Marcel
cf29fba14b Merge branch 'ubruntu/issue983' into 'master' 
scan_fmt -> 0.2.6

Closes #983

See merge request veloren/veloren!1911
 2021-03-16 22:23:23 +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
Marcel
f4fa1e9cd3 Merge branch 'xMAC94x/slowjob' into 'master' 
instead of using tokio::Threadpool for CPU bound long running tasks, use rayon, but drip feed and limit the tasks

See merge request veloren/veloren!1912
 2021-03-16 15:28:28 +00:00
Joshua Barretto
ac20e57647 Prevent component inserts being immediately invalidated 2021-03-16 14:24:23 +00: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
Joshua Barretto
2d23a89509 Fixed missed component insert bug 2021-03-16 12:19:42 +00:00
Joshua Barretto
6f10a56589 Optimised entity sync code, increased animation throttling distance 2021-03-16 02:49:33 +00:00
Joshua Barretto
bf66886e7c Increased network throttling for reduced network bandwidth 2021-03-16 02:40:56 +00:00
James Melkonian
6ea43cfd75 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Bryant Deters
ff5b8e440d scan_fmt -> 0.2.6 2021-03-15 17:48:21 -05:00
Marcel
ad49318a63 Merge branch 'sam/explosion-fix' into 'master' 
Explosions now take into account hitbox of entity.

See merge request veloren/veloren!1905
 2021-03-15 22:26:28 +00:00
Sam
461ad6e339 Rebalanced explosion strengths 2021-03-15 00:36:07 -04:00
Sam
26f5d40bff Explosions now take into account hitbox of entity. 2021-03-14 23:45:55 -04:00
Avi Weinstock
9304ecab3d Address Imbris's MR 1888 comments, and add changelog entry. 
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
 2021-03-14 23:21:46 -04:00
Avi Weinstock
bbb11882e2 Add lerping of physics to extrapolated position, and enable sending updates for stopped entities. 2021-03-14 23:20:48 -04:00
Avi Weinstock
a32be4ac5a Address MR 1888 review comments. 
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
 2021-03-14 23:17:28 -04:00
Avi Weinstock
aa56166c80 Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics. 2021-03-14 23:17:26 -04:00
Joshua Barretto
3496c356e2 More relative motion changes 2021-03-14 23:14:26 -04:00
Avi Weinstock
5ff72a4a2e /airship angle command and RtSim airships. 2021-03-14 23:14:26 -04:00
Joshua Barretto
e59b68c262 Mountable airships 2021-03-14 23:14:25 -04:00
Joshua Barretto
f4b3d8145b Smooth airship movement 2021-03-14 23:14:21 -04:00
James Melkonian
6ff054099f Allow spawned airships to move 2021-03-14 23:09:52 -04:00
Avi Weinstock
bcd3799395 Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning. 2021-03-14 23:09:51 -04:00
Avi Weinstock
5d85775dcf Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct). 2021-03-14 23:09:51 -04:00
Avi Weinstock
8b9e84972a Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-14 23:09:49 -04:00
Marcel
5570b57282 Merge branch 'sam/yeet-inputs' into 'master' 
Reworked Controller Inputs to use Control Actions

See merge request veloren/veloren!1900
 2021-03-15 01:32:02 +00:00
Forest Anderson
8cec35a9af Merge branch 'synis/fix-safezone-mass' into 'master' 
Fix safezone entity mass

See merge request veloren/veloren!1902
 2021-03-15 00:52:03 +00:00
Sam
ecff675cc4 Wielding now works again 
Rolling now resumes combo states correctly again
Cleanup
 2021-03-14 17:26:55 -04:00
Sam
ac6e192db4 Completely purged old method of inputs 2021-03-14 17:26:55 -04:00
Sam
b5d501199d Secondary input now fully functional 2021-03-14 17:26:53 -04:00
Sam
21e6f4797c Primary ability fully functional. 2021-03-14 17:26:53 -04:00
Sam
19c81f1528 Support for canceling an input. Boost state hooked up to system. 2021-03-14 17:26:52 -04:00
Sam
c6d8daaae3 Primary input now activated from control actions. 
Moved a lot of key_state to a HashSet so that it is handled automatically.
 2021-03-14 17:26:51 -04:00