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

128 Commits

Author SHA1 Message Date
Sam
4cb61a2e8d Made comments more descriptive 2021-02-26 18:15:24 -05:00
Sam
714dc9106d 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
f608ff9806 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
fa891ff74a 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
ef3cc6e144 Test fix for torvus 2021-02-23 14:38:58 -05:00
Imbris
7b4450d858 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
15e101c957 Added scopeguard to protect against unwind 2021-02-23 13:58:13 +01:00
ccgauche
4080152b56 Added safety section to the EcsAccessManager 2021-02-23 13:58:07 +01:00
Marcel
2fa374a32a 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
b83703c1c5 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
a673c1a132 Fixed turbofish issues 2021-02-23 00:03:29 +01:00
ccgauche
bb0ab44e88 Removed the unwrap to ensure the WASM instance can't crash the host 2021-02-23 00:03:27 +01:00
ccgauche
4bd02c9a03 Change invalid message in examples and cleanup 
Updated changelog + Removed hello plugin from plugins folder
 2021-02-23 00:02:58 +01:00
ccgauche
ba8cf8437c Changed to less restrictive memory ordering 2021-02-23 00:02:51 +01:00
ccgauche
9e137b0738 Finalized Retrieve API 2021-02-22 23:59:41 +01:00
ccgauche
4a460c2885 Retrieves added + New ECS memory layout for plugins 2021-02-22 23:59:32 +01:00
ccgauche
eb30572d29 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
9832139e4e New cleaner safer version 2021-02-22 23:59:15 +01:00
ccgauche
143d23beb9 added basic retreive 2021-02-22 23:59:11 +01:00
Marcel Märtens
bd0178a1b2 physics followup, fix arrow problems by adding the vel_dt to the collision boundry 2021-02-22 23:51:01 +01:00
Sam
284a42060d Changed naming from 'immutable data' to 'read data' 2021-02-22 16:02:37 -05:00
Sam
cec54039bc Character behavior system now uses immutable data struct 2021-02-22 15:30:53 -05:00
Sam
d7808a4bf0 Controller system now uses immutable data struct 2021-02-22 14:33:54 -05:00
Sam
92394bb1b1 Stats system now uses immutable data struct 2021-02-22 14:27:34 -05:00
Sam
aa8068b021 Aura system now uses immutable data struct 2021-02-22 14:14:10 -05:00
Sam
f88d98790f Buff system now uses immutable data struct 2021-02-22 14:03:18 -05:00
Sam
a2f4bc1b76 Beam system now uses immutable data struct 2021-02-22 13:57:56 -05:00
Sam
0f33d79ed0 Shockwave system now uses immutable data struct 2021-02-22 13:49:56 -05:00
Sam
57a54731df Projectile system now uses immutable data struct 2021-02-22 13:37:42 -05:00
Sam
ae361bdea4 Melee system now uses immutable data struct 2021-02-22 13:25:21 -05:00
Marcel Märtens
d3ef72e2b7 share tokio Runtime between Client and Server, name rayon Threadpool 2021-02-22 17:35:06 +01:00
Vincent Glize
8e6d7cee71 Optimize Entity <> Entity collision check by calculating a entity via sphere. 2021-02-22 12:36:42 +01:00
Sam
b0c26317b5 Added functionality for buffs queueing. Saturation now queues. 2021-02-20 17:13:17 -05:00
Caelan
86d1b00735 Clean and update dependencies 
* Remove tweak feature
 * Remove const-tweaker
 * Update tiny_http
 * Update bitvec to 0.21.0
 * Downgrade euc to avoid conflict with vek 0.12.0
 * Require exactly vek 0.12.0
 * Update all other dependencies automatically based on these changes
 * Update gilrs to latest at the request of Ada Lovegirls
 * Update meshing benchmarks to new criterion API
 2021-02-17 01:27:06 -08:00
Joshua Barretto
2706ccd675 Merge branch 'lboklin/quat-ori' into 'master' 
Redefine Ori as a quaternion

See merge request veloren/veloren!1755
 2021-02-16 22:39:11 +00:00
Avi Weinstock
f86f22f0e8 MR 1775 review fixes. 
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
 2021-02-14 11:13:56 -05:00
Avi Weinstock
b259acaa59 Trade implementation progress. 
- State machine for modifying trades.
- ServerGeneral/ClientGeneral messages.
 2021-02-12 18:43:09 -05:00
Avi Weinstock
94ef4a6917 Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement. 2021-02-12 18:43:09 -05:00
Sam
7e3ec94207 Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead. 2021-02-08 13:55:50 -05:00
Sam
d6ffb1cea5 Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common. 2021-02-08 12:31:17 -05:00
Sam
7289ee89fa Server events directly emitted in states now. 2021-02-08 12:01:48 -05:00
Sam
45be7dd64d Eradicated clones 2021-02-08 12:01:48 -05:00
Sam
b7496b438f Inventory changes that modify the loadout now go through a control action instead of a control event. 2021-02-08 12:01:47 -05:00
James Melkonian
4d4c6d8b13 Move agent system to server 2021-02-06 06:15:25 +00:00
Ludvig Böklin
a888cd00d5 Redefine Ori as a quaternion 2021-02-05 09:33:14 +01:00
Sam
64868ad7a3 Addressed comments. 2021-02-02 16:08:09 -05:00
Sam
30f33a03b7 Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps. 2021-02-02 13:07:07 -05:00
Sam
1bc1b5f200 Added support for damage falloff with explosions. 2021-02-02 13:07:06 -05:00
Sam
486de732fc Explosions now use attacks. 2021-02-02 13:07:06 -05:00
Sam
7317599bed Shockwaves now use attacks. 2021-02-02 13:07:05 -05:00