Acrimon
9c16bae0b2
Merge branch 'master' into 'master'
...
Update tr_TR to new multi file format.
See merge request veloren/veloren!1671
2021-01-14 12:25:22 +00:00
Monty Marz
ce91f28dec
fix loot tables, enemy bar color change
2021-01-09 15:26:24 +01:00
Ben Wallis
8661cb1ffc
Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts
2021-01-08 19:12:09 +00:00
Tadabito
80ebe9d9c1
Update tr_TR to new multi file format.
2021-01-02 12:04:04 +03:00
Vincent Foulon
92cbf6956f
Update i18n's README.md to correct grammar and formatting
...
Address the following reviews:
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145978
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145980
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145981
2020-12-31 12:32:22 +01:00
Vincent Foulon
ccfe0f170a
renamed _root.ron files to _manifest.ron
2020-12-31 12:32:21 +01:00
Vincent Foulon
87906dc5fa
rename a translation file to prevent it from being ignored by git
2020-12-31 12:32:20 +01:00
Vincent Foulon
dbec37e17b
rename a translation file and clear some commented code
2020-12-31 12:32:19 +01:00
Vincent Foulon
87680ba8f1
(temp?) fixed list_localization function + add sub_directories to other languages
2020-12-31 12:32:17 +01:00
Vincent Foulon
1e3d9125aa
convert the other languages into folders
2020-12-31 12:32:16 +01:00
Vincent Foulon
2bed7b4b6c
created LocalizationFragment + load localization sub directories
2020-12-31 12:32:16 +01:00
Vincent Foulon
a42d4559cf
(PoC)(WIP) Convert single translation file to a folder
2020-12-31 12:32:15 +01:00
Joshua Barretto
b18ca4d0e0
Avoid div0 in shiny water shader
2020-12-30 22:18:19 +00:00
Nícolas Wildner
f59a92ab7c
Update pt_BR.ron
2020-12-27 00:09:12 +00:00
Sarra Kitty
81f656ba81
new gliders
...
added sandraptor glider
added sandraptor glider
stuff
working on other raptor gliders
adding file and placeholder model (copy of morpho) for monarch butterfly gliders
adding models for snow and wood raptor gliders
added a proper model for the monarch glider
adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table
made raptors drop their feathers
fmt
2020-12-24 02:54:18 +00:00
Justin Shipsey
25f09921e0
Merge branch 'snowram/npcs-names-json-to-ron' into 'master'
...
Converts npcs names file to ron
See merge request veloren/veloren!1659
2020-12-23 07:43:57 +00:00
unknown
9405a7f6a5
Converts npcs names file to ron
2020-12-23 00:58:25 +01:00
Entropy
43d172a61b
i am stupid and forgot iron ingots, whoops.
2020-12-22 13:07:23 -08:00
Justin Shipsey
e7a885df4d
Merge branch 'entropy9s/BasicIngredients' into 'master'
...
Basic Crafting Ingredients
See merge request veloren/veloren!1609
2020-12-18 20:28:44 +00:00
Entropy
b8394009f3
changed sec count to be consistent w/ other foods
2020-12-17 12:43:33 -08:00
Monty
0a9aed3d11
cleanup, changelog, small bugfixes
...
fmt
fix rebase
fmt
2020-12-14 21:52:24 +01:00
Monty Marz
23a808f721
group member indicator visuals
...
functional group member indicators
adjust visuals
z-comparison
2020-12-14 21:16:13 +01:00
Joshua Barretto
2f1ce07f5a
Merge branch 'zesterer/gfx' into 'master'
...
Made LoD water reflective
See merge request veloren/veloren!1632
2020-12-14 18:49:59 +00:00
Snowram
f08a9545d9
Merge branch 'snowram/objects-offsets-ron' into 'master'
...
Put objects offsets into a .ron file
See merge request veloren/veloren!1627
2020-12-14 18:00:07 +00:00
Joshua Barretto
1b88f1d9dc
Made LoD water reflective
2020-12-14 16:52:33 +00:00
Snowram
577447df76
Puts objects offsets into a .ron file
2020-12-14 02:43:49 +01:00
Samuel Keiffer
7f7fc3a757
Merge branch 'nahua/replace_sceptre_m2_sound' into 'master'
...
Issue 872: Replace explosion sound with heal bomb sound for sceptre M2
See merge request veloren/veloren!1618
2020-12-13 23:18:30 +00:00
nahuakang
ef5efa738c
Replace explosion sound with heal bomb sound for sceptre M2
2020-12-13 22:09:28 +01:00
Entropy
600bd474b9
extraneous periods go away
2020-12-11 19:20:36 -08:00
Entropy
ba25097da7
Adding some basic consumable crafting ingredients
...
more stuff being squashed in. tons of non-food items added
2020-12-11 19:20:35 -08:00
Marcel
451dee10e9
Merge branch 'DaforLynx/campfire-loading-tip' into 'master'
...
Loading screen tip for campfire healing
See merge request veloren/veloren!1601
2020-12-12 00:29:57 +00:00
DaforLynx
cb60473858
Loading screen tip for campfire healing
2020-12-12 00:29:57 +00:00
Marcel
66af498adc
Merge branch 'jacki/german' into 'master'
...
Updated de_DE translation
See merge request veloren/veloren!1572
2020-12-11 23:51:00 +00:00
Tobias Frisch
87abadd384
Updated de_DE translation
...
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
2020-12-11 23:51:00 +00:00
Vincent Foulon
e029a14568
Update French Translation
2020-12-11 23:29:44 +00:00
Monty Marz
daf8354c9f
Better group frame placement
2020-12-10 21:31:19 +01:00
Snowram
783e784e50
Makes consumables heal faster
2020-12-10 18:06:32 +01:00
Pfauenauge90
f0e63ecbcb
adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes
2020-12-10 18:06:31 +01:00
Monty Marz
565c304a4c
add baobabs, fix map difficulty, make mushrooms lootable
2020-12-10 18:06:29 +01:00
Justin Shipsey
c42cdc685c
Merge branch 'snowram/fishes' into 'master'
...
Add fishes
See merge request veloren/veloren!1577
2020-12-09 02:59:55 +00:00
Entropy
704e37d3e5
changed kickers to use 3 leather
2020-12-08 16:27:21 -08:00
Snowram
87e8c2189f
Vacations are never over
2020-12-08 23:03:40 +01:00
Snowram
6f200ffe93
Improves fish_small, new npc
2020-12-08 23:03:39 +01:00
Snowram
80fbf6e225
Initial fish work
2020-12-08 23:03:38 +01:00
Sam
bdd1a605ab
Modified how most abilites that could scale were scaled.
2020-12-07 22:00:24 -06:00
Joshua Barretto
309dcd2acb
Added cave mushrooms
2020-12-05 18:00:29 +00:00
Joshua Barretto
83c403aff3
Better aurora
2020-12-05 11:20:25 +00:00
Joshua Barretto
b82f4f6cad
Better mist access
2020-12-05 11:20:25 +00:00
James Melkonian
6b100bce79
Aura System and Campfire Health Regen
2020-12-04 22:24:56 +00:00
iOddishGX
9d45d069b4
Lowered the energy cost from 80 to 40
...
Increased the healing multiplier
Lowered the damage output
Increased the radius
Made the projectile slightly faster
2020-12-01 20:01:24 +00:00
