Marcel
|
833ae2331a
|
Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translations
See merge request veloren/veloren!3682
|
2022-11-20 18:12:59 +00:00 |
|
Marcel
|
0312639491
|
Merge branch 'tormod/site-placement-refactor' into 'master'
Get rid of redundant sources of truth on site locations.
See merge request veloren/veloren!3702
|
2022-11-20 13:23:44 +00:00 |
|
Tormod G. Hellen
|
44f118c437
|
Get rid of redundant sources of truth on site locations.
|
2022-11-20 00:57:05 +01:00 |
|
Joshua Barretto
|
863dc4e017
|
Merge branch 'zesterer/fix-voxygen-tod' into 'master'
Fixed TimeOfDay interpolation
See merge request veloren/veloren!3701
|
2022-11-19 12:10:36 +00:00 |
|
Joshua Barretto
|
5638934a0d
|
Fixed TimeOfDay interpolation
|
2022-11-18 11:27:37 +00:00 |
|
Samuel Keiffer
|
5709427e63
|
Merge branch 'sam/small-fixes' into 'master'
Small fixes for sword
See merge request veloren/veloren!3694
|
2022-11-16 23:33:12 +00:00 |
|
Sam
|
b2b8ea1772
|
Made calculation of prim count more accurate
|
2022-11-15 19:54:08 -05:00 |
|
Imbris
|
dfbb8fa1a9
|
Merge branch 'hjalle2000/snappy_ui' into 'master'
snappy ui scaling by having a addtional dropdown menu
See merge request veloren/veloren!3695
|
2022-11-15 13:56:28 +00:00 |
|
Marcel
|
997c5a4e61
|
Merge branch 'ythern/more_unique_abilities' into 'master'
Ythern/roshwalr kit
See merge request veloren/veloren!3692
|
2022-11-15 09:58:06 +00:00 |
|
Marcel Märtens
|
e10df6ec58
|
snappy ui scaling by having a addtional dropdown menu
|
2022-11-15 10:28:57 +01:00 |
|
Eternalisime
|
7c66c94fa2
|
fix loot table
|
2022-11-13 22:49:29 +01:00 |
|
Eternalisime
|
48e23dba49
|
combat: reverted tweak on shockwave and changed loot table
|
2022-11-13 22:45:05 +01:00 |
|
Eternalisime
|
6e18683d98
|
combat: tweak on shockwave
|
2022-11-13 22:24:01 +01:00 |
|
Eternalisime
|
7113befe88
|
removed useless check
|
2022-11-13 22:21:32 +01:00 |
|
Eternalisime
|
71e59e4b81
|
combat: tweaks and modified shockwave animation
|
2022-11-13 22:04:00 +01:00 |
|
Christof Petig
|
24aac2d92f
|
Merge branch 'floppy_savannahpit_merchants' into 'master'
add merchants to savannah pits
See merge request veloren/veloren!3690
|
2022-11-13 19:14:27 +00:00 |
|
flo
|
6d8f2c8c7b
|
add merchants to savannah pits
|
2022-11-13 19:14:26 +00:00 |
|
Sam
|
4784b61656
|
Small fixes
|
2022-11-13 14:03:37 -05:00 |
|
flo666
|
a64236f50f
|
quadruped_medium shockwave animation WIP
|
2022-11-13 19:41:18 +01:00 |
|
Eternalisime
|
19fb2e6416
|
fixed format
|
2022-11-13 11:45:03 +01:00 |
|
Eternalisime
|
8aa4f782f4
|
added a space
|
2022-11-13 11:27:17 +01:00 |
|
Samuel Keiffer
|
1173c8257f
|
Merge branch 'holychowders/agent_awareness2' into 'master'
Rework internal representation of agent awareness
See merge request veloren/veloren!3661
|
2022-11-12 18:48:32 +00:00 |
|
holychowders
|
95fd092e26
|
Fix awareness changes.
|
2022-11-12 12:12:32 -06:00 |
|
Justin Shipsey
|
aa2fabcd45
|
Merge branch 'mossdrake' into 'master'
Moss Drake
See merge request veloren/veloren!3693
|
2022-11-12 13:00:44 +00:00 |
|
flo
|
0351bf1d63
|
Moss Drake
|
2022-11-12 13:00:42 +00:00 |
|
Justin Shipsey
|
420e824a3e
|
Merge branch 'train-track-shadows' into 'master'
Train track shadows
See merge request veloren/veloren!3688
|
2022-11-12 13:00:24 +00:00 |
|
Eternalisime
|
ed25a84c72
|
combat: tweaked roshwalr melee detection and range
|
2022-11-12 13:51:27 +01:00 |
|
Christof Petig
|
a820eee289
|
Merge branch 'floppy-bat-wing-tweaks' into 'master'
tweak bat wing animation
See merge request veloren/veloren!3684
|
2022-11-12 10:18:11 +00:00 |
|
flo
|
df70381a7c
|
tweak bat wing animation
|
2022-11-12 10:18:10 +00:00 |
|
Eternalisime
|
13980861f8
|
combat: tweaked roshwalr AI
|
2022-11-11 16:37:58 +01:00 |
|
Marcel
|
7a75b72aa3
|
Merge branch 'KingPEPSALT/improve_time_command' into 'master'
FIX #1622, /time command will not allow time going backwards as rtsim cannot...
See merge request veloren/veloren!3570
|
2022-11-11 10:30:44 +00:00 |
|
Eternalisime
|
8f4863be28
|
combat: balance tweaks on roshwalr
|
2022-11-11 10:22:23 +01:00 |
|
Avi Weinstock
|
e72719ddf1
|
Hitboxes no longer cast shadows.
|
2022-11-10 18:26:11 -05:00 |
|
Monty Marz
|
c252f84bdf
|
Merge branch 'pfau/instruments_crafting' into 'master'
Musical Instruments part 2
See merge request veloren/veloren!3667
|
2022-11-10 20:59:53 +00:00 |
|
Monty Marz
|
a763a865fe
|
Musical Instruments part 2
|
2022-11-10 20:59:53 +00:00 |
|
LunarEclipse
|
f6e2c6885c
|
Cargo fmt
|
2022-11-10 17:19:43 +01:00 |
|
pepsalt
|
5294603431
|
changed {:?}s to {}s in format strings
|
2022-11-10 17:18:59 +01:00 |
|
pepsalt
|
f22a9d030d
|
CHANGE: moved time of day interpolation logic out of Client and into Scene for semantics and accessing the settings logically
|
2022-11-10 17:16:48 +01:00 |
|
pepsalt
|
775025ac63
|
CHANGE, client time lerp would cause flashing lights for large discrepancies, it now no longer lerps if the flashing lights setting is not on
|
2022-11-10 17:16:45 +01:00 |
|
pepsalt
|
3e580138df
|
FIX #1622, /time command will not allow time going backwards as rtsim cannot handle time regression, time given in seconds is treated as if it were seconds ahead of the next midnight
|
2022-11-10 17:06:53 +01:00 |
|
Eternalisime
|
f1b77e27fe
|
combat: lowered flee_health on roshwalr
|
2022-11-10 16:57:29 +01:00 |
|
Eternalisime
|
e1e78a914f
|
combat: added angle condition on shockwave
|
2022-11-10 14:24:06 +01:00 |
|
Eternalisime
|
918d5eb345
|
combat: added a unique kit to roshwalr
|
2022-11-10 13:53:12 +01:00 |
|
LunarEclipse
|
0e476cd3df
|
Merge branch 'lunareclipse/update-personal-information' into 'master'
Updated some of my personal info
See merge request veloren/veloren!3691
|
2022-11-09 00:33:52 +00:00 |
|
LunarEclipse
|
32abb59132
|
Updated some of my personal info
|
2022-11-08 23:06:32 +01:00 |
|
Samuel Keiffer
|
97f3fa56d3
|
Merge branch 'DaforLynx/event-music' into 'master'
Event music can use more than one event at a time. Added test for soundtracks.
See merge request veloren/veloren!3686
|
2022-11-07 22:39:25 +00:00 |
|
DaforLynx
|
b2b14e7ab4
|
Event music can use more than one event at a time. Added test for soundtracks.
|
2022-11-07 22:39:25 +00:00 |
|
Avi Weinstock
|
18657fdb66
|
Render train tracks to the shadow map.
|
2022-11-06 20:54:58 -05:00 |
|
Avi Weinstock
|
db251273ed
|
Apply shadow map shadows to train tracks.
|
2022-11-06 18:09:07 -05:00 |
|
holychowders
|
571b07d54a
|
Remove dt and multiplication by 30.
|
2022-11-06 13:10:17 -06:00 |
|