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
3,880 Commits 151 Branches 18 Tags 2.1 GiB
19a0ffb673
Commit Graph

1071 Commits

Author SHA1 Message Date
AdamWhitehurst
0c4d428298 remove unnecessary line 2020-04-01 07:10:35 -07:00
AdamWhitehurst
e04fdd715e expose and use blocking consts 2020-04-01 07:07:10 -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
56fab6db09 Roll duration 500 -> 700ms 2020-04-01 06:24:02 -07:00
AdamWhitehurst
89f441ae2c Roll speed 15.0 -> 25.0 2020-04-01 06:23:26 -07:00
Imbris
b3791a2b4e Upgrade vek version so that it actually uses the patch 2020-03-30 19:44:51 -04: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
d3b5b1e637 Remove None variant fromm armor types 2020-03-28 03:51:24 -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
ce0f54e9d6 Combine dir and force in KnockUp and ApplyForce events 2020-03-27 22:19:23 -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
02b29efbfc Undo mistake, axe ability corrected. 
Axe m2 cost 0 -> 100
Axe m2 dmg 8 -> 12
 2020-03-27 11:07:21 -07:00
AdamWhitehurst
233595737e Axe m2 dmg 10 -> 15 
Axe m2 cost 0 -> 50
 2020-03-27 11:03:07 -07:00
AdamWhitehurst
d774091fa4 Add triple_strike anims for axe and hammer 2020-03-27 11:00:58 -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
Pfauenauge90
0b3fb2dd3c fire bolt visuals 2020-03-27 18:31:45 +01:00
timokoesters
6fe5c5724c Fix char selection not showing tools 2020-03-27 18:17:41 +01:00
timokoesters
ad0314b4f5 Projectile hits regenerate energy 2020-03-27 17:07:19 +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
Marli Frost
3c36862f42
fix: connect to LOCALHOST address in tests 
Windows doesn't allow us to connect to the Any (0.0.0.0) address,
instead returning the WSAEADDRNOTAVAIL error code.

https://docs.microsoft.com/en-us/windows/win32/winsock/windows-sockets-error-codes-2
 2020-03-27 10:50:45 +00:00
