Marcel Märtens
8838bddefe
update toolchain to nightly-2021-03-22
2021-03-22 16:41:04 +01:00
Marcel
242cf042ad
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
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
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
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
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
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
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
Joshua Yanovski
d3be50b4f5
Enable allocation of new textures on atlas allocation failure.
...
This solves the problem of not being able to set the view distance too
high, especially in pathological cases like giant trees. For
simplicity, we just freeze any atlas where allocation failed and start
allocating to a new texture and atlas, letting reference counting
destroy the old one when there are no more references to it. Because of
the spatial locality of chunk allocations, chunks allocated together
will virtually always have similar lifetimes, so the odds of this
causing significant fragmentation are very low, meaning this simple
solution should not do much worse than a much fancier one.
2021-03-20 16:21:41 +01:00
Marcel Märtens
fcb00df6b8
Change the version number to 0.9
2021-03-20 13:07:09 +01:00
Marcel
3061630b61
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
102b016b2e
fix merchant getting stuck in non-existant trade when declining after accepting
2021-03-19 00:43:23 +01:00
Avi Weinstock
e71d09b68d
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
b514f4fe92
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
2021-03-17 21:31:07 +00:00
Marcel
3a66189bbc
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
cec5dee242
merchants no longer run away while trading
...
(this time without refactoring)
2021-03-16 23:22:48 +00:00
Marcel
4d02f8f426
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
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
Marcel
1621f805f8
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
f5fe264bd9
Prevent component inserts being immediately invalidated
2021-03-16 14:24:23 +00: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
Joshua Barretto
6dd091d02d
Fixed missed component insert bug
2021-03-16 12:19:42 +00:00
Joshua Barretto
f520fcb8c2
Optimised entity sync code, increased animation throttling distance
2021-03-16 02:49:33 +00:00
Joshua Barretto
ee3d9443a1
Increased network throttling for reduced network bandwidth
2021-03-16 02:40:56 +00:00
James Melkonian
aef24832b3
Various RtSim and Agent Interaction Fixes
2021-03-16 01:30:35 +00:00
Bryant Deters
6c55b8cbb3
scan_fmt -> 0.2.6
2021-03-15 17:48:21 -05:00
Marcel
6bd2adab2b
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
cea87d2e9a
Rebalanced explosion strengths
2021-03-15 00:36:07 -04:00
Sam
fa498cc6cc
Explosions now take into account hitbox of entity.
2021-03-14 23:45:55 -04:00
Avi Weinstock
140b958193
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
0fe0562300
Add lerping of physics to extrapolated position, and enable sending updates for stopped entities.
2021-03-14 23:20:48 -04:00
Avi Weinstock
ee7f760e78
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
036e0c1f02
Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.
2021-03-14 23:17:26 -04:00
Joshua Barretto
1395462c27
More relative motion changes
2021-03-14 23:14:26 -04:00
Avi Weinstock
956b913a95
/airship angle command and RtSim airships.
2021-03-14 23:14:26 -04:00
Joshua Barretto
6dbf033c61
Mountable airships
2021-03-14 23:14:25 -04:00
Joshua Barretto
1a850ae65f
Smooth airship movement
2021-03-14 23:14:21 -04:00
James Melkonian
acf8b1b5cd
Allow spawned airships to move
2021-03-14 23:09:52 -04:00
Avi Weinstock
c5c9855ab8
Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.
2021-03-14 23:09:51 -04:00
Avi Weinstock
711509d0c1
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
ff3f3d1271
Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).
2021-03-14 23:09:49 -04:00
Marcel
5ac731254d
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
7135c3b1fd
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
ce5ee03000
Wielding now works again
...
Rolling now resumes combo states correctly again
Cleanup
2021-03-14 17:26:55 -04:00
