Marcel
d5b4c5549b
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
0375b973db
Add crafting station icon to crafting menu sidebar
2021-09-22 13:54:32 +00:00
Justin Shipsey
2c3640b527
Merge branch 'snowram/wyvern' into 'master'
...
Snowram/wyvern
See merge request veloren/veloren!2847
2021-09-21 14:20:33 +00:00
Marcel
a3452af599
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
9acae9fca0
More wyvern anim work
2021-09-21 15:30:42 +02:00
Snowram
834749353a
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
Mehmet Mallı
9745e7db6c
Update buff.ron
2021-09-19 16:05:04 +00:00
Mehmet Mallı
bfb859fff1
added main Turkish translations
2021-09-19 17:36:31 +03:00
Mehmet Mallı
c001d5c0e2
added common Turkish translations
2021-09-19 17:36:05 +03:00
Mehmet Mallı
619bd5b56f
changed Turkish translations for uncanny valley in char_selection
2021-09-19 17:35:41 +03:00
Mehmet Mallı
0444a6808f
added Turkish translations for buffs
2021-09-19 17:35:08 +03:00
Trung Do
2059d39c7e
Add Vietnamese translation
...
Not translate skills.ron yet.
2021-09-18 17:59:28 +07:00
juliancoffee
91dd03b745
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
3b308a3f6f
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
0dfddb21b1
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
b910c1dd9c
Add setting to always show energy bars
2021-09-15 12:04:44 +00:00
Sam
c4c4318ac0
Fixed fall damage and sceptre regen.
2021-09-14 06:53:01 -04:00
Marcel
640d968eff
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
16ec718a67
Update to the Italian translations
2021-09-14 09:07:38 +00:00
Samuel Keiffer
73d3d3e4bb
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
9e9fba7704
Balanced frequency of dungeons.
2021-09-11 18:59:04 -04:00
Imbris
a77f981b15
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
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
42012fddcb
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Joshua Barretto
c3a0a1b8b5
Made the camera go dark if in a filled block and not moderator
2021-09-08 12:37:15 +01:00
Monty Marz
a23433b402
Bloom settings
2021-09-08 09:50:37 +00:00
jshipsey
3c623c6801
address comments, boost village pop, lower raid chance
2021-09-06 00:01:26 -04:00
jshipsey
da9585205c
buff guards
2021-09-05 23:17:14 -04:00
Joshua Barretto
b4697555d2
Merge branch 'slipped/icons' into 'master'
...
isometric icons
See merge request veloren/veloren!2811
2021-09-05 00:42:54 +00:00
jshipsey
1a5fd6cfea
isometric icons
2021-09-04 19:51:02 -04:00
Marcel
9966e5175c
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
a1f2c46f30
Added translation for Serbian language
2021-09-04 23:44:22 +00:00
Joshua Yanovski
5500435d2f
Revert "Replace shaderc with naga"
...
This reverts commit 446d93dda0
.
2021-09-04 11:59:18 -07:00
Joshua Barretto
7538f29b9e
Merge branch 'slipped/tweaks' into 'master'
...
more spots
See merge request veloren/veloren!2806
2021-09-04 18:16:10 +00:00
Samuel Keiffer
3fa89c7a22
Merge branch 'sam/cultist-raiders' into 'master'
...
Cultist raiders
See merge request veloren/veloren!2807
2021-09-04 17:21:38 +00:00
jshipsey
6187cb8d23
address comments
2021-09-04 13:17:56 -04:00
Snowram
ee37c8d62d
Adds new dungeon entrances
2021-09-04 14:55:55 +02:00
jshipsey
523a15e5cc
more spots
2021-09-04 00:18:58 -04:00
Sam
57ba9a0300
Cultist enemies are now spawned by rtsim.
2021-09-04 00:05:48 -04:00
juliancoffee
f88373f7d8
Nerf coin drop from enemies
2021-09-03 01:15:27 +03:00
Sam
daf287a469
Small loot rebalance.
2021-09-01 23:50:17 -04:00
Samuel Keiffer
a733ad00e6
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
bbc366e1b3
NPCs can drop nothing
2021-09-01 23:17:36 +00:00
Marcel
ad5cb064e2
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
f157f8efca
(en) i18n cleaning
2021-09-01 19:38:59 +03:00
Imbris
16e2550e46
Merge branch 'capucho/naga' into 'master'
...
Replace shaderc with naga
See merge request veloren/veloren!2749
2021-08-31 22:38:17 +00:00
João Capucho
446d93dda0
Replace shaderc with naga
2021-08-31 22:53:10 +01:00
Joshua Barretto
b646aae2a4
Removed unused tree assets
2021-08-31 10:15:52 +01:00
Monty Marz
13c15b3840
fix witch hut smoke
2021-08-30 12:03:13 +02:00
Joshua Barretto
9ac5e555e6
Improved giant trees
2021-08-30 00:03:16 +01:00