Commit Graph

2527 Commits

Author SHA1 Message Date
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master'
wyverns

See merge request veloren/veloren!3720
2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Ellen Sun
d774319cf0 cleanup and fixes + added change to CHANGELOG.md 2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094 move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command 2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3 added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help 2023-01-27 20:31:56 -05:00
Joseph Donofry
74ee861dde Add glow to dropped lanterns 2023-01-23 16:13:43 +00:00
Avi Weinstock
060b8cc0ec Decrease the duration of potion sickness to 45 seconds. Make agents more averse to incurring further stacks of potion sickness, and give villagers iced tea. 2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
Nils Ascheuer
43b61ea6d9 #1725 do not clear target during trading. 2023-01-18 08:15:13 +01:00
James Melkonian
9d31baf500 Make bats easier to combat and fix hitbox scaling bug 2023-01-15 16:25:43 -08:00
flo
650ef9a5e2 autodelete of summoned sprites 2023-01-15 18:28:38 +00:00
Sam
4f26e37ae6 Addressed review 2023-01-09 20:18:31 -05:00
Sam
7d42c45fdd Site2 code is now hot-reloadable with 'hot-site2' feature. 2023-01-09 20:06:35 -05:00
Marcel Märtens
25906e05df Change the version number to 0.14 2023-01-06 18:41:03 +01:00
Tine Jozelj
e77537365f Fixes #1563 - Implements Quad Med Hoof tactic/attack 2022-12-13 21:16:48 +01:00
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
Marcel Märtens
225cbf472f update tag and fix empty maps, other bugs introduced by auto fix 2022-11-29 09:19:10 +01:00
Marcel Märtens
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
holychowders
dc9074ae6b Revert "[REVERT ME] Display debug information for code reviewers."
This reverts commit bae5c5b675.
2022-11-20 15:51:09 -06:00
holychowders
23dd1d1be3 MVP for searching target's last known position. 2022-11-20 02:36:11 -06:00
holychowders
1331b046b5 Rename mouthful variable. 2022-11-17 19:21:22 -06:00
holychowders
2c745bed30 Update target's last known position.
Before, it was set only upon targeting.
2022-11-16 20:54:32 -06:00
holychowders
bae5c5b675 [REVERT ME] Display debug information for code reviewers. 2022-11-16 20:12:14 -06:00
holychowders
61aa49fa66 Add last_known_pos to Target struct. 2022-11-16 18:26:07 -06:00
Marcel
997c5a4e61 Merge branch 'ythern/more_unique_abilities' into 'master'
Ythern/roshwalr kit

See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Christof Petig
24aac2d92f Merge branch 'floppy_savannahpit_merchants' into 'master'
add merchants to savannah pits

See merge request veloren/veloren!3690
2022-11-13 19:14:27 +00:00
flo
6d8f2c8c7b add merchants to savannah pits 2022-11-13 19:14:26 +00:00
Eternalisime
19fb2e6416 fixed format 2022-11-13 11:45:03 +01:00
Eternalisime
8aa4f782f4 added a space 2022-11-13 11:27:17 +01:00
Samuel Keiffer
1173c8257f Merge branch 'holychowders/agent_awareness2' into 'master'
Rework internal representation of agent awareness

See merge request veloren/veloren!3661
2022-11-12 18:48:32 +00:00
holychowders
95fd092e26 Fix awareness changes. 2022-11-12 12:12:32 -06:00
Eternalisime
ed25a84c72 combat: tweaked roshwalr melee detection and range 2022-11-12 13:51:27 +01:00
Eternalisime
13980861f8 combat: tweaked roshwalr AI 2022-11-11 16:37:58 +01:00
Marcel
7a75b72aa3 Merge branch 'KingPEPSALT/improve_time_command' into 'master'
FIX #1622, /time command will not allow time going backwards as rtsim cannot...

See merge request veloren/veloren!3570
2022-11-11 10:30:44 +00:00
Monty Marz
a763a865fe Musical Instruments part 2 2022-11-10 20:59:53 +00:00
pepsalt
5294603431 changed {:?}s to {}s in format strings 2022-11-10 17:18:59 +01:00
pepsalt
3e580138df FIX #1622, /time command will not allow time going backwards as rtsim cannot handle time regression, time given in seconds is treated as if it were seconds ahead of the next midnight 2022-11-10 17:06:53 +01:00
Eternalisime
e1e78a914f combat: added angle condition on shockwave 2022-11-10 14:24:06 +01:00
Eternalisime
918d5eb345 combat: added a unique kit to roshwalr 2022-11-10 13:53:12 +01:00
holychowders
571b07d54a Remove dt and multiplication by 30. 2022-11-06 13:10:17 -06:00
Avi Weinstock
f83afcd5a8 Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt. 2022-10-29 14:50:52 -04:00
Avi Weinstock
372ffe45d7 Add command for debugging ways. 2022-10-29 14:32:48 -04:00
holychowders
641a5c4cda Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2 2022-10-29 13:21:27 -05:00
Avi Weinstock
08a50afd9f Mostly working train tracks. 2022-10-28 21:36:42 -04:00
holychowders
3d4ad29d1d Flee if attacked even if attacker is not close. 2022-10-28 21:31:49 +00:00
holychowders
3f3f8605af Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2 2022-10-28 15:16:44 -05:00
holychowders
4426972057 Refer to the fully aware state of an agent as "alert". 2022-10-28 15:03:11 -05:00
Sam
7022350693 Sword AI now randomly rolls again 2022-10-27 20:07:11 -04:00
Sam
d60839010a Rebase commit 2022-10-27 20:07:10 -04:00
Sam
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
b5682c4682 Addressed review comments 2022-10-27 20:07:09 -04:00
Sam
e1f76e0127 Fixed sword AI after contextualized sword abilities. 2022-10-27 20:07:08 -04:00
Sam
8cfe62e6dc Activated abilities can now be contextualized 2022-10-27 20:07:07 -04:00
Sam
38ce87d80b Initial balance pass on sword ability stats 2022-10-27 20:07:05 -04:00
Sam
eb67cc2cf7 Reaching stance AI 2022-10-27 20:07:04 -04:00
Sam
9b4dcbfdde Heavy stance AI 2022-10-27 20:07:04 -04:00
Sam
43a5a2a93a Parrying stance AI 2022-10-27 20:07:03 -04:00
Sam
df9ef691fd Cleaving stance AI 2022-10-27 20:07:03 -04:00
Sam
5358016ba0 Crippling stance AI 2022-10-27 20:07:02 -04:00
Sam
c7d3aa19e4 Mobility stance AI 2022-10-27 20:07:02 -04:00
Sam
c97bfdfb94 Defensive stance AI 2022-10-27 20:07:01 -04:00
Sam
7dcb3582e6 Sword AI for offensive abilities 2022-10-27 20:07:01 -04:00
Sam
4ab3abfc07 Balanced stance AI 2022-10-27 20:07:01 -04:00
Sam
221b0aff5f Sword AI can now choose their abilities 2022-10-27 20:07:00 -04:00
Sam
8d3567b6b2 Made combo melee more ergonomic to use when it is a stance 2022-10-27 20:06:59 -04:00
Sam
21aabb5663 Parries now correctly return to their stance. 2022-10-27 20:06:58 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed.
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
5d5fbde291 Minor tweaks 2022-10-27 20:06:36 -04:00
Sam
500e0ae3d0 Heavy abilities 2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6 Parrying abilities 2022-10-27 20:06:34 -04:00
Sam
ec03bd7032 Cleaving abilities 2022-10-27 20:06:33 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master'
Halloween event

See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
Timothy Finnegan
1922d69154 Ran Cargo fmt 2022-10-24 19:52:37 -07:00
flo666
9b1efe1bee clippy, fmt, remove leftover file, fix sitenames in soundtrack 2022-10-25 00:33:23 +02:00
Timothy Finnegan
498cb86be9 Updated enum names for consistency 2022-10-23 18:31:09 -07:00
Timothy Finnegan
5e5e1066eb Added support for multiple timers, conditions, and counters in a single action node. 2022-10-23 18:31:09 -07:00
James Melkonian
6bacb487f3 Bat AI 2022-10-23 20:05:39 +02:00
holychowders
65b6bf62f9 Revert "[REVERT THIS] Show awareness info via agent chat for code reviewers."
This reverts commit ed991b681ae56bcb414d24f773bc540dc390b5fa.
2022-10-21 20:25:55 -05:00
holychowders
1121cb5d3f [REVERT THIS] Show awareness info via agent chat for code reviewers. 2022-10-21 20:25:54 -05:00
holychowders
7502cd664a Have agents update awareness of targets.
This is preliminary and has no visible effect.
2022-10-21 20:25:54 -05:00
holychowders
bc20744cd3 Remove old unused awareness stuff. 2022-10-20 11:36:16 -05:00
Tavo Annus
fcd7447991 Fix npcs untargeting trade partner while in trade 2022-10-07 15:17:49 +03:00
Avi Weinstock
e6576f0cf3 Make the trading AI for pets only accept food. 2022-09-30 15:11:03 -04:00
Avi Weinstock
ff781198d3 Fix 18-slot pets (they now properly get inventories based on their body type, which is usually 1-slot).
Also fixes a related issue where pets lose their natural weapons/armour.
2022-09-30 14:51:49 -04:00
Avi Weinstock
60f5383f8b Address comments for MR 3633. 2022-09-30 14:51:49 -04:00
Avi Weinstock
c62bc0dd0d Allow pets to be traded with. 2022-09-30 14:51:49 -04:00
Marcel Märtens
cf6a764aa4 update toolchain to 2022-09-23 2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1 update toolchain to 2022-09-08
This reverts commit 6c9deee491.
This reverts commit a32b269252.
2022-09-24 00:04:40 +02:00
Marcel Märtens
29d0f5b25d update dependencies 2022-09-22 11:57:55 +02:00
Samuel Keiffer
59d8d287d9 Merge branch 'seachapel_npc_work' into 'master'
seachapel npc work

See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff Merge branch 'sharp/parallel-ingame' into 'master'
Parallelize ingame messages.

See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
1c14ec7ee1 Parallelize ingame messages. 2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90 Remove persistence loading error from SkillSet.
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server.  It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Samuel Keiffer
188db01a7b Merge branch 'sam/hot-agent' into 'master'
Agent combat tactics hot reloading

See merge request veloren/veloren!3629
2022-09-21 02:44:51 +00:00
Imbris
1b48a3008c Merge branch 'Couls/TestBed' into 'master'
Extend item pickup UI to group members

Closes #1402

See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55 Extend item pickup UI to group members 2022-09-20 22:13:50 +00:00
Sam
c228d9cc3f Addressed comments 2022-09-17 13:10:01 -04:00