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
10,046 Commits 151 Branches 18 Tags 2.1 GiB
43e743c2bc
Commit Graph

298 Commits

Author SHA1 Message Date
Joshua Barretto
6add95bd5c Fixed block-snapping, climbing and airship takeoff 2021-03-14 23:21:44 -04:00
Joshua Barretto
29b93d791b Made level flight work 2021-03-14 23:20:48 -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
8247c136bc Prevented jumping airships 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
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
3496c356e2 More relative motion changes 2021-03-14 23:14:26 -04:00
Joshua Barretto
e59b68c262 Mountable airships 2021-03-14 23:14:25 -04:00
Joshua Barretto
f4b3d8145b Smooth airship movement 2021-03-14 23:14:21 -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
8b9e84972a Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-14 23:09:49 -04:00
Marcel
5570b57282 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
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
be27289a7f Inputs remain in queue while active, allowing interrupts and queued inputs to be more cleanly handled 2021-03-14 17:26:54 -04:00
Sam
b5d501199d Secondary input now fully functional 2021-03-14 17:26:53 -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
Snowram
9d7e8957bb Add new npcs 2021-03-14 14:24:35 +01:00
Avi Weinstock
d8f0a1c426 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05: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
Sam
d818ea2f1d Fixes being stuck in roll when interrupting combo melee. 2021-02-28 08:50:33 -05:00
Sam
b25a376995 Re-allowed for what stage you were on to persist through a roll 2021-02-27 19:24:18 -05:00
Sam
404c7f0905 Combo melee now checks combo 2021-02-27 18:24:28 -05:00
jshipsey
8d316aac8c feedback adjustments 2021-02-27 01:42:47 -05:00
jshipsey
51bc74b2a5 visual weapon variation, adjust minotaur dash, keyframed golem quake 2021-02-27 01:42:47 -05:00
jshipsey
16a44cd532 minotaur moves, added claygolem 2021-02-27 01:42:47 -05:00
jshipsey
79ec9115f5 rebase, yeti in dungeon 2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507 initial balance 2021-02-27 01:42:47 -05:00
Snowram
1b9815dc34 Adds 3 new npcs, tusk ram new design 2021-02-27 01:42:46 -05:00
jshipsey
cb59c8017e anim tweaks, more loadout setup 2021-02-27 01:42:46 -05:00
jshipsey
ca3248cc93 new dungeon setups, new npcs, weapon specific loadouts, anims 2021-02-27 01:42:45 -05:00
unknown
559ece5ede More npcs work 2021-02-27 01:42:45 -05:00
unknown
6f18d16aa2 Add new quadmeds npcs with rough offsets 2021-02-27 01:42:44 -05:00
jshipsey
266986626d biped_small setup 2021-02-27 01:42:43 -05: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
Snowram
4078eeb877 Various fixes to object animation, cleanup 2021-02-21 19:56:46 +01:00
Snowram
775224983b Initial turret implementation 2021-02-21 18:23:54 +01:00
Avi Weinstock
8bdbf4f7c9 Implement modular weapons. 
- Add ItemKind::ModularComponent, Item::components.
- Add tool::StatKind::{Direct,Modular} for the modular weapons themselves.
- Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account.
- Crafting stores into the components field.
- Components/recipes/placeholders are created dynamically.
- Show which components a modular weapon contains in the tooltip in voxygen.

Squashed fixes:
- `Item::duplicate` components in `Item::new_from_item_def`.
- Speed of 1.0 for now.
 2021-02-20 14:30:39 -05:00
Sam
d5ccc33abc Factored out duplicate code into closures, consolidated ability handling logic to a single function. 2021-02-19 18:45:48 -05:00
Sam
411b4083b1 Added 1h hammers. 
Fixed audio tests.
 2021-02-19 17:30:24 -05:00
Sam
18309fe4c6 Added AbilityInfo struct to attack states 2021-02-19 17:30:24 -05:00
Sam
8f0cca074d Dual wielding now uses skillbar abilities from multiple weapons. 2021-02-19 17:30:22 -05:00
Sam
6f6a37faf2 Wielding a 1 handed weapon now correctly uses abilities when the second weapon is not also a 1 handed weapon. 2021-02-19 17:30:22 -05:00
Sam
f50fa25467 ItemConfig now stores AbilitySet directly instead of each individual ability. 2021-02-19 17:30:21 -05:00
Sam
582c3f8459 Check for prerequisite skill in using an ability is no longer hardcoded. 2021-02-19 17:30:21 -05:00
Sam
d4f509b3d0 Added hands field onto weapons. 2021-02-19 17:30:20 -05:00
Joshua Barretto
4d19308612 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
Sam
1c83c5ee6f 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
f026aeb2dc Server events directly emitted in states now. 2021-02-08 12:01:48 -05:00
Sam
6a1e583d45 Eradicated clones 2021-02-08 12:01:48 -05:00
Sam
8eebcdfcd2 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
Ludvig Böklin
a1ff9ab83f Redefine Ori as a quaternion 2021-02-05 09:33:14 +01:00
James Melkonian
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
Sam
eaa41c7dea 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
5d1993009f 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
jiminycrick
3d44ac2c35 Humanoid skill config and AI skill check 
updated axe skill with correct icons
 2021-01-19 08:08:05 -05:00
