Commit Graph

2287 Commits

Author SHA1 Message Date
Marcel
94439a4240 Merge branch 'jtriantafylos/background_fps' into 'master'
Fixes #1350 - Allow players to cap the game FPS when unfocused

Closes #1350

See merge request veloren/veloren!2890
2021-10-10 15:33:38 +00:00
James Triantafylos
99776a6ebd Fixes #1350 - Allow players to cap the game FPS when unfocused 2021-10-10 15:33:31 +00:00
GLawrence29
e7f1260f1d Add catalan (Catalonia) language translation 2021-10-08 19:37:46 +02:00
Treeco
c502bc177a Procgen birches 2021-10-06 02:26:43 +01:00
Joshua Barretto
f13a8a643b Fixed water light extinction 2021-10-05 00:02:34 +01:00
Joshua Barretto
e8021fab2c Cleaned up shrub implementation 2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517 Added sail boat 2021-10-05 00:02:03 +01:00
Joshua Barretto
4aa8a6bb42 Better shrubs 2021-10-05 00:02:02 +01:00
Joshua Barretto
3f7e0a5e52 Added shrub layer with example shrub 2021-10-05 00:02:02 +01:00
Imbris
86bb6f8ef5 Tweaks to the credits.ron file 2021-10-03 16:06:09 -04:00
Imbris
f867991198 Merge branch 'imbris/credits' into 'master'
Add credits screen

Closes #1296

See merge request veloren/veloren!2872
2021-10-03 04:26:58 +00:00
Imbris
d2bd62733f Add core devs to the contributors list in credits.ron and remove placeholder entries in empty art sections (in favor of displaying nothing) 2021-10-03 00:06:47 -04:00
Imbris
691b61e22d Add documentation to credits.ron and fill in fonts entries with actual data, add additional entries to Art credits for documenting information relevant to satifying attribution requirements for some licenses, add/rename license files for fonts, center credits text on the credits screen, added asset_path field to associate art credits with the actual asset files and wrote a unit test to ensure that these paths are valid. 2021-09-30 02:35:59 -04:00
Imbris
40240a4005 Add basic credits screen to the main menu with some example data loaded from a ron file 2021-09-29 21:06:52 -04:00
juliancoffee
8af4cf1a37 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
Sam
70c2e9bebe Cave now uses entity configs. 2021-09-27 15:09:22 +03:00
Sam
56b17e7141 Format fixes. 2021-09-27 15:09:22 +03:00
juliancoffee
2475b97918 Move loot tables to entity configs 2021-09-27 15:09:22 +03:00
juliancoffee
b056cccb0c Hardened loot table handling
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
2021-09-27 15:09:22 +03:00
Sam
09dd9b4813 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Jakub Janeček
8713e56c02 Update assets/voxygen/i18n/cz_CZ/hud/bag.ron, assets/voxygen/i18n/cz_CZ/hud/crafting.ron, assets/voxygen/i18n/cz_CZ/hud/char_window.ron, assets/voxygen/i18n/cz_CZ/hud/chat.ron, assets/voxygen/i18n/cz_CZ/hud/map.ron, assets/voxygen/i18n/cz_CZ/hud/misc.ron, assets/voxygen/i18n/cz_CZ/hud/sct.ron, assets/voxygen/i18n/cz_CZ/hud/settings.ron, assets/voxygen/i18n/cz_CZ/hud/skills.ron, assets/voxygen/i18n/cz_CZ/buff.ron, assets/voxygen/i18n/cz_CZ/char_selection.ron, assets/voxygen/i18n/cz_CZ/common.ron, assets/voxygen/i18n/cz_CZ/gameinput.ron, assets/voxygen/i18n/cz_CZ/main.ron files 2021-09-26 17:15:31 +00:00
Seth
d42d9166a1 Reduce duplication in glider asset identifiers 2021-09-26 13:49:49 +00:00
Samuel Keiffer
0af6969d19 Merge branch 'sam/energy-float' into 'master'
Changed energy to a float

See merge request veloren/veloren!2838
2021-09-25 06:51:21 +00:00
Snowram
0b26f456f9 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
d53d2300a6 Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
Samuel Keiffer
e7ca19b614 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
f82a26e9c5 Don't drop quad_low loot from quad_small fur 2021-09-24 18:03:26 +03:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Imbris
5217b5090c 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
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