juliancoffee
53cd3ccfec
Remove unused LoadoutConfig-s
2021-05-23 19:19:20 +03:00
juliancoffee
95dedc0e4e
Add directory hierarchy
2021-05-23 19:19:20 +03:00
juliancoffee
8cb1e22dda
add TODO about tests
2021-05-23 19:19:20 +03:00
juliancoffee
e8c0f62c60
Move loadout config handling to .ron files
2021-05-23 19:19:20 +03:00
juliancoffee
d587aff613
Implement random choosing of item from loadout
2021-05-23 19:19:20 +03:00
juliancoffee
23b566dbf8
Add support for .ron loadouts
2021-05-23 19:19:20 +03:00
James Melkonian
9dde9259cd
Don't modify position in glide character state
2021-05-23 07:26:11 +00: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
Sam
6028befbce
Fix
2021-05-22 13:29:03 -05:00
Samuel Keiffer
c771549a19
Merge branch 'lboklin/bird-drag' into 'master'
...
Adjusted masses; less excessive knockbacks; prevent loot shooting off
See merge request veloren/veloren!2307
2021-05-22 17:56:14 +00:00
Ludvig Böklin
d7fa4e093d
Adjusted masses; less excessive knockbacks; prevent loot shooting off
2021-05-22 17:56:13 +00:00
Samuel Keiffer
e64f4b8e9a
Merge branch 'juliancoffee/boss_armour' into 'master'
...
Boss armor
See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Monty Marz
20faacd04f
Ferocious armour for t5-dungeon minibosses
2021-05-22 10:55:36 +00:00
juliancoffee
4f83a4fa4a
Add placeholders for bosses armour
2021-05-22 00:20:56 +03:00
juliancoffee
ced5293d15
Add tests to loadout builder
2021-05-21 23:36:09 +03: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
Ludvig Böklin
1012a22dfa
Disable glider input until keys are pressed again after deploy
2021-05-20 12:13:59 +02:00
Sam
dc2c26bba5
Removed commented code
2021-05-17 16:48:56 -05: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
daafde048f
Fixed comments and some functionality.
2021-05-16 21:35:17 -05:00
Ben Wallis
951b006e1c
main/offhand weapon swap check refactor
2021-05-16 21:07:36 -05:00
Sam
f5b3872bd4
Removed special case for equipping a weapon that is no longer needed.
2021-05-15 15:16:39 -05:00
Sam
b41f668de2
Unequipping a mainhand weapon now moves offhand weapon into mainhand.
2021-05-15 15:16:39 -05:00
Sam
1b3e619115
Swapping weapon sets is now functional. (Though very hacky?)
2021-05-15 15:16:39 -05:00
Sam
3e33a612f8
Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?)
2021-05-15 15:16:38 -05:00
Sam
f81afa7fc9
Enforced certain invariants in how an item was equipped into the loadout:
...
- a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty
- a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon
- 2h weapons can never be equipped in an offhand slot
Fixed some tests
2021-05-15 15:16:38 -05: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
b38c9e593b
Use Body to determine mountee offsets
2021-05-14 00:11:54 +02:00
Snowram
c594e500e0
Clean unused mount offset
2021-05-14 00:11:46 +02:00
Snowram
6fb06af1c5
Anims export a transform for mounts
2021-05-14 00:11:37 +02:00
Snowram
d3b171f608
Expose the mounting bone to the mounter anims
2021-05-14 00:11:28 +02: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
Marcel
b044253d52
Merge branch 'alphyr/guess_image_format' into 'master'
...
Guess image format from file extension
See merge request veloren/veloren!2260
2021-05-12 18:41:22 +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
Sam
cefa9d1ff3
Fixed offsets for laser and rocket attacks of clay golem.
2021-05-10 18:54:04 -05:00
Sam
510c1980da
Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks.
2021-05-10 18:54:00 -05:00
Sam
0cc94c41ee
Balance tweaks
2021-05-10 18:53:52 -05:00
Sam
5107cb45fb
Increased exp of clay golems.
2021-05-10 18:53:51 -05:00
Sam
ed830e6935
Added haniwa sentries to level 3 dungeons.
2021-05-10 18:53:50 -05:00
Snowram
6cb67b85da
Adds haniwa sentry object
2021-05-10 18:53:48 -05:00
Sam
f39d5e34bf
Dungeon placement. Tweaks to melee.
2021-05-10 18:53:47 -05:00
Sam
1f73bad862
Added armor, more ai tweaks.
2021-05-10 18:53:46 -05:00
Sam
57e4966e98
Golem AI
2021-05-10 18:53:43 -05:00
Sam
083d3d2a6c
Clay golem attacks done.
2021-05-10 18:53:01 -05:00
Marcel Märtens
cb845f86ba
cleanup error codes
2021-05-10 12:59:44 +02:00