Sam
48c98b11cf General combat skill tree. 
UI for general skill tree
 2021-01-19 08:07:20 -05:00
Sam
5c7705f874 Staff skill tree. 2021-01-19 08:07:03 -05:00
Sam
662a08defc Implemented bow skill tree. 2021-01-19 08:07:02 -05:00
Sam
4dfe14c103 Hammer skill tree complete. 2021-01-19 08:07:02 -05:00
Sam
72604e8a4e Axe skill tree functional. 2021-01-19 08:07:01 -05:00
Sam
cc60ca58be Added sword skill tree 2021-01-19 08:06:59 -05: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
Ludvig Böklin
8f9db19a4a Glider mid-air deploy and gliding energy-cost 2020-12-18 19:16:06 +01:00
Marcel Märtens
ccb01e1898 adjust fmt and clippy after toolchain upgrade 2020-12-10 14:53:01 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01: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
332a636647 You can now leap in directions other than forward with repeater ranged again. 2020-11-26 18:23:15 -06:00
Sam
33e4448542 Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work 
balance

Lavadrake AI tweaks

feedback tweaks
 2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jiminycrick
1337fdaa57 Generalize rotation time 2020-11-24 17:48:49 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jshipsey
c07d8df58b assigning weapons, building animations 
ability mapping
 2020-11-24 17:48:43 -06:00
Joshua Barretto
26fd40c0e3 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Joshua Barretto
71b7e1ef90 Better non-climbing NPC pathfinding in rivers 2020-11-23 10:45:01 +00:00
Joshua Barretto
22fb71905b Added rtsim entities moving when unloaded, better generation 2020-11-23 10:45:01 +00:00
Sam
c00720fb44 Swapped bool values, only_roll changed to attack_interrupts. 2020-11-20 11:54:56 -06:00
Sam
e62960e75d Rolling can now interrupt any attack. 2020-11-20 11:30:48 -06:00
Knarkzel
917ae5a0b5 added persist combo counter on roll when mid-combo 2020-11-15 23:08:14 +01:00
AlKabir
77f3c7e3c5 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
b2ec207979 Revert "Removed toolCategory" 
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
 2020-11-06 15:33:20 +00:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
ubruntu
8c1e1fdc5c Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance 2020-11-03 04:09:38 +00:00
Sam
1a8cf33a60 Transitioned forced movement to an enum. 2020-10-28 18:15:27 -05:00
Sam
63011241ea Added keyframes to all states that were lacking them. 2020-10-28 18:15:23 -05:00
Sam
e6684009c2 Made ability key not hardcoded in tool.rs. 2020-10-15 20:05:58 -05:00
Sam
7ef73f5981 Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second. 2020-10-14 20:56:22 -05:00
jiminycrick
691acd730d Smoother leap and recovery leap handling 2020-10-14 12:50:33 -07:00
jshipsey
22d8792c4b adjustments to chargedmelee, repeater 2020-10-14 12:50:33 -07:00
jshipsey
521ffd64ba cleanup 2020-10-14 12:50:33 -07:00
jshipsey
28eb58ddfa anims 2020-10-14 12:50:33 -07:00
Sam
7e0cc2d8e5 Added keyframes to repeater ranged. 2020-10-14 12:50:33 -07:00
Monty Marz
2b800a2b63 make clippy happy 
Delete glider.ron
 2020-10-07 02:23:20 +00:00
