Gamma
0e2fe6ff15
update the Spanish translation
2022-12-04 23:43:51 +00:00
rmdlv
f64af1dc86
Russian translation fixes
2022-12-03 19:40:45 +08:00
Marcel
122d2df04f
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3705
2022-12-01 14:10:00 +00:00
Jonathan Berglin
511026fd65
Update swedish translations
2022-12-01 14:09:59 +00:00
Marcel
f96776b060
Merge branch 'alejandrohernandezcarbonero83-master-patch-36663' into 'master'
...
Update npc.ftl
See merge request veloren/veloren!3715
2022-12-01 13:39:25 +00:00
electro79
dfc31eb0b5
Update npc.ftl
2022-11-30 16:55:10 +00:00
Marcel
ba62cc853e
Merge branch 'Madrots/update-es_LA' into 'master'
...
Madrots/update-es_LA
See merge request veloren/veloren!3708
2022-11-30 15:34:33 +00:00
Madrots
605a0a07b0
Madrots/update-es_LA
2022-11-30 15:34:32 +00:00
Marcel
82e4520407
Merge branch 'master' into 'master'
...
Added 'hud-skill-set_as_exp_bar' in italian.
See merge request veloren/veloren!3710
2022-11-30 15:34:29 +00:00
Francesco Vasco
0ba7e5a06e
Added 'hud-skill-set_as_exp_bar' in italian.
2022-11-30 15:34:27 +00:00
Marcel
44bca9a1b0
Merge branch 'floppy_dagon_kit' into 'master'
...
dagon_kit
See merge request veloren/veloren!3696
2022-11-30 15:27:21 +00:00
flo
466ed2c382
dagon_kit
2022-11-30 15:27:21 +00:00
Marcel
7191ee9325
Merge branch 'alejandrohernandezcarbonero83-master-patch-19384' into 'master'
...
Update char_selection.ftl
See merge request veloren/veloren!3711
2022-11-30 15:18:04 +00:00
IsseW
7296843923
simple bridges
2022-11-30 15:13:52 +01:00
electro79
b5cb66d053
Update char_selection.ftl
2022-11-29 21:56:21 +00:00
DaforLynx
d338906b19
More music and artist links
2022-11-25 18:48:56 +00:00
Monty Marz
3abfa4d2cc
Add Exp-Bar
2022-11-22 11:52:39 +00:00
Marcel
1a92bd7fe1
Merge branch 'master' into 'master'
...
Italian transaltion
See merge request veloren/veloren!3687
2022-11-21 16:24:06 +00:00
Francesco Vasco
d127bcc5d8
Italian transaltion
2022-11-21 16:24:06 +00:00
Justin Shipsey
a75b1bc21c
Merge branch 'mossdrake_and_wood_fix' into 'master'
...
reduce mossdrake, fix woodgolem loottable
See merge request veloren/veloren!3700
2022-11-21 14:22:16 +00:00
flo
e7b802712d
reduce mossdrake, fix woodgolem loottable
2022-11-21 14:22:15 +00:00
Marcel
107cc8963f
Merge branch 'Halosesparta13-master-patch-90913' into 'master'
...
Translation for the "ability.ftl" file to the es_LA folder
See merge request veloren/veloren!3613
2022-11-20 18:16:49 +00:00
Halosesparta
cfcf197e32
Translation for the "ability.ftl" file to the es_LA folder
2022-11-20 18:16:48 +00:00
Marcel
e5979c78f8
Merge branch 'kuba1001t/update-pl_PL' into 'master'
...
Update polish translations
See merge request veloren/veloren!3677
2022-11-20 18:13:01 +00:00
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
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
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
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
71e59e4b81
combat: tweaks and modified shockwave animation
2022-11-13 22:04:00 +01:00
Sam
4784b61656
Small fixes
2022-11-13 14:03:37 -05: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
Eternalisime
8f4863be28
combat: balance tweaks on roshwalr
2022-11-11 10:22:23 +01:00
Monty Marz
a763a865fe
Musical Instruments part 2
2022-11-10 20:59:53 +00:00
Eternalisime
918d5eb345
combat: added a unique kit to roshwalr
2022-11-10 13:53:12 +01: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
Samuel Keiffer
72bffe0df8
Merge branch 'train-tracks' into 'master'
...
Train tracks
See merge request veloren/veloren!3679
2022-11-05 22:56:07 +00:00
Avi Weinstock
f5c1293e9f
Address review comments for MR 3679:
...
- Fix normal vectors/lighting for train tracks.
- Adjust chat command logging statement.
- Remove train tracks when their chunks get unloaded.
- Create a struct for the 6-tuple returned from `get_nearest_ways`.
- Move code that creates the train tracks into `layers::apply_trains_to`.
2022-11-03 15:20:53 -04:00
Joshua Barretto
b64ca9e698
Tweaked door opening, many entities push grass
2022-11-02 14:44:18 +00:00
Avi Weinstock
ff5acf18d7
Doors now animate opening when entities are near them.
2022-11-01 19:29:51 -04:00
flo
da65485228
bats
2022-11-01 15:01:18 +00:00
