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
5,147 Commits 151 Branches 18 Tags 2.1 GiB
744843d03f
Commit Graph

185 Commits

Author SHA1 Message Date
Joshua Barretto
f77d2f06c6 Fixed staff RMB, bug in ranged weapon code 2020-07-06 23:37:44 +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
Samuel Keiffer
85d1d4b3ff Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap. 2020-07-03 15:40:12 +00: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
Ben Wallis
de37de7f45 Initial clippy fixes as discussed in #587 2020-06-08 21:27:51 +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
83c7a944da fmt 2020-04-01 11:52:44 -04:00
AdamWhitehurst
1ea2abd247 better timing const name, 
timing_delay 400 -> 350
 2020-04-01 08:40:25 -07:00
AdamWhitehurst
2b10797db1 refactor transition logic (thx imbris) 2020-04-01 08:39:18 -07: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
AdamWhitehurst
0c4d428298 remove unnecessary line 2020-04-01 07:10:35 -07:00
AdamWhitehurst
237393993f triple_strike combo timing window 600 -> 400 2020-04-01 06:43:28 -07:00
AdamWhitehurst
95bc486f7c Roll move_dir handling 1.5 -> 0.25 2020-04-01 06:42:56 -07:00
AdamWhitehurst
89f441ae2c Roll speed 15.0 -> 25.0 2020-04-01 06:23:26 -07:00
AdamWhitehurst
dcc9d44b1c remove unused timed_combo 2020-03-29 13:40:03 -07:00
AdamWhitehurst
86b0b8f644 triple_strike orientation 2020-03-28 13:50:42 -07: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
Imbris
df5a7ef0e3 split toggle events 2020-03-27 21:32:30 -04:00
AdamWhitehurst
1d51f8fc0f prevent transition if pressing too early & timed 2020-03-27 11:17:34 -07:00
AdamWhitehurst
e4f2bf7ebf prevent holding to time combo 2020-03-27 11:08:10 -07:00
AdamWhitehurst
8eb233bdbc Add timing window duration to triple strike 2020-03-27 10:43:18 -07:00
AdamWhitehurst
01264ce167 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 10:40:19 -07:00
AdamWhitehurst
2ffac59aa3 add triple strike timing 2020-03-27 10:40:15 -07:00
timokoesters
c6e635c511 Increase movement speed, make npcs slower than players 2020-03-27 18:39:26 +01:00
timokoesters
6fe5c5724c Fix char selection not showing tools 2020-03-27 18:17:41 +01:00
AdamWhitehurst
4bfc934772 triples strike knockback 15.0 -> 16.0 2020-03-27 08:26:53 -07:00
AdamWhitehurst
31760d220a triple_strike knockback 20.0 -> 15.0 2020-03-27 08:17:17 -07:00
AdamWhitehurst
c1647e93f1 make triple strike continue without hits again 2020-03-27 07:03:26 -07: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
e573fbbce5 Better glider physics 2020-03-26 22:56:33 +01:00
timokoesters
b9c85b9beb Balancing 2020-03-26 22:56:33 +01:00
AdamWhitehurst
8d1f93a2d1 ore responsive oreintating 2020-03-26 14:48:51 -07:00
AdamWhitehurst
7f1a90ae27 Prevent transition if failed hit 2020-03-26 14:44:39 -07:00
Imbris
e6f50b4032 Replace uses of normalized() to avoid setting ori to NaN values, tweak triple strike code 2020-03-25 18:49:15 -04: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
3889ec7292 climbing tweaks, fix triple strike overflow, fix Last<CharacterState> 
not registered
 2020-03-25 02:05:28 -04:00
Imbris
6ba158b7e1 Input handling changes 2020-03-25 01:38:37 -04:00
timokoesters
2117bb05d0 Healing staff 2020-03-24 22:03:11 +01:00
timokoesters
f0ce088810 Add lights and gravity again 2020-03-24 20:31:54 +01:00
timokoesters
58585e0810 Better climbing, fireball impl 2020-03-24 20:09:23 +01:00
timokoesters
ea2500e7ab Add minimum prepare duration to fireball and bow 2020-03-24 14:42:31 +01:00
timokoesters
99e7e1f785 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00
timokoesters
fbb24e7c8a Even better fireballs 2020-03-23 22:52:35 +01:00
timokoesters
0eebf945fe Glowing fireballs, no gravity 2020-03-23 13:55:52 +01:00
timokoesters
5194cef03a Easier swimming, better damage calculation for explosions 2020-03-23 12:50:08 +01:00
Adam Whitehurst
68e3e36c6a Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 12:50:55 -07:00
Adam Whitehurst
a510283277 update triple_strike 2020-03-22 12:50:52 -07:00
timokoesters
f3ca06aa71 feat: fireball explosions 2020-03-22 20:40:16 +01:00
timokoesters
0456d3cbed Better staff M1, random +1 damage, better attackrange,angle impl 2020-03-22 16:26:32 +01:00
Adam Whitehurst
862efb147c clean up based on pr review comment 2020-03-21 15:55:20 -07:00
Adam Whitehurst
b96d71a8c7 Reset vel on triple_strike 2020-03-21 15:06:42 -07:00
Adam Whitehurst
c5378b7065 Better triple_strike handling 2020-03-21 14:55:04 -07:00
Adam Whitehurst
819c2767bc * move swap loadout to handle_swap_loadout util fn 
* impl From<JoinData> for StateUpdate
 2020-03-21 14:16:26 -07:00
Adam Whitehurst
3ae2b8de2e Remove excess code 2020-03-21 10:32:32 -07:00
Adam Whitehurst
180ec89060 add SwapLoadout 2020-03-21 10:26:38 -07:00
Adam Whitehurst
7eaf6f664b Fix water swimming jump velocity 2020-03-21 09:45:26 -07:00
Adam Whitehurst
79de60d791 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-21 07:08:14 -07:00
Adam Whitehurst
cb04df7736 swim now uses handle_orientation fn 2020-03-21 07:06:35 -07:00
Imbris
08db424169 Add safe_slerp function that ensures that slerping returns non-NaN normalized values 2020-03-21 00:53:41 -04:00
Adam Whitehurst
ae175e57f3 Tweaking consts 2020-03-20 15:20:14 -07:00
Adam Whitehurst
0cdb80427d better triple_strike 2020-03-20 15:03:29 -07:00
timokoesters
df858cb370 Remove all warnings 2020-03-20 15:45:36 +01:00
timokoesters
3ec2cc08b3 Experimental tweeks to triplestrike 2020-03-20 15:06:33 +01:00
timokoesters
c630df7f9a Ranged weapons now give xp on kill and also make enemies angry 2020-03-20 14:26:18 +01:00
Adam Whitehurst
bb76cc37bd Oops 2020-03-19 16:14:04 -07:00
Adam Whitehurst
0b7a572178 update triple_strike 2020-03-19 15:40:03 -07:00
timokoesters
208245e82e Make orientation not dependend on camera dir while wielded 2020-03-19 22:03:17 +01:00
timokoesters
83be1226ef Set dash direction based on look_dir 2020-03-19 18:33:10 +01:00
timokoesters
22652cfa37 Restore old boost stick behavior 2020-03-19 17:01:58 +01:00
timokoesters
19a09782a0 Add ability requirements system 2020-03-17 15:01:41 +01:00
timokoesters
f32eb1db75 fix dash attack angles, arrow damage and readd possession stick impl 2020-03-17 14:15:39 +01:00
timokoesters
d5db1f6ca0 Add dash ability to sword M2 2020-03-16 16:34:53 +01:00
timokoesters
81591fcaf7 Make npcs attack again 2020-03-16 14:27:52 +01:00
timokoesters
1279f70184 Add shield item 2020-03-16 13:40:14 +01:00
timokoesters
4195273cf9 Adjust first person camera and underwater wield orientation 2020-03-16 13:19:51 +01:00
timokoesters
87acc01d48 Readd ranged and debug boost. Add bouncing while running in first person 2020-03-16 12:32:57 +01:00
Joshua Barretto
e20feeeb0c Added armour items and equipping of armour 2020-03-15 16:42:09 +01:00
AdamWhitehurst
6078b9a468 Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates 2020-03-15 08:24:40 -06:00
timokoesters
447617dc69 Make durations and damage depend on weapon type 2020-03-15 14:34:17 +01:00
AdamWhitehurst
7520798567 Damage increase, remove lines 2020-03-15 07:26:42 -06:00
timokoesters
598a4c6cbb Add loadout struct for info on weapon configurations 2020-03-14 22:33:20 +01:00
AdamWhitehurst
7dfe00b674 Finish state struct data refactor 2020-03-14 15:17:27 -06:00
AdamWhitehurst
ee706fa32a Tweaking timed_combo 2020-03-14 13:04:04 -06:00
AdamWhitehurst
6fc94c22ba Update timed combo, add CharacerBehavior trait 2020-03-14 12:50:07 -06:00
timokoesters
fe19698d52 Make abilities depend on weapon 2020-03-14 16:40:29 +01:00
Adam Whitehurst
ac1c279a9b Begin TripleStrike Logic 2020-03-12 08:22:42 -07:00