Shane Handley
362771be4b SFX and unit test fixes. 2020-03-27 12:06:25 +11:00
timokoesters
7a9c7628db Fix triplestrike bug 2020-03-26 23:29:12 +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
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
Shane Handley
0446a56f00 Regen energy when sitting. 2020-03-26 18:23:57 +11: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
timokoesters
74eacbe27c fix "Npcs can't be healed anymore" 2020-03-25 22:57:14 +01:00
Pfauenauge90
8b05dda1d9 assset cleanup, transparency, new icons 2020-03-25 16:47:48 +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
Adam Whitehurst
37ec191021 update controller tick fn 2020-03-25 01:38:25 -04:00
Imbris
2897e898c2 move character state component to section reflecting its current sync strategy 2020-03-25 01:37:56 -04:00
timokoesters
7f02f5e7d2 Npcs can't be healed anymore 2020-03-24 23:03:57 +01: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
Pfauenauge90
060ebbc861 healing sceptre 2020-03-24 01:11:14 +01:00
timokoesters
43d4e8aad2 Better inventory counter 2020-03-24 00:38:00 +01:00
timokoesters
1c145e8d3a Add inventory counter 2020-03-24 00:23:21 +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
timokoesters
fb16106960 Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +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
Pfauenauge90
387ab4a57e added new stuff to chests 2020-03-22 16:19:30 +01:00
Pfauenauge90
662f5b1037 removed warnings and item test values 2020-03-22 14:55:08 +01:00
Pfauenauge90
61e2a986f2 item images 2020-03-22 14:38:21 +01:00
Adam Whitehurst
5016b8da3a consistent naming 2020-03-22 05:49:48 -07:00
Adam Whitehurst
db8d89a4d9 * rename CharacterState equals() -> same_variant() 2020-03-22 05:46:09 -07:00
Adam Whitehurst
afa6e43dd5 * remove Component Trait from CharacterAbility 2020-03-22 05:45:39 -07:00
Imbris
41c424ac13 Optimized uses of emitters, cleanup 2020-03-22 00:49:46 -04:00
Pfauenauge
f6731dc770 cloth armor 2020-03-22 00:21:11 +01:00
Adam Whitehurst
366978f16e remove CharacterAbility ecs component sync 2020-03-21 16:04:45 -07:00
Adam Whitehurst
68ae715a9e Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-21 15:55:23 -07:00
Adam Whitehurst
862efb147c clean up based on pr review comment 2020-03-21 15:55:20 -07:00
Imbris
f399085974 Flip models for hands, shoulders, and feet of humanoids 2020-03-21 18:48:21 -04: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
timokoesters
5361705ca7 fix sfx 2020-03-21 21:01:50 +01: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
44ec09a8e7 Go to idle state when picking items up 2020-03-20 20:23:04 +01: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
timokoesters
835f3f5fe3 Arrows shouldn't turn into loot, staff shoots fireballs again 2020-03-20 11:25:53 +01:00
Pfauenauge90
6094e4b017 added chest drops 2020-03-20 01:11:02 +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
Pfauenauge90
3a55ae5848 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-19 22:36:45 +01:00
Pfauenauge90
3145b26cd6 item images 2020-03-19 22:36:40 +01:00
timokoesters
208245e82e Make orientation not dependend on camera dir while wielded 2020-03-19 22:03:17 +01:00
Pfauenauge90
ce5eb2e2ab Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-19 19:34:05 +01:00
Pfauenauge90
3c0e070ed0 stack numbers 2020-03-19 19:33:59 +01:00
timokoesters
83be1226ef Set dash direction based on look_dir 2020-03-19 18:33:10 +01:00
timokoesters
bb1b3ceabc Fix syncing amount 2020-03-19 17:44:32 +01:00
timokoesters
22652cfa37 Restore old boost stick behavior 2020-03-19 17:01:58 +01:00
timokoesters
449ae22730 Add inventory stacking 2020-03-19 14:32:17 +01:00
Pfauenauge90
d863e12235 swift leather armour parts 2020-03-19 14:17:53 +01:00
Pfauenauge90
509615c15b npc armour 2020-03-18 23:09:58 +01:00
Imbris
1a484410ca Delete Vel and Ori on the client when they are removed on the server 2020-03-18 17:01:51 -04:00
Pfauenauge90
4d9327cef5 2 weapons 2020-03-18 21:05:20 +01:00
timokoesters
4741e41230 Add support for different models per weapon type 2020-03-17 18:28:07 +01:00
Joshua Barretto
95eeb7e145 Omitted unnecessary test 2020-03-17 16:37:39 +00:00
Pfauenauge90
40910b28e4 unclothed parts 2020-03-17 15:39:29 +01:00
Joshua Barretto
4580752e78 Fixed remaining pathfinding issues 2020-03-17 14:14:20 +00: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
b040e18246 Fix body parts not changing 2020-03-16 22:06:23 +01:00
timokoesters
b3057add42 Smaller damage and health numbers 2020-03-16 19:55:12 +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
timokoesters
1f78344d6f Move equipment from loadout into body 2020-03-15 19:44:47 +01:00
Pfauenauge90
bf1c46d596 item images 2020-03-15 16:42:09 +01:00
Pfauenauge90
913393963a plate armour 2020-03-15 16:42:09 +01:00
Joshua Barretto
e20feeeb0c Added armour items and equipping of armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
e80750bc53 plate chest armour 2020-03-15 15:53:51 +01:00
Pfauenauge90
5a962771d9 assassin armour 2020-03-15 15:53:51 +01:00
timokoesters
4e281e22b7 Merge branch 'clientstates' of gitlab.com:veloren/veloren into clientstates 2020-03-15 15:43:52 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +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
AdamWhitehurst
52059d83d3 add knockback localevent 2020-03-15 07:20:42 -06:00
Songtronix
e72f0c6d12 fix: do not depend on hash file during runtime 2020-03-15 09:02:56 +01: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
Adam Whitehurst
00e4ad61f7 add ToolData::get_primary_abilities() 2020-03-12 07:47:27 -07:00
Adam Whitehurst
68dd8c578f Add some ability costs 2020-03-12 07:36:02 -07:00
Adam Whitehurst
990ea5c5a2 Add triple_strike behavior to cs behavior sys 2020-03-12 07:34:24 -07:00
Adam Whitehurst
772f7ff92d Remove can_transition and begin triple_strike 2020-03-12 07:33:19 -07:00
Adam Whitehurst
3cb288bc8c Add TripleStrike 2020-03-12 07:25:06 -07:00
Adam Whitehurst
a64bf1ac60 TripleAttack -> TimedCombo 
(it wasnt the right logic for the tiple attack)
 2020-03-12 05:16:40 -07:00
S Handley
bc692c0101 Add audio and chat message feedback when the player attempts to collect something while thier inventory is full. 2020-03-11 10:30:59 +00:00