Snowram
e9a9f0a278
Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master'
...
Add setting to disable hotkey hints
See merge request veloren/veloren!2849
2021-09-24 16:03:06 +00:00
Bafon
f5c90911ec
Add setting to disable hotkey hints
2021-09-24 16:03:05 +00:00
Samuel Keiffer
4d67f88cea
Merge branch 'juliancoffee/loot_table_fix' into 'master'
...
Don't drop quad_low loot from quad_small fur
See merge request veloren/veloren!2874
2021-09-24 15:59:26 +00:00
juliancoffee
faf0a47d31
Don't drop quad_low loot from quad_small fur
2021-09-24 18:03:26 +03:00
Imbris
51bda3f52b
Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass
2021-09-22 21:58:36 -04:00
Marcel
cde6126fb7
Merge branch 'bafon/crafting-station-icons' into 'master'
...
Add crafting station icon to crafting menu sidebar
See merge request veloren/veloren!2848
2021-09-22 13:54:33 +00:00
Bafon
e2f8468016
Add crafting station icon to crafting menu sidebar
2021-09-22 13:54:32 +00:00
Justin Shipsey
33a1474419
Merge branch 'snowram/wyvern' into 'master'
...
Snowram/wyvern
See merge request veloren/veloren!2847
2021-09-21 14:20:33 +00:00
Marcel
3c72722e48
Merge branch 'kimtinh/add-vietnamese' into 'master'
...
Add Vietnamese translation
See merge request veloren/veloren!2856
2021-09-21 14:10:40 +00:00
Snowram
298c1fbccb
More wyvern anim work
2021-09-21 15:30:42 +02:00
Snowram
7384868c57
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
Mehmet Mallı
0efa41a04d
Update buff.ron
2021-09-19 16:05:04 +00:00
Mehmet Mallı
c1d5e3b0d2
added main Turkish translations
2021-09-19 17:36:31 +03:00
Mehmet Mallı
c8c02fe838
added common Turkish translations
2021-09-19 17:36:05 +03:00
Mehmet Mallı
964c412a7c
changed Turkish translations for uncanny valley in char_selection
2021-09-19 17:35:41 +03:00
Mehmet Mallı
ba3aacb146
added Turkish translations for buffs
2021-09-19 17:35:08 +03:00
Trung Do
b26294885c
Add Vietnamese translation
...
Not translate skills.ron yet.
2021-09-18 17:59:28 +07:00
juliancoffee
294217f0c8
Clean entity assets for a small bit
...
- Move loot_tables/creature/witch to loot_tables/spots/witch
- Move skillset/spots/general_max and skillset/spots/sceptre_max to
skillset/preset/max/{general,sceptre}
- Remove tabs from dwarf_grave_robber entity config file
2021-09-17 20:12:42 +03:00
juliancoffee
feefd36036
Add CapsulePrism collider variant
...
+ Add placeholder physics collision implementation as copy of cylinder
Box collider.
+ Display it with debug hitboxes.
2021-09-17 13:28:34 +03:00
Monty Marz
ad28b2837d
Merge branch 'bafon/always-show-bars-setting' into 'master'
...
Add setting to always show energy bars
See merge request veloren/veloren!2836
2021-09-15 12:04:44 +00:00
Bafon
d076071c13
Add setting to always show energy bars
2021-09-15 12:04:44 +00:00
Sam
7433994fca
Fixed fall damage and sceptre regen.
2021-09-14 06:53:01 -04:00
Marcel
447efa5a2c
Merge branch 'GiocArt/update-it_IT' into 'master'
...
Update to the Italian translations
See merge request veloren/veloren!2830
2021-09-14 09:07:38 +00:00
GiocArt
fa431cebab
Update to the Italian translations
2021-09-14 09:07:38 +00:00
Samuel Keiffer
0f7cd1baa4
Merge branch 'sam/health-float' into 'master'
...
Turned Health into a Float
See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
4338d4db26
Balanced frequency of dungeons.
2021-09-11 18:59:04 -04:00
Imbris
8ef5c60b72
Disable visuals that block seeing camera clipping since they cause flickering, raise max zoom cap with camera, fix overflow issue
2021-09-10 12:16:55 -04:00
Monty Marz
0e0cbae08c
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
a4c6621fa0
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Joshua Barretto
1a55468f59
Made the camera go dark if in a filled block and not moderator
2021-09-08 12:37:15 +01:00
Monty Marz
8506d31736
Bloom settings
2021-09-08 09:50:37 +00:00
jshipsey
1c8e14964d
address comments, boost village pop, lower raid chance
2021-09-06 00:01:26 -04:00
jshipsey
76e8075f8e
buff guards
2021-09-05 23:17:14 -04:00
Joshua Barretto
fd20736cea
Merge branch 'slipped/icons' into 'master'
...
isometric icons
See merge request veloren/veloren!2811
2021-09-05 00:42:54 +00:00
jshipsey
33b0aabe82
isometric icons
2021-09-04 19:51:02 -04:00
Marcel
baa7c93718
Merge branch 'master' into 'master'
...
Added translation for Serbian language
See merge request veloren/veloren!2795
2021-09-04 23:44:22 +00:00
komamch eros
7e91c9e922
Added translation for Serbian language
2021-09-04 23:44:22 +00:00
Joshua Yanovski
81f78b43ce
Revert "Replace shaderc with naga"
...
This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 11:59:18 -07:00
Joshua Barretto
bdb2b06d2c
Merge branch 'slipped/tweaks' into 'master'
...
more spots
See merge request veloren/veloren!2806
2021-09-04 18:16:10 +00:00
Samuel Keiffer
ffbf7cec73
Merge branch 'sam/cultist-raiders' into 'master'
...
Cultist raiders
See merge request veloren/veloren!2807
2021-09-04 17:21:38 +00:00
jshipsey
6919f535d4
address comments
2021-09-04 13:17:56 -04:00
Snowram
c63843bc80
Adds new dungeon entrances
2021-09-04 14:55:55 +02:00
jshipsey
78af24a4ed
more spots
2021-09-04 00:18:58 -04:00
Sam
2fae9d9b56
Cultist enemies are now spawned by rtsim.
2021-09-04 00:05:48 -04:00
juliancoffee
3697cdd6bf
Nerf coin drop from enemies
2021-09-03 01:15:27 +03:00
Sam
a7fd04caf3
Small loot rebalance.
2021-09-01 23:50:17 -04:00
Samuel Keiffer
36c59fcc31
Merge branch 'ubruntu/sometimes-drop-nothing' into 'master'
...
NPCs can drop nothing
See merge request veloren/veloren!2794
2021-09-01 23:17:36 +00:00
ubruntu
5072708123
NPCs can drop nothing
2021-09-01 23:17:36 +00:00
Marcel
b70fc67099
Merge branch 'juliancoffee/i18n_formatting' into 'master'
...
(en) i18n cleaning
See merge request veloren/veloren!2798
2021-09-01 22:47:36 +00:00
juliancoffee
2f6d029d44
(en) i18n cleaning
2021-09-01 19:38:59 +03:00
