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
8,167 Commits 151 Branches 18 Tags 2.1 GiB
811712316b
Commit Graph

8167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wallis
811712316b main/offhand weapon swap check refactor 2021-05-16 21:53:30 +01:00
Sam
ad0c247838 Removed special case for equipping a weapon that is no longer needed. 2021-05-15 15:16:39 -05:00
Sam
5cc6168553 Unequipping a mainhand weapon now moves offhand weapon into mainhand. 2021-05-15 15:16:39 -05:00
Sam
19926a2322 Swapping weapon sets is now functional. (Though very hacky?) 2021-05-15 15:16:39 -05:00
Sam
23cc3d671b Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?) 2021-05-15 15:16:38 -05:00
Sam
6b153bcf47 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
9173dca03f Added equip slots for other weapons. 2021-05-15 15:16:37 -05:00
Samuel Keiffer
16b952e01e Merge branch 'holychowders/make_npcs_aware_of_sound' into 'master' 
Make NPCs Aware of Sound - See Issue #913

See merge request veloren/veloren!2138
 2021-05-15 19:36:41 +00:00
holychowders
d5f3ba77d4 Make NPCs Aware of Sound - See Issue #913 2021-05-15 19:36:27 +00:00
Samuel Keiffer
9060e1ea71 Merge branch 'sam/small-fix' into 'master' 
Combat Fix

See merge request veloren/veloren!2309
 2021-05-15 16:13:44 +00:00
Sam
d286806b52 Shifted poise damage of sword dash 2021-05-15 10:30:39 -05:00
Marcel
695ffa96b9 Merge branch 'juliancoffee/update-it_IT' into 'master' 
update Italian translation by 'Чингис Хан'

See merge request veloren/veloren!2305
 2021-05-14 15:35:05 +00:00
juliancoffee
776f772b58 update Italian translation by 'Чингис Хан' 2021-05-14 17:31:01 +03:00
Monty Marz
ecc522612a Merge branch 'revert-7fe0db22' into 'master' 
Revert "Merge branch 'snowram/hacky-mount' into 'master'"

See merge request veloren/veloren!2302
 2021-05-14 14:22:13 +00:00
Marcel
7d5ca0e7bf Revert "Merge branch 'snowram/hacky-mount' into 'master'" 
This reverts merge request !2219
 2021-05-14 13:43:20 +00:00
Marcel
7fe0db2261 Merge branch 'snowram/hacky-mount' into 'master' 
Allow for collars to make QuadMed npcs mountable

See merge request veloren/veloren!2219
 2021-05-14 12:27:19 +00:00
Marcel
f4acb23c6d Merge branch 'hqurve/chat-ui' into 'master' 
Added chat tabs

See merge request veloren/veloren!2300
 2021-05-14 12:27:16 +00:00
hqurve
95a6e35a3a Added chat tabs 2021-05-14 12:27:15 +00:00
Snowram
8745fb803a Use Body to determine mountee offsets 2021-05-14 00:11:54 +02:00
Snowram
b063ec5a8f Clean unused mount offset 2021-05-14 00:11:46 +02:00
Snowram
486fbf940e Anims export a transform for mounts 2021-05-14 00:11:37 +02:00
Snowram
026ba616ff Expose the mounting bone to the mounter anims 2021-05-14 00:11:28 +02:00
Snowram
e4f3064b8a Collar can make QuadMeds mountable, state + offsets 2021-05-14 00:11:15 +02:00
Imbris
e66a2079ce Merge branch 'james/stop-drop-and-roll' into 'master' 
Campfires can set things on fire and water puts it out

See merge request veloren/veloren!2299
 2021-05-13 05:34:51 +00:00
James Melkonian
4d4bc132f4 Campfires can set things on fire and water puts it out 2021-05-13 05:34:51 +00:00
Marcel
607f8b289b 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
Marcel
276dd2f26c Merge branch 'tui/newline_in_trace' into 'master' 
enable TUI to actually handle newline character.

See merge request veloren/veloren!2282
 2021-05-12 18:05:50 +00:00
Marcel Märtens
a65ef892ca use split_inclusive instead 2021-05-12 18:40:12 +02:00
Marcel Märtens
863e11d5e3 enable TUI to actually handle newline character. 
but we are not sure if NEWLINEs are wanted in logs as it could cause problems with automated parsing.
 2021-05-12 18:40:08 +02:00
Marcel
3a437f2bda Merge branch 'xMAC94x/mirror_collab' into 'master' 
dont run CI on master on mirror

See merge request veloren/veloren!2291
 2021-05-12 13:05:28 +00:00
Joshua Yanovski
45367b192f Merge branch 'sharp/skip-sprite-mesh' into 'master' 
Don't remesh chunk vertex data on sprite update.

See merge request veloren/veloren!2294
 2021-05-11 20:39:04 +00:00
Joshua Yanovski
3869cdf1d2 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
Marcel
7e1f32c283 Merge branch 'james/merchant-tell' into 'master' 
Make merchants /tell instead of /say

See merge request veloren/veloren!2293
 2021-05-11 17:26:22 +00:00
James Melkonian
f76b61ac17 Make merchants /tell instead of /say 2021-05-11 17:26:22 +00:00
Joshua Yanovski
20911e8995 Merge branch 'sharp/docker-stdin-tty' into 'master' 
More fixes to stdin input.

See merge request veloren/veloren!2292
 2021-05-11 12:12:24 +00:00
Joshua Yanovski
33494c0e29 More fixes to stdin input. 
Adding tty makes sure docker attach won't be accidentally detached
by ctrl-C (there are better ways of doing this but this one works
for now)

shell-words more closely emulates Bash's tokenizer rules (but without
doing things like environment variable expansion) which allows us to use
multiline strings as reasons, etc.  Unfortunately entering newlines
still won't work the way we've written things since shell-words does not
right now give enough information to incrementally build up a valid
string, just says there was a tokenizing error; but maybe in the future
we can fix that.
 2021-05-11 04:15:59 -07:00
Marcel
3f4ff839bb Merge branch 'sharp/docker-stdin-open' into 'master' 
Open stdin when using Veloren with docker.

See merge request veloren/veloren!2288
 2021-05-11 09:29:31 +00:00
Marcel Märtens
a064cf4ca5 dont run CI on master on mirror 2021-05-11 08:54:10 +02:00
Joshua Yanovski
81bba1393a Merge branch 'sam/clay-golem' into 'master' 
Clay Golem Rework

See merge request veloren/veloren!2264
 2021-05-11 01:36:13 +00:00
Joshua Yanovski
edc9c37482 Merge branch 'xMAC94x/remove-sponsorship' into 'master' 
DO no longer sponsors us in 2021

See merge request veloren/veloren!2290
 2021-05-11 01:19:05 +00:00
Sam
7acd953923 Changed particles to a switch statement. 2021-05-10 19:58:32 -05:00
Sam
cd5096fe73 Changelog 2021-05-10 18:57:33 -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
a497ac0353 Added kit for testing. 2021-05-10 18:53:50 -05:00
Sam
9bbdc26089 Added haniwa sentries to level 3 dungeons. 2021-05-10 18:53:50 -05:00
Sam
58e5b1fdf5 AI tweaks. 2021-05-10 18:53:49 -05:00