Sam
56d2afc0dc Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
b4018e7d42 Made 3rd ability interruptible. Final balance tweaks. 2020-09-21 17:40:16 -05:00
Sam
fe70b7fbce Addressed second round of feedback. 2020-09-21 17:38:53 -05:00
Sam
b06ab250cc Addressed first round of feedback on sword overhaul. 2020-09-21 17:38:52 -05:00
Sam
04af75bf8d Initial implementation of new dash melee. 2020-09-21 17:38:48 -05:00
Sam
abcd0af1e3 Removed combo duration of combo melee (combo now activated from recover duration). Allowed for forced forward movement in combo melee, and added it to stages 1 and 3). 2020-09-21 17:38:47 -05:00
Snowram
62f6a5799a Initial quadmed feed animation 2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072 species specific improvement 2020-09-17 22:32:10 -04:00
jshipsey
b781a1765b theropod run 2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
jshipsey
ecae71c016 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
412495e5fc assets/manifests 2020-09-17 22:18:49 -04:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation 
* Added migrations for entity ID changes to existing tables
 2020-09-17 23:02:14 +00:00
Joshua Barretto
50a85853e3 Fmt and clippy lints fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
6992194ad4 Better surface swimming, no underwater sprites 2020-08-12 21:15:53 +01:00
jshipsey
9ff5c23cf0 readd sneak 2020-08-08 13:47:32 -04:00
Imbris
c2f3e1b47f Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
BottledByte
34c87d7a86 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
dc91209a7b Removed fine-grained Item enums and replaced them with Strings 
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
 2020-08-02 01:21:32 +00:00
jshipsey
487131efb8 cyclops run anim 2020-08-01 02:19:45 -04:00
jshipsey
5d2be2240e maneater and feed anim 2020-08-01 02:19:45 -04:00
jshipsey
baf67f303e new models, anim tweaks 2020-08-01 02:19:44 -04:00
Joshua Barretto
cf69d0c5d8 Added minimap compass 2020-07-10 15:00:20 +01:00
Joshua Barretto
e626f6255f Prevented pet damage 2020-07-07 01:01:39 +01:00
Joshua Barretto
64dc339f13 Reduced acceleration in air 2020-07-06 20:51:57 +01:00
Imbris
c2d6d00b00 point to github specs to access PairedStorage type, fix Loadout sync spam 2020-07-06 01:56:02 -04:00
Joshua Barretto
8508b5177b Velocity-corrected bezier pathfinding control, swimming control 2020-07-05 09:38:15 -04:00
Joshua Barretto
8a0b7fd173 Smoother pathfinding for fast animals 2020-07-05 09:38:14 -04:00
Joshua Barretto
177bd7a128 More tolerant pathfinding 2020-07-05 09:38:14 -04:00
Joshua Barretto
db26c10299 Run tilting, per-species running speed 2020-07-05 09:38:14 -04:00
scott-c
d53b51954b Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Justin Shipsey
2f896849d4 Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding 2020-06-16 21:32:39 +00:00
scott-c
8bcafa6f19 automatically wield on secondary or ability3 2020-06-15 18:12:30 +08:00
Ben Wallis
950c62efc6 Suppressed all existing clippy warnings in preparation for fixes as part of #587 2020-06-10 22:01:42 +01:00
Justin Shipsey
ea07d744a7 orientation animation 2020-05-27 06:41:55 +00:00
Imbris
81227b917f fix leaning 2020-05-11 00:53:37 -04:00
Justin Shipsey
6fa13bcb7e body/anim tweaks 2020-04-26 01:09:03 +00:00
Imbris
a73d010f7b Point to newly released vek, add todo to reconsider empty item, remove uneeded ori slerp, remove agent from character behavior, add todos to combat sys, check if entities still exist before possessing & if possessed entity has a loadout move the active item into the second item space 2020-04-01 11:15:14 -04:00
Imbris
f551c4a2c5 Move armor types to a new location, use a const for the moving cutoff in voxygen anims 2020-03-28 01:52:12 -04:00
Imbris
ba3fa16c33 Create Dir type for better enforcement of non NaN, normalized representations of directions 2020-03-27 22:02:07 -04:00
timokoesters
c6e635c511 Increase movement speed, make npcs slower than players 2020-03-27 18:39:26 +01:00
timokoesters
2b68adff51 Balancing, make fireball not holdable, arrow knockback 2020-03-26 22:56:33 +01:00
timokoesters
8010e5afb4 Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants 2020-03-26 22:56:33 +01:00
timokoesters
b9c85b9beb Balancing 2020-03-26 22:56:33 +01:00
timokoesters
ae0a3076e3 Allow holding ability keys again 2020-03-25 23:10:50 +01:00
AdamWhitehurst
964256541e batter loadout swap logic 2020-03-25 07:58:26 -07:00
AdamWhitehurst
857652ee23 Update triple_strike: 
* add knockback
* prevent infinite repeat
* more dashes
 2020-03-25 07:24:55 -07:00
Imbris
6ba158b7e1 Input handling changes 2020-03-25 01:38:37 -04:00
timokoesters
99e7e1f785 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00