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,708 Commits 151 Branches 18 Tags 2.1 GiB
352fce239e
Commit Graph

250 Commits

Author SHA1 Message Date
Imbris
1306ccb6d9 Remove commented out radius list 2021-03-16 03:50:45 -04:00
Imbris
cfa0512cd0 Setup spatial grid for entity versus entity collisions 2021-03-16 03:50:45 -04:00
Marcel
39ac300bef Merge branch 'sam/buff-fix-test' into 'master' 
Fif Buff Emission

See merge request veloren/veloren!1910
 2021-03-15 22:46:44 +00:00
Sam
a983f5249f Test 2021-03-15 17:35:53 -04:00
Joshua Barretto
578d81058a Fixed incorrect velocity snapping on collision 2021-03-15 20:28:48 +00:00
Sam
0c7ea992c2 Mounting fix 2021-03-15 00:26:19 -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
Joshua Barretto
1e9ee3d243 Improved climbing, block-hopping on airships 2021-03-14 23:21:45 -04:00
Avi Weinstock
546ee48073 Fix interpolation for possession, and make the mount point of airships above their deck. 2021-03-14 23:21:45 -04:00
Joshua Barretto
be9476a1ca Fixed climbing/falling friction when on a wall 2021-03-14 23:21:45 -04:00
Joshua Barretto
6add95bd5c Fixed block-snapping, climbing and airship takeoff 2021-03-14 23:21:44 -04:00
Avi Weinstock
23b1417275 Add hermite interpolation for position (disabled for now with a flag, since it breaks possession). 2021-03-14 23:20:48 -04:00
Avi Weinstock
dad0012973 Get linear interpolation working for {Pos,Vel,Ori} with client-side timestamps. 2021-03-14 23:20:48 -04:00
Avi Weinstock
a71bacdce0 Add machinery for storing component buffers for interpolation. 2021-03-14 23:20:47 -04:00
Joshua Barretto
f6c6319952 Made entities rotate smoothly with airships, fixed rotation speeds 2021-03-14 23:20:47 -04:00
Joshua Barretto
e232a2e473 Fixed jumping inconsistencies, no block-snapping for ships 2021-03-14 23:20:46 -04:00
Joshua Barretto
b8a27f493c Initial pass for gravity and air resistance for more stable physics 2021-03-14 23:17:29 -04:00
Joshua Barretto
71c07734f7 Slightly increase block-hop height for better airship block-hopping 2021-03-14 23:17:29 -04:00
Joshua Barretto
1af86ef2f8 Removed unnecessary matrix mul 2021-03-14 23:17:29 -04:00
Joshua Barretto
9424998e6e Fixed arrows 2021-03-14 23:17:29 -04:00
Joshua Barretto
44f9932450 Properly propagate velocity steps during airship collision to avoid falling through airships 2021-03-14 23:17:28 -04:00
Joshua Barretto
6d8ba31e5b Reduced air resistance for better-behaving airships 2021-03-14 23:17:28 -04:00
Joshua Barretto
a4e5ba0639 Fixed incorrectly reversed orientation matrix 2021-03-14 23:17:28 -04:00
Joshua Barretto
7feb4942e3 Fixed incorrect wall climb direction on airships 2021-03-14 23:17:28 -04:00
Joshua Barretto
b2ab1046c8 Fewer precision issues by using player-relative coordinate space 2021-03-14 23:17:28 -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
40c284fd71 Relative velocity collisions 2021-03-14 23:14:26 -04:00
Joshua Barretto
3496c356e2 More relative motion changes 2021-03-14 23:14:26 -04:00
Joshua Barretto
09142d99b8 Fixed water collision bug 2021-03-14 23:14:25 -04:00
Joshua Barretto
f44ca1898c Made airship terrain hitboxes smaller 2021-03-14 23:14:25 -04:00
Joshua Barretto
f4b3d8145b Smooth airship movement 2021-03-14 23:14:21 -04:00
Joshua Barretto
afd99788b2 Made animations and friction ground-relative 2021-03-14 23:09:52 -04:00
Joshua Barretto
e1e6403c63 Fixed airship collisions under rotation, added position increment for velocity when on ground 2021-03-14 23:09:52 -04:00
Avi Weinstock
e9aab63a04 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
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
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
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
Imbris
8d0b776f18 Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements 
- remove overwritten logging setting in server-cli
- add server-cli command to load a random area for testing without a client
- make admin add/remove commands modify ingame players instead of needing to reconnect
- add spans to par_join jobs
- added test command that loads up an area of the world
- add tracy-world-server alias
- set debug directives to info for logging
 2021-03-13 02:28:59 -05:00
