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
9,742 Commits 151 Branches 18 Tags 2.1 GiB
5e3e698c2a
Commit Graph

743 Commits

Author SHA1 Message Date
Snowram
3fa7d0b6d4 Add material and armor class tags 2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
1a5717e957 armor stats on chest 2021-06-07 11:00:05 +02:00
jshipsey
8acd3832e3 more loot tables, overworld ores, more items 2021-06-07 11:00:00 +02:00
jshipsey
05de96c94b ore deposits, flower drops 2021-06-07 10:59:50 +02:00
jshipsey
1c17d8fe5e cave changes 2021-06-07 10:59:44 +02:00
jshipsey
754b60d810 crafting stations 2021-06-07 10:59:35 +02:00
Sam
2a07fad802 Removed armor stat hackery. 
Added new armor stats to remaining armor items.
Fixed broken tests.
 2021-06-07 10:59:26 +02:00
Sam
ff66e34be5 Added default values to every armor item. 2021-06-07 10:59:15 +02:00
Sam
855384fbeb Crit power stat now functional, added comments on each stat field to better describe what the stat does and what values should be used. 2021-06-07 10:58:42 +02:00
Sam
6790b71d53 Energy recovery stat functional. 2021-06-07 10:58:32 +02:00
jshipsey
58bd51a9e8 icon work, more models 2021-06-07 10:58:27 +02:00
Sam
f2233d5b5d Recipe book fix 2021-06-07 10:58:07 +02:00
jshipsey
18e9b5b890 recipes, re-organization, cleanup 2021-06-07 10:58:05 +02:00
jshipsey
74fbe9a123 cloth/metallic armor 2021-06-07 10:56:54 +02:00
jshipsey
1b575a5a04 crafting item partial re-organization, armor recipes, some specific animal drops 2021-06-07 10:56:35 +02:00
jshipsey
ffc9a0ae22 more drops, armors 2021-06-07 10:56:16 +02:00
jshipsey
f387b8d259 hides/leathers 2021-06-07 10:56:04 +02:00
jshipsey
451ccf8d73 more meat 2021-06-07 10:55:50 +02:00
jshipsey
ca907f1b87 added some meat 2021-06-07 10:55:34 +02:00
Snowram
864f230a3c Yeti combat anims 2021-06-06 00:17:23 +02:00
Sam
acf7ad27f1 Balance tweaks. 2021-06-05 17:15:04 -05:00
Sam
74b7039219 Yeti AI 2021-06-05 13:25:47 -05:00
Sam
93f90d514c Particles for ice spikes 2021-06-04 18:17:15 -05:00
Sam
81f7e690fd Snowball attack. 2021-06-04 18:17:15 -05:00
Sam
a82984b925 Added base ability set 2021-06-04 18:17:14 -05:00
juliancoffee
554828e1a1 Bow Tweaks 
- M1 (charged) got faster charge, but lesser damage and energy regen
- M2 (repeater) got faster charge, but lesser damage and max speed
- S1 (shotgun) got less energy cost
 2021-06-04 20:58:08 +03:00
Sam
eaf87a53bb Final tweaks. 2021-06-03 21:39:47 -05:00
jshipsey
ca43a0058a some animation 2021-06-03 21:39:17 -05:00
Sam
5bf99eac11 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
ac2f097d80 Tidal warrior AI. 2021-06-03 21:39:14 -05:00
Sam
c81e1534f7 First 3 abilities for tidal warrior functional. Added bubble particles. 2021-06-03 21:39:13 -05:00
Samuel Keiffer
4b359b8ca4 Merge branch 'aweinstock/price-equality' into 'master' 
Add a manifest for making different items count as the same item for the purpose of pricing.

See merge request veloren/veloren!2360
 2021-06-02 23:48:45 +00:00
Avi Weinstock
054fb1d763 Add a manifest for making different items count as the same item for the purpose of pricing. 2021-06-02 19:12:51 -04:00
juliancoffee
3c66e62fe0 Decompose LoadoutBuilder::from_asset_expect 
- Introduce apply_asset_expect() to mutate passed builder and complete it
from asset
- Remove runtime panic from choosing item
- Rewrite defaults() to load from asset
 2021-06-02 17:17:19 +03:00
Dr. Dystopia
641ccd5282 Replace object initialization with read from file 2021-06-02 17:17:19 +03:00
Dr. Dystopia
35d5e3379e Create 'default.ron' file 2021-06-02 17:17:19 +03:00
Avi Weinstock
3684cf0454 Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. 
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
 2021-05-28 15:09:29 -04:00
Justin Shipsey
d7c7f6bf5d Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request veloren/veloren!2310
 2021-05-26 04:44:09 +00:00
juliancoffee
c618ec7222 fmt 2021-05-25 01:23:32 +03:00
juliancoffee
2d56b5dcde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
juliancoffee
3700cc8a67 Overhaul loot tables 2021-05-25 00:20:18 +03:00
juliancoffee
940655dcb6 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
juliancoffee
457e5b14d8 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
8c1643cad9 Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
00b182c183 Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
6656cfe010 Add directory hierarchy 2021-05-23 19:19:20 +03:00
juliancoffee
0722861364 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
juliancoffee
a8699cfa15 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
Samuel Keiffer
95f3a12d41 Merge branch 'juliancoffee/dungeon_mobs' into 'master' 
Dungeon rebalance

See merge request veloren/veloren!2333
 2021-05-22 22:38:21 +00:00
juliancoffee
7e909be2b5 Move fireworks into own table 2021-05-23 01:04:11 +03:00
juliancoffee
4156f373c1 Adjust loot tables 
- Add regular drop to T5 miniboss
- Fixup cultist loot table
- Give own loot table to Deadwood in T0
 2021-05-23 01:04:11 +03:00
Sam
7828112486 Balance tweaks. 2021-05-22 15:00:05 -05:00
Samuel Keiffer
e543941073 Merge branch 'juliancoffee/boss_armour' into 'master' 
Boss armor

See merge request veloren/veloren!2327
 2021-05-22 17:42:27 +00:00
Sam
f993f28eff Various tweaks. 2021-05-22 12:41:47 -05:00
Sam
1014ac45bf Made new skills for reworked bow. 
Created migration to reset bow skills.
 2021-05-22 12:33:21 -05:00
Sam
3f16d15bbb Reworked bow 2021-05-22 12:33:20 -05:00
Monty Marz
30bcc6aaa3 Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
juliancoffee
7dc50891d2 Add placeholders for bosses armour 2021-05-22 00:20:56 +03:00
juliancoffee
df58fa9acf Fixing loot tables 
- Use quad_low and quad_medium loot table for corresponding mobs in
dungeons
- Remove cultist loot table from T3-T4 loot tables
- Use resize instead of vec[obj; len] to create different loot and not
duplicated for miniboss_1
 2021-05-21 11:31:39 +03:00
juliancoffee
e48e3e11ba Give bosses own creation function and loot table 
- Make goose miniboss fallback to differentiate bosses and minibosses
 2021-05-21 11:01:47 +03:00
juliancoffee
287b531b47 Set poise_resilience to sane values 
- Druid Shoulders to 1.0
- Rugged Chest to 1.0
- Cultist Gloves to 1.0
 2021-05-16 01:07:55 +03:00
Sam
d286806b52 Shifted poise damage of sword dash 2021-05-15 10:30:39 -05:00
Sam
7f6c6c5603 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
jshipsey
770d07ac90 anims 2021-05-10 18:54:03 -05:00
Sam
0d53e790fd Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
fca56be4c0 Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
d14fd59711 Increased exp of clay golems. 2021-05-10 18:53:51 -05:00
Sam
4e5a456b18 Balance tweaks. 2021-05-10 18:53:49 -05:00
Snowram
47a2bf7de8 Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
1c8db241e2 Golem AI 2021-05-10 18:53:43 -05:00
Sam
5fa4358e74 Clay golem attacks done. 2021-05-10 18:53:01 -05:00
Avi Weinstock
abcb6f34a3 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
Avi Weinstock
1dfcdce1c0 Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
Illia Denysenko
cb2412148b Miniboss Loot quickfix 2021-05-09 21:29:35 +00:00
Snowram
831bfd0be9 Snowram/craft mats 2021-05-07 17:03:45 +00:00
Avi Weinstock
e4cda4309e Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
Sam
dc7e45c8bd Rebalancing 2021-05-05 14:43:56 -04:00
Sam
240a8e577d Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f Balancing. 2021-05-04 08:45:11 -04:00
Sam
164fd0de04 Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
Sam
2290a22a15 Gave minotaur AI. 2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1 anims 2021-05-04 08:45:08 -04:00
Sam
257c670aaf Fix charge being broken. 2021-05-04 08:45:07 -04:00
Sam
d1139c3b7c Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Sam
e052c7b516 Cleave functional 2021-05-04 08:45:06 -04:00
Sam
160bd3ef0c Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
Sam
660423932c Miscellaneous balancing 2021-05-04 08:45:05 -04:00
Sam
f11c10d3be Charge attack for minotaur functional. 2021-05-04 08:45:04 -04:00
Samuel Keiffer
771a8db2a8 Merge branch 'slipped/oritweak' into 'master' 
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
 2021-05-03 18:49:22 +00:00
jshipsey
63fdc4f590 animal adjustments 2021-05-02 23:17:58 -04:00
jshipsey
769e21104e higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Sam
d500a00414 Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
dd113c56cb Fixed ItemDef for custom weapons. 2021-05-01 09:25:54 -04:00
Sam
3cb0ee98c8 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Sam
7870109856 Deduplicated stuff in npc_armor. 2021-04-29 15:45:14 -04:00
Sam
91bb6392bb Removed old 2h variants of 1h weapons. 2021-04-29 13:18:04 -04:00
Scott Bronson
b7ac7b64f3 Fix spelling in seashells.ron 2021-04-28 16:32:19 +00:00
jshipsey
2c74a86170 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
Joshua Barretto
805822b0b0 Rebalanced arrow speed 2021-04-25 20:06:29 +01:00
Sam
b9d6bd2fd2 Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
Sam
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Snowram
8f54a0bf31 More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
James Melkonian
0cf7e7114f Phoenix AI pass 2021-04-25 04:07:11 +02:00
Snowram
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Monty Marz
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Monty
a1b4e0bdaf remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update 
fix item images
fix CR display
 2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944 Added crafting stations 2021-04-20 02:45:59 +02:00
Sam
ce7581037c Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
cb817c0313 Merge branch 'zesterer/econ-tweaks' into 'master' 
Rebalanced economy somewhat

See merge request veloren/veloren!2148
 2021-04-18 21:20:49 +00:00
Avi Weinstock
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Joshua Barretto
352fce239e Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
cac9ac6807 Trading stock limits 2021-04-18 18:58:26 +01:00
Joshua Barretto
250733a123 Better price rationalisation 2021-04-18 18:11:00 +01:00
Joshua Barretto
c0b71d0731 Removed legendaries from trading 2021-04-18 17:29:22 +01:00
Joshua Barretto
11683084ad Use labour value for prices 2021-04-18 17:05:14 +01:00
Joshua Barretto
fcc23a4427 Normalised prices within sites 2021-04-18 15:09:21 +01:00
Joshua Barretto
b72e454148 Rebalanced economy somewhat 2021-04-18 14:08:48 +01:00
Samuel Keiffer
c962c5f12e Merge branch 'gGmMsS/Burning' into 'master' 
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
 2021-04-15 23:51:33 +00:00
gGmMsS123
0d956610ec Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
jshipsey
8f20d17c9a attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63 combat tweaks 2021-04-15 11:43:52 -04:00
Sam
c88df846a7 Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky. 2021-04-14 17:38:37 -04:00
jshipsey
161382d06a changelog 2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374 loot tables, clippy, animation tweaks 2021-04-13 20:18:59 -04:00
jshipsey
42460f7e65 spins, combos 2021-04-13 20:18:59 -04:00
jshipsey
529f8eb5a6 more setups. chargeswing/dash anims 2021-04-13 20:18:59 -04:00
Vincent Foulon
0692562533 New Command: "kit" + Removed Command: "debug" 
Update CHANGELOG.md

Update CHANGELOG.md
 2021-04-12 18:53:36 +02:00
Monty Marz
6772e71aaa UI fixes and more 2021-04-11 03:49:47 +00:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
Monty Marz
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
Sam
27f178286d Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Sam
9ad5b0f6b7 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
7c8242b5b1 Added unit test to validate contents of loot tables. 2021-04-02 23:04:35 -04:00
Sam
c8b8cd436e Made item prices sane. 2021-04-02 23:04:34 -04:00
Sam
7eb1eefa13 Re-created item_price_calculation with new loot tables. 2021-04-02 23:04:34 -04:00
Sam
a2906168a6 Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
cb638180f8 Moved food items into their own loot tables. 2021-04-02 23:04:32 -04:00
Sam
31e69021cb Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00
Sam
67916b44a7 Staff weapon tiering shuffle. 2021-04-02 23:04:30 -04:00
Sam
a2fc2abf83 Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres. 2021-04-02 23:04:30 -04:00
Sam
2e37cefce5 Created weapon loot tables. 2021-04-02 23:04:29 -04:00
Sam
833f1f3309 Converted all armor in loot tables to reference armor set loot tables. 2021-04-02 23:04:28 -04:00
Sam
96b354c178 Consolidated loot tables by switching to CreatureMaterial where possible 2021-04-02 23:04:27 -04:00
Sam
247004d180 Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04:00
Samuel Keiffer
12ec46c572 Merge branch 'sam/mindflayer-balancing' into 'master' 
Mindflayer balance tweaks.

See merge request veloren/veloren!2031
 2021-03-29 21:05:49 +00:00
Snowram
2c09180189 Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Sam
71ba9b6a54 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Sam
f6e4626887 Fix emerald sceptre. Remove duplicate asset. 2021-03-28 21:19:01 -04:00
Snowram
5295894105 Add new batch of starves and scepter (by Gemu) 2021-03-29 01:27:55 +02:00
Scott Williams
ef43d29627 Fix husk drops in miniboss rooms. 2021-03-28 10:39:20 +00:00
Sam
f117a57083 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
jshipsey
558c82ee54 flayer anims 2021-03-27 21:05:16 -04:00
Sam
b0b114a7f8 Balance tweaks 2021-03-27 21:05:15 -04:00
Sam
1edf79d109 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Sam
6c611d632a Mindflayer now only summons minions at set thresholds of health. 2021-03-27 21:05:11 -04:00
Sam
5966b1541d Mindflayer can now lifesteal off of its own minions 2021-03-27 21:05:11 -04:00
Sam
50e832b6d0 Mindflayer summons husks instead of dogs now 2021-03-27 21:05:10 -04:00
Snowram
39c8efe11f Adds husk npc 2021-03-27 21:05:09 -04:00
Sam
f9835e78da Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner. 2021-03-27 21:05:07 -04:00
Sam
8e4aeff705 Improved mindflayer AI. Tweake some abilities. 2021-03-27 21:05:07 -04:00
Sam
720482d994 Gave mindflayer AI. 
Fixed particles and made them sync across network.
 2021-03-27 21:05:06 -04:00
Sam
a5b7477e96 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
Sam
30da614e89 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Sam
f1156c9ce5 Added necrotic vortex attack to mindflayer 2021-03-27 21:05:03 -04:00
Sam
0d3795112c Added cursed flame attack to mindflayer 2021-03-27 21:05:03 -04:00
Avi Weinstock
4b62a99ed9 Improve econsim's handling of diamond prices by lowering the implied homicide rate. 2021-03-27 10:50:16 -04:00
Sam
6c2de7d70e Fixed boost having ridiculous velocity. 2021-03-26 16:11:25 -04:00
Scott Williams
aa9180b20f Moved rugged armour to cloth_item 2021-03-26 16:51:43 +00:00
Scott Williams
d35475eaef Added leather scraps recipe 2021-03-26 16:44:38 +00:00
Samuel Keiffer
8ed7da7c49 Merge branch 'master' into 'master' 
Update short_1.ron to make eligible for cloth scrap recipe

See merge request veloren/veloren!1981
 2021-03-23 19:29:56 +00:00
steanne
818aaed32a Update short_1.ron to make eligible for cloth scrap recipe 2021-03-23 18:16:30 +00:00
Sam
31f4ef684d Tweaked numbers 2021-03-22 17:26:55 -04:00
Joshua Barretto
6690854687 Merge branch 'zesterer/better-particle-emission' into 'master' 
Smoother particle emission for moving objects

See merge request veloren/veloren!1965
 2021-03-22 06:15:20 +00:00
Samuel Keiffer
1374900928 Merge branch 'sam/combat-fixes' into 'master' 
Fixes gaining combo by shooting loot bag

See merge request veloren/veloren!1953
 2021-03-22 02:01:22 +00:00
Joshua Barretto
f9612c1c26 Made pickaxe obtainable 2021-03-22 00:24:07 +00:00
Joshua Barretto
7ae4230dc8 Merge branch 'zesterer/pick' into 'master' 
Pickaxe

See merge request veloren/veloren!1959
 2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b Faster pick, less vibrant block selection 2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Joshua Barretto
b45df7fe10 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0 Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Vincent Foulon
e06870702f Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Sam
c8c368adec Rebalanced a few stats 2021-03-20 16:28:03 -04:00
Vincent Foulon
d0aa68a9d2 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Monty Marz
e9cbac387e new loading bg, staff models 
item images

fix paths

loot tables, adjustments

Update main.ron
 2021-03-16 23:23:24 +00:00
Marcel
f679103041 Merge branch 'sam/nerfs' into 'master' 
Nerfs

See merge request veloren/veloren!1922
 2021-03-16 22:22:04 +00:00
James Melkonian
6ea43cfd75 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00