1628 Commits

Author SHA1 Message Date
Marcel
c70183328a Merge branch 'imbris/648-cleanup' into 'master'
Make handling of shortcut keywords for commands clearer and revise a TODO...

Closes #648

See merge request veloren/veloren!2387
2021-06-07 10:27:54 +00:00
jshipsey
0c550516a1 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
1892554b21 comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
63f6f313d0 migration 2021-06-07 11:01:04 +02:00
jshipsey
287ec0ffe9 more loot tables, overworld ores, more items 2021-06-07 11:00:00 +02:00
jshipsey
ab09814bd9 cave changes 2021-06-07 10:59:44 +02:00
Sam
4b91bea700 Energy recovery stat functional. 2021-06-07 10:58:32 +02:00
jshipsey
edd9e447ff recipes, re-organization, cleanup 2021-06-07 10:58:05 +02:00
jshipsey
b55bc7b003 crafting item partial re-organization, armor recipes, some specific animal drops 2021-06-07 10:56:35 +02:00
jshipsey
6d2e3e6f8c more drops, armors 2021-06-07 10:56:16 +02:00
jshipsey
d0134ebf82 added some meat 2021-06-07 10:55:34 +02:00
Imbris
96b7f027e3 Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes 2021-06-06 23:45:51 -04:00
Marcel
3182724b66 Merge branch 'aweinstock/add-models-20210603' into 'master'
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.

See merge request veloren/veloren!2371
2021-06-06 16:56:21 +00:00
Sam
a73e7c78e0 Balance tweaks. 2021-06-05 17:15:04 -05:00
Sam
6d342537d6 Yeti AI 2021-06-05 13:25:47 -05:00
Sam
6add5510a7 Snowball attack. 2021-06-04 18:17:15 -05:00
Sam
1ebe6461d4 Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model. 2021-06-03 21:39:15 -05:00
Sam
47d5ea69eb Tidal warrior AI. 2021-06-03 21:39:14 -05:00
Avi Weinstock
07829fffab Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty. 2021-06-03 19:24:34 -04:00
Samuel Keiffer
a3ee98cfb9 Merge branch 'aweinstock/agent-pid' into 'master'
Implement PID controllers and use them to stabilize Agent airship flight.

See merge request veloren/veloren!2356
2021-06-02 23:15:08 +00:00
Marcel
35980f82a6 Merge branch 'revert-c6e200a3' into 'master'
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2318
2021-06-02 14:27:13 +00:00
Imbris
5caf8b6b55 Re-disable incremental just for common-systems, small fix in plugin
crate, more new clippy fixes
2021-05-31 20:44:57 -04:00
Imbris
5985584c5c Update toolchain 2021-05-31 20:44:57 -04:00
Avi Weinstock
7aac77288b Address MR 2356 comments. 2021-05-30 13:36:25 -04:00
Avi Weinstock
be35da9e57 Implement PID controllers and use them to stabilize Agent airship flight. 2021-05-30 13:36:25 -04:00
Sam
cb50b5940a Fixed a few oddities with the AI 2021-05-26 21:34:21 -05:00
Sam
60880b8fff Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00
Sam
875f1efc61 Fixed bow AI 2021-05-26 20:53:29 -05:00
Justin Shipsey
285904a850 Merge branch 'sam/rework-bow' into 'master'
Bow Rework

See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
Jonathan Berglin
5c8fc8da83 Extract 'get_inviter_and_kind' method from 'handle_invite_decline' and... 2021-05-25 20:34:46 +00:00
Avi Weinstock
62de40239a Fix mindflayer tactic to make it shoot purple fireballs again. 2021-05-22 20:35:21 -04:00
hqurve
36aae8b34b Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Ludvig Böklin
d7fa4e093d Adjusted masses; less excessive knockbacks; prevent loot shooting off 2021-05-22 17:56:13 +00:00
Sam
62e21e5961 Various tweaks. 2021-05-22 12:41:47 -05:00
juliancoffee
b6570d3151 Fix skill presets, add tests 2021-05-22 12:33:22 -05:00
Sam
0bc059513e Made new skills for reworked bow.
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Samuel Keiffer
083f67dbb2 Merge branch 'sam/extra-equip-slots' into 'master'
Added Extra Loadout Slots

See merge request veloren/veloren!2295
2021-05-21 20:28:53 +00:00
Marcel Märtens
c19c592586 remove Protocol from Quic, cleanup code, fix some log spam 2021-05-21 10:41:19 +02:00
Marcel
be56cd2a87 Revert "Merge branch 'sharp/revert-quinn' into 'master'"
This reverts merge request !2315
2021-05-21 10:41:16 +02:00
James Melkonian
bc7b453b5b Allow NPCs to path towards far away enemies 2021-05-21 03:14:45 +00:00
James Melkonian
8e9e550ce0 Small cockatrice AI fixes 2021-05-17 22:46:50 +00:00
Joshua Yanovski
20eccf597b Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
This reverts commit 04d8ddf25ed6b1ae8dd97846c5c4b9af4ab399b8, reversing
changes made to 9dcf7a9d26f7d60020c5707fea3ed8ac5596d3dc.
2021-05-17 08:32:12 -07:00
Marcel
48208b711d Merge branch 'xMAC94x/quic_enablement' into 'master'
Add a configuration Option to opt-in Quic backend

See merge request veloren/veloren!2268
2021-05-17 12:02:55 +00:00
Sam
6f00d556ad Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
holychowders
21867f8a85 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00
Marcel
8218fdd329 Revert "Merge branch 'snowram/hacky-mount' into 'master'"
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Snowram
a01add2e2c Collar can make QuadMeds mountable, state + offsets 2021-05-14 00:11:15 +02:00
James Melkonian
cdbf023645 Campfires can set things on fire and water puts it out 2021-05-13 05:34:51 +00:00
Joshua Yanovski
e457c3547d Don't remesh chunk vertex data on sprite update.
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.

This happens, for instance, when picking up a sprite like an apple or
flower from the environment.  We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
2021-05-11 12:58:15 -07:00
James Melkonian
fb2cd3fd45 Make merchants /tell instead of /say 2021-05-11 17:26:22 +00:00