Samuel Keiffer
9b198b5cda Merge branch 'sam/sceptre-overhaul' into 'master' 
Overhaul sceptre

Closes #768

See merge request veloren/veloren!1845
 2021-03-11 16:47:50 +00:00
ccgauche
67b24294d6 Change Ecs access system to allow write accesses to be used + reintroduced get_player_name 2021-03-10 19:36:53 +01:00
Marcel Märtens
b151a246c3 update specs to get rid of old deps 2021-03-10 13:22:17 +01:00
Marcel
81959c0a89 Merge branch 'ccgauche/move-back-register-to-system' into 'master' 
Moved back register to a system

See merge request veloren/veloren!1868
 2021-03-10 00:56:33 +00:00
Sam
de5ef03ac4 Auras will now refresh buffs if a buff was already present that had a lesser duration. 
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
 2021-03-09 18:03:06 -05:00
Sam
c13e84aff5 Aura duration separated from cast duration in aura state 
Healing beam now requires combo > 0 to enter character state
Removed last vestiges of old sceptre abilities
Combo extended to most other attacks
Cast aura state renamed to basic aura
 2021-03-09 18:02:00 -05:00
Sam
940b4b5de7 Combo counter now uses outcomes. 2021-03-09 17:59:42 -05:00
Sam
398370ca51 Changed lifesteal beam particles to look better. 
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
 2021-03-09 17:59:41 -05:00
Sam
18edc1092b Basic beam now generates combo. Healing beam now consumes combo, and requires combo to heal. 2021-03-09 17:59:33 -05:00
Sam
43874a4aa5 Added healing beam character state. 
This was done as there was a lot of special casing in basic beam to account for healing.
 2021-03-09 17:58:20 -05:00
Sam
a1bbc136fc New abilities for sceptre are done 2021-03-09 17:56:38 -05:00
ccgauche
10e5620642 Moved back register to a system 2021-03-09 21:16:23 +01:00
Marcel Märtens
d7df741671 update dependencies, including removal of some tracy deps as they are get through common/tracy 2021-03-09 20:17:29 +01:00
Marcel Märtens
4ebfbdde0f Move Specs code to own common_ecs create, put tracy and macros into common_base 2021-03-09 00:54:01 +01:00
Marcel Märtens
f353f14703 change Name from VSystem to System 2021-03-08 13:15:00 +01:00
Marcel Märtens
6b88545481 restructure server metrics 
- get rid of old SysTimers for each system in favour of VSystem tracking
 - move metrics generation from lib.rs to own system
 - code cleanup
 - remove time tracking in common::sys
 2021-03-08 11:51:13 +01:00
Marcel Märtens
c515fece28 Implement a VSystem trait that can be implemented by Systems. 
It will autodo some things, like track start and time and export those in system metrics
Add a origin and implement it for all Systems in Veloren
 2021-03-08 11:51:04 +01:00
ccgauche
89774980b4 First commit 2021-03-07 22:32:52 +01:00
Joshua Yanovski
2dd7089e52 Bring vek up to date so we can bump rustc (hopefully). 2021-03-04 05:46:59 +01:00
ccgauche
7f4411ba1f Merge branch 'master' into 'ccgauche/plugin-player-join-event' 
# Conflicts:
#   CHANGELOG.md
 2021-03-02 09:45:15 +00:00
Sam
d02c61ad8a Item use is now goes through a control action rather than a control event. 2021-03-01 20:51:08 -05:00
ccgauche
db9991ce6d Adressed all comments 2021-03-01 22:24:02 +01:00
ccgauche
9628dfaf99 Fixed comments 2021-03-01 21:29:18 +01:00
ccgauche
dbd4d70b79 Lots of improvement in pointer management (switched from i32 to u64) + New event implemented 2021-03-01 19:00:44 +01:00
Sam
a88ad7b971 Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command. 2021-02-28 15:02:03 -05:00
Sam
50c47ce84d Made changes to fix torvus 2021-02-27 22:42:11 -05:00
Sam
404c7f0905 Combo melee now checks combo 2021-02-27 18:24:28 -05:00
Sam
f24433c8cf Added combo component 2021-02-27 14:55:06 -05:00
Sam
53b0ba286a Ice particles for Wendigo 2021-02-27 01:42:46 -05:00
Sam
64a809ee5b Made comments more descriptive 2021-02-26 18:15:24 -05:00
Sam
45dd36be07 Auras now apply a buff only once, instead of applying a buff every second. 
Also supports for buffs persisting a period of time after leaving the aura.
Campfire regen slightly buffed.
 2021-02-26 17:57:01 -05:00
Samuel Keiffer
00937a4e8b Merge branch 'aweinstock/modularforms' into 'master' 
Support modular weapon components made from a tagged material using the material as a multiplier.

See merge request veloren/veloren!1815
 2021-02-26 00:53:02 +00:00
Avi Weinstock
78014d7d3b Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers. 2021-02-23 15:49:34 -05:00
Sam
3d57db9485 Test fix for torvus 2021-02-23 14:38:58 -05:00
Imbris
da3edf54fb Merge branch 'ccgauche/plugin-retreive' into 'master' 
ccgauche/plugin retreive

See merge request veloren/veloren!1788
 2021-02-23 16:36:05 +00:00
ccgauche
4b1c033f6e Added scopeguard to protect against unwind 2021-02-23 13:58:13 +01:00
ccgauche
74ec5c652a Added safety section to the EcsAccessManager 2021-02-23 13:58:07 +01:00
Marcel
2fbd382c91 Merge branch 'xMAC94x/physics_followup' into 'master' 
physics followup, fix arrow problems

See merge request veloren/veloren!1811
 2021-02-23 02:00:40 +00:00
Marcel
6081ebbe15 Merge branch 'sam/ecs-sys-struct' into 'master' 
Sam/ecs sys struct

See merge request veloren/veloren!1813
 2021-02-23 00:08:09 +00:00
ccgauche
f85e79af07 Fixed turbofish issues 2021-02-23 00:03:29 +01:00
ccgauche
a12e554266 Removed the unwrap to ensure the WASM instance can't crash the host 2021-02-23 00:03:27 +01:00
ccgauche
387daf8aea Change invalid message in examples and cleanup 
Updated changelog + Removed hello plugin from plugins folder
 2021-02-23 00:02:58 +01:00
ccgauche
6c991cc2cd Changed to less restrictive memory ordering 2021-02-23 00:02:51 +01:00
ccgauche
267e7d8b4c Finalized Retrieve API 2021-02-22 23:59:41 +01:00
ccgauche
06aa7ab70c Retrieves added + New ECS memory layout for plugins 2021-02-22 23:59:32 +01:00
ccgauche
1597fcc79e Fixed the plugin compilation and added comments 
TODO: Remove compilation errors on WASM side (while using common).
 2021-02-22 23:59:25 +01:00
ccgauche
8a693d9fde New cleaner safer version 2021-02-22 23:59:15 +01:00
ccgauche
a067a20b69 added basic retreive 2021-02-22 23:59:11 +01:00
Marcel Märtens
6008109413 physics followup, fix arrow problems by adding the vel_dt to the collision boundry 2021-02-22 23:51:01 +01:00
Sam
3f467a32e6 Changed naming from 'immutable data' to 'read data' 2021-02-22 16:02:37 -05:00
Sam
2b5120319d Character behavior system now uses immutable data struct 2021-02-22 15:30:53 -05:00
Sam
fae1db90d5 Controller system now uses immutable data struct 2021-02-22 14:33:54 -05:00
Sam
dcacd82293 Stats system now uses immutable data struct 2021-02-22 14:27:34 -05:00
Sam
27fe1c20ac Aura system now uses immutable data struct 2021-02-22 14:14:10 -05:00
Sam
4c0c06ea4c Buff system now uses immutable data struct 2021-02-22 14:03:18 -05:00
Sam
605513ea56 Beam system now uses immutable data struct 2021-02-22 13:57:56 -05:00
Sam
11a0d67b35 Shockwave system now uses immutable data struct 2021-02-22 13:49:56 -05:00