Snowram
fcb0b00575
Merge branch 'james/fix-cockatrice' into 'master'
...
Small cockatrice AI fixes
See merge request veloren/veloren!2319
2021-05-17 22:46:50 +00:00
James Melkonian
8e9e550ce0
Small cockatrice AI fixes
2021-05-17 22:46:50 +00:00
Marcel
88250771c2
Merge branch 'update_pt_BR_20210517' into 'master'
...
Update pt br 20210517
See merge request veloren/veloren!2317
2021-05-17 18:12:20 +00:00
Nícolas Wildner
9150c05ac1
Update pt br 20210517
2021-05-17 18:12:20 +00:00
Joshua Yanovski
1f7a6aa566
Merge branch 'sharp/revert-quinn' into 'master'
...
Revert "Merge branch 'xMAC94x/quic_enablement' into 'master'"
See merge request veloren/veloren!2315
2021-05-17 16:40:49 +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
Justin Shipsey
d10dbdf352
Merge branch 'juliancoffee/small_fixes' into 'master'
...
Set poise_resilience to sane values
See merge request veloren/veloren!2311
2021-05-16 17:35:39 +00:00
Marcel
12da9a80db
Merge branch 'xMAC94x/czech' into 'master'
...
add czech language. fixed #1044
Closes #1044
See merge request veloren/veloren!2297
2021-05-16 16:39:51 +00:00
juliancoffee
06a69fa335
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
Samuel Keiffer
5a992e59f6
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
21867f8a85
Make NPCs Aware of Sound - See Issue #913
2021-05-15 19:36:27 +00:00
Samuel Keiffer
2ee38bda68
Merge branch 'sam/small-fix' into 'master'
...
Combat Fix
See merge request veloren/veloren!2309
2021-05-15 16:13:44 +00:00
Sam
a2d8496b3d
Shifted poise damage of sword dash
2021-05-15 10:30:39 -05:00
Marcel
4ea398dfd9
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
0fa437f1cb
update Italian translation by 'Чингис Хан'
2021-05-14 17:31:01 +03:00
Monty Marz
7e774bf1f1
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
8218fdd329
Revert "Merge branch 'snowram/hacky-mount' into 'master'"
...
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Marcel
f377c9c8a8
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
d6b2a09c60
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
9425f212ca
Added chat tabs
2021-05-14 12:27:15 +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
Imbris
c181204556
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
cdbf023645
Campfires can set things on fire and water puts it out
2021-05-13 05:34:51 +00:00
Marcel Märtens
791ab093b3
add czech language. fixed #1044
2021-05-12 22:36:11 +02: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
Marcel
fe095c769a
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
fa2b181628
use split_inclusive instead
2021-05-12 18:40:12 +02:00
Marcel Märtens
0f3717d047
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
1ca67b3d2b
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
ed7656c890
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
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
Marcel
62da0c6231
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
fb2cd3fd45
Make merchants /tell instead of /say
2021-05-11 17:26:22 +00:00
Joshua Yanovski
1549173396
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
39369e090f
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
ee94fc53ac
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
3c863c9a9a
dont run CI on master on mirror
2021-05-11 08:54:10 +02:00
Joshua Yanovski
01642460f0
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
44b7ea9424
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
93f982df7b
Changed particles to a switch statement.
2021-05-10 19:58:32 -05:00
Sam
73e6827eb5
Changelog
2021-05-10 18:57:33 -05:00
Sam
cefa9d1ff3
Fixed offsets for laser and rocket attacks of clay golem.
2021-05-10 18:54:04 -05:00
jshipsey
8b0a2a0199
anims
2021-05-10 18:54:03 -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
