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

353 Commits

Author SHA1 Message Date
Sam
5c16b0b532 Explosions now use attacks. 2021-02-02 13:07:06 -05:00
jiminycrick
dd69b5f2bc Poise stats 2021-01-28 17:22:35 -08:00
jiminycrick
e3965ae0ab Very basic functioning stun 2021-01-28 17:22:35 -08:00
jiminycrick
c83296a4ec Initial broken implementation of poise 
Character movement no longer broken.
 2021-01-28 17:22:33 -08:00
jiminycrick
8b97199245 Update rand dependency 2021-01-26 20:35:08 -08:00
Sam
4014b28d19 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
Monty Marz
1eb7f78189 Revert "Added TR translations for deaths by debuffs." 
This reverts commit 0817e45e13.
 2021-01-20 11:20:06 +00:00
Samuel Keiffer
b04158c5f9 Merge branch 'sam/combat-skill-trees' into 'master' 
Sam/combat skill trees

See merge request veloren/veloren!1680
 2021-01-19 14:18:07 +00:00
Monty Marz
ac60bf5794 Better visuals for skill button labels, don't show "0 EXP" in the SCT 
Made functions that were called every frame significantly cheaper.

Final UI fixes.
 2021-01-19 08:08:29 -05:00
Sam
89766b2b34 Added command to give yourself skill points. 
adjusted social window

Changelog
 2021-01-19 08:07:49 -05:00
Monty Marz
30df603115 flashing buttons for available points, WIP lock/unlock indicator 
Condensed UI code. Removed some hardcoding.

icons

squash later, WIP colouring for unavailable skills
 2021-01-19 08:07:33 -05:00
Sam
c0c45a1996 Purged stats, including level and experience 2021-01-19 08:07:23 -05:00
Jesus Bracho
42679201b0 Set up aura filtering 2021-01-18 22:58:56 +00:00
Ben Wallis
aef2637288 Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
Joshua Barretto
a4b9230f03 fixed Cargo.lock conflict 
Fixed `crossbeam-queue` being referenced  twice in the lockfile
 2021-01-07 20:25:12 +00:00
Benoît du Garreau
0cf164f33a Use assets_manager to load assets 2020-12-17 12:06:07 +01:00
Joshua Barretto
023888f560 Updated changelog, fmt and clippy fixes 2020-12-13 17:40:15 +00:00
Joshua Barretto
f8c8e342e6 Moved common networking code to common/net, clippy fixes 2020-12-13 17:23:45 +00:00
James Melkonian
71303fecfd Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
ubruntu
c975f811e7 Chat commands for group manipulation 2020-12-04 02:18:42 +00:00
Marcel Märtens
add7922653 Move Systems out of common into common_sys 
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
 2020-12-01 13:44:07 +01:00
Sam
0abe02ca13 Restructures loadout builder function to better support weapons being passed in. 2020-11-23 18:22:24 -06:00
Joshua Barretto
26fd40c0e3 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Joshua Barretto
8fd2e4537d Addressed review comments 2020-11-23 10:57:57 +00:00
Sam
0b86943e66 Added LoadoutConfig to better specify loadouts. 2020-11-23 10:57:56 +00:00
Joshua Barretto
42c6142ec6 Added occasional sky emission at night 2020-11-23 10:57:15 +00:00
Monty Marz
8235e94aa4 Conversion to struct to please clippy 2020-11-21 15:42:43 +01:00
Snowram
a939eac30d Refines spawn values, add gradients to debug_column 2020-11-21 14:33:35 +01:00
Snowram
2b08e8b931 Make /debug_column pick current location as default 2020-11-21 14:33:34 +01:00
ubruntu
198c59d2df Ubruntu/system independent itempaths 2020-11-21 04:08:11 +00:00
Imbris
cbb701f30d Temp fix for the home command 2020-11-15 20:40:12 -05:00
Treeco
48c9e9fb27 Made home command reset waypoint to world spawn 2020-11-15 01:06:27 +00:00
Imbris
37e4ea4669 Remove ability map from top level functions 2020-11-12 21:24:35 -06:00
Sam
9b4fa4e961 Started moving loading of ability manifest to an ecs variable. 2020-11-12 21:24:34 -06:00
Marcel
121364821a Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master' 
xMAC94x/feuerzeugBierflasche

See merge request veloren/veloren!1478
 2020-11-05 09:22:50 +00:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
d38f1d319c Energy and health change server events now reference EcsEntity instead of Uid. Added TargetGroup to use to determine targets of effects/damage. Added Entity(TargetGroup, Effect) to RadiusEffect enum. 2020-11-04 19:22:06 -06:00
Sam
87bff41a66 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
c48c022f7e Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Sam
e0cbbf52ed Changed explosions to take a vec of RadiusEffects. Changed Damage to a struct of DamageSource and value. Added interpolation function to damage. 2020-11-04 19:22:00 -06:00
Marcel Märtens
bbe6e8be7c Improve Phyiscs speed of entity handling. 
Before we had accessed velocities in a nested loop O(n²).
Now we copy it only once out of the ECS system and store it in a tmp Vec.
As we no longer need to hold a mut and imutable reference, we can iter of `&mut velocities` again in the outer loop.
Also improved many calculations called in the loop to make the check if 2 entities are to far apart as easy as possible
 2020-11-04 11:53:09 +01:00
Christof Petig
ac92c8a6af implement /home to return to home town 2020-11-04 00:55:15 +01:00
Marcel Märtens
3d9c3e481e Undo one Componenet per Stream and instead use Client. 
In order to keep the performance we made it Internal Mutability and use a `Mutex` per Stream, till `Stream.send` is no longer `&mut self`.
The old solution didn't rely on this, but needed multiple Components instead which zest didn't liked
 2020-11-03 08:56:08 +01:00
Marcel Märtens
00456c8373 extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game 2020-11-03 08:56:02 +01:00
Marcel Märtens
37d08e93ca review: 
- fix wording in error msg
 - find better name for structs
 - unify errors and cleanup code with `(|| {foo?; Some(())})()` pattern
 - fix the negative PlayersOnline, it was caused by having a gracefull shutdown AND a timeout error. we now unregister the client when he issues TERMINATE
 2020-11-03 08:55:51 +01:00
Marcel Märtens
e9be36c993 replace the single message system with 5 message systems. one per stream to handle less ECS systems PER msg system. 
As the MAIN message system was already on 25 of the max of 26 possible Ressources
 2020-11-03 08:55:42 +01:00
Marcel Märtens
dd966dd00e remote all streams from Client and put it directly in the ecs system. 
This commit does not run compile as the message sys now would requiere 30 imput parameters which is over the max of 26 :/
 2020-11-03 08:55:35 +01:00
Sam
d869f7e430 Moved explsion struct from within comp to common. 2020-10-14 21:06:55 -05:00
Sam
1c21362bc3 Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles. 2020-10-14 20:56:23 -05:00
Sam
cbb72363af Reworked explosions. Tweaked staff fireball. 2020-10-14 20:56:21 -05:00