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

1177 Commits

Author SHA1 Message Date
TheThirdSpartan
6b236cbc30 Small chat message formatting changes and fixed missing player alias during admin entity possession 2021-02-17 02:15:45 +00: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
Quellus
ca66b2880b Limit character name length 2021-02-16 21:29:45 +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
a1176284d2 Polish trading implementation and address review comments. 
- Fix item swapping edge case
- Document more assumptions/edge cases
- fmt and clippy
- s/ServerGeneral::GroupInvite/ServerGeneral::Invite/
- Use `Client::current` in `Client::is_dead`
 2021-02-14 11:11:35 -05:00
Avi Weinstock
7a37538f06 Implement actual inventory-manipulation part of trading server side. 2021-02-12 18:43:10 -05:00
Avi Weinstock
e0f4bb3dc6 Trade implementation progress. 
- Accept/decline buttons that submit the proper messages
- A phase2 screen that renders the (item, quantity) pairs as text
- More checks in the trade state machine server-side.
 2021-02-12 18:43:10 -05:00
Avi Weinstock
2b9129d290 Implement enough of a trade UI that dragging & dropping items into it round-trips between clients. 2021-02-12 18:43:09 -05:00
Avi Weinstock
231c104355 Trade implementation progress. 
- Server messages now bring up the trade window.
- When a trade is declined, it closes the window on both clients.
 2021-02-12 18:43:09 -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
Quellus
22501ccf64 Rebase !1447 Chat input color and icon reflect channel message is sent to. 2021-02-10 19:42:59 +00: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
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
Imbris
36f7ac900e fix test server 2021-02-04 00:18:46 -05:00
Sam
14dfe5a30b Fixed bombs panicing the server. 2021-02-03 00:41:19 -05: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
e5bc0d7edf Outcomes now correctly read if an attack had any healing components. 2021-02-02 13:07:06 -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
c1db9025b8 Attacks can now heal. 2021-02-02 13:07:04 -05:00
Sam
52dbf3f1a8 Beams now use Attack, with limited functionality in some cases. 2021-02-02 13:07:03 -05:00
Sam
c6012f5b00 Critical hits are now functional. 2021-02-02 13:06:32 -05:00
James Melkonian
8951e427e4 Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
jiminycrick
ae8722794b Address some comments 
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
 2021-01-28 17:31:05 -08:00
jiminycrick
b689226173 Add migration for starter gear 2021-01-28 17:22:39 -08:00
jiminycrick
53b43e9812 Fix rebase and scrub poise from UI 2021-01-28 17:22:39 -08:00
jiminycrick
1fadcf51ba Some preliminary balancing 
Fix rebase
 2021-01-28 17:22:39 -08:00
jshipsey
95c3af1123 starting stun anim 
stagger anim, mirroring, bettern walk anim

wielding with stuns/stagger

Knockback fix

Added Poise documentation/comments
 2021-01-28 17:22:37 -08:00
jiminycrick
27ad277051 Made stunned state invulnerable to poise damage 
Fixing silly error for comp creation
 2021-01-28 17:22:35 -08:00
jiminycrick
a2262c5c6b Poise stats 2021-01-28 17:22:35 -08:00
jiminycrick
221d4c8cdc Add knockback to poise 2021-01-28 17:22:35 -08:00
jiminycrick
df124a1eef Very basic functioning stun 2021-01-28 17:22:35 -08:00
jiminycrick
df4c9eff49 Initial broken implementation of poise 
Character movement no longer broken.
 2021-01-28 17:22:33 -08:00
jiminycrick
64a3c16999 Update rand dependency 2021-01-26 20:35:08 -08:00
Scott Williams
9d3982940b Changed some recipes to use other gems. Removed DELETE statements from migration. 2021-01-24 19:45:44 +00:00
Scott Williams
95c67cbfbd Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Sam
1ee7cc4760 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05:00
Sam
020e4acba4 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
Monty Marz
3b01a888da Revert "Added TR translations for deaths by debuffs." 
This reverts commit 0817e45e131b70dbd7ef8bee768ccc377301b5d7.
 2021-01-20 11:20:06 +00:00
Sam
1453e964a6 Players should no longer reward exp on being killed. 2021-01-19 15:27:56 -05:00
Sarra Kitty
f332bf4ceb Sarrakitty/rotsys item sprites 2021-01-19 18:23:44 +00:00
Samuel Keiffer
f96489b66a 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
88a8814fe7 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
467ed6d7d3 Skills are now factored into combat rating. New formula for exp scaling per SP. 
Adjust lvl up msg fade

Add female humanoid names WIP

Changed text formatting when skill is max level. Added message to show you have 0 skill points available.

Addressed a lot of comments.

various changes to UI

- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon

Exp reward tweaks.

Fixed flamethrower range skill description.
 2021-01-19 08:08:26 -05:00
jshipsey
2866091d7b keyframed axe spin 
Fixed error in converting FK to entity_id from character_id.

Giant match statements in persistence.

Tweaked roll.

Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
 2021-01-19 08:08:18 -05:00
Monty
decef1d1a4 adjusted potions, refined level up message animation 
fixed incorrect translation used on axe double strike regen skill

Changed migration so that skills and skill groups foreign key to entity_id instead of character_id
 2021-01-19 08:08:14 -05:00
jiminycrick
92b72d94ba Humanoid skill config and AI skill check 
updated axe skill with correct icons
 2021-01-19 08:08:05 -05:00