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,241 Commits 151 Branches 18 Tags
Commit Graph

2995 Commits

Author SHA1 Message Date
Joshua Barretto
ee9eba542d 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
Avi Weinstock
503f9c087b 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
Sam
d172a252c9 Changelog 2021-03-22 23:53:00 -04:00
Marcel Märtens
8838bddefe update toolchain to nightly-2021-03-22 2021-03-22 16:41:04 +01:00
Marcel Märtens
58e557cac7 give more threads a fixed name 2021-03-22 12:37:03 +01: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
Joshua Barretto
2a0cff370e 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
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
jshipsey
87b3cb8270 airship movement bits 2021-03-21 21:43:49 -04:00
Joshua Barretto
0166666123 Smoother particle emission for moving objects 2021-03-22 00:23:25 +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
Sam
e9b5f989dc Fixed pick animation 2021-03-21 15:29:17 -04: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
973c0764fc Disabled block selection when not wielding 2021-03-21 16:29:13 +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
RedlineTriad
0e6c50644c
Sort the playerlist alphabetically 2021-03-21 10:22:33 +01: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
Avi Weinstock
5d2db1cb36 Address MR 1945 review comments. 2021-03-19 19:53:17 -04:00
Snowram
0dabf089f2 Various visual fixes 2021-03-18 22:53:06 +01:00
Vincent Foulon
e1502bb732 Remove unwraps when asset loading fails 2021-03-18 12:56:17 +00:00
Vincent Foulon
b5a9481a33 allow loading animations to be contributed from a manifest file 2021-03-17 23:41:28 +01:00
Vincent Foulon
0b884c7099 Add new random loading animations 2021-03-17 18:15:25 +01: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
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
f520fcb8c2 Optimised entity sync code, increased animation throttling distance 2021-03-16 02:49:33 +00:00
James Melkonian
aef24832b3 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Joshua Barretto
0a1a2b953f Fixed sliding when wielding 2021-03-15 14:18:56 +00:00
Marcel
e79e083866 Merge branch 'aweinstock/airship-mvp-rebased' into 'master' 
Airships

See merge request veloren/veloren!1888
 2021-03-15 11:37:12 +00:00
Forest Anderson
ded5927aad Merge branch 'aweinstock/tradefixes-20210314' into 'master' 
Client-side trade fixes: update recipe cache and always put client on the same...

See merge request veloren/veloren!1904
 2021-03-15 04:52:09 +00: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
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
59594feb1d Made animations and friction ground-relative 2021-03-14 23:09:52 -04:00
Avi Weinstock
c191b66371 Account for model translation in the physics. The voxel collider still needs to be north-aligned for now. 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
Avi Weinstock
8d3fd5f586 Client-side trade fixes: update recipe cache and always put client on the same side of the screen as their inventory. 2021-03-14 21:41:47 -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
Imbris
83c6a546d4 Merge branch 'snowram/new-npcs' into 'master' 
Snowram/new npcs

See merge request veloren/veloren!1896
 2021-03-15 00:10:46 +00:00
Sam
ce5ee03000 Wielding now works again 
Rolling now resumes combo states correctly again
Cleanup
 2021-03-14 17:26:55 -04:00
Sam
9733979565 Completely purged old method of inputs 2021-03-14 17:26:55 -04:00
Sam
98f82798f7 Secondary input now fully functional 2021-03-14 17:26:53 -04:00
Sam
efa3cb499e 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
Snowram
9c45f5c32d Theropod charge attack 2021-03-14 18:10:40 +01:00