Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,037 Commits 151 Branches 18 Tags
1e7436954e
Commit Graph

2291 Commits

Author SHA1 Message Date
Marcel
1e7436954e Merge branch 'Limofeus/russian_translation_updates' into 'master' 
Limofeus/russian translation updates

See merge request
2021-10-12 17:15:49 +00:00
Limofeus
05431ef391 Upd - removed mixed up tabs and spaces 2021-10-12 19:18:11 +03:00
GLawrence29
49c6156028 i18n: Revised catalan (Catalonia) translation 2021-10-12 15:16:25 +02:00
Limofeus
38f40ac7bc Upd - Skills, Settings labels, Tools and Credits translations added 2021-10-12 16:09:55 +03:00
Marcel
be557a7dfc Merge branch 'jtriantafylos/background_fps' into 'master' 
Fixes  - Allow players to cap the game FPS when unfocused

Closes 

See merge request
2021-10-10 15:33:38 +00:00
James Triantafylos
88216c8e9a Fixes - Allow players to cap the game FPS when unfocused 2021-10-10 15:33:31 +00:00
GLawrence29
a60c19667e Add catalan (Catalonia) language translation 2021-10-08 19:37:46 +02:00
Treeco
93763c7e43 Procgen birches 2021-10-06 02:26:43 +01:00
Joshua Barretto
fb0325a80e Fixed water light extinction 2021-10-05 00:02:34 +01:00
Joshua Barretto
631d8c6603 Cleaned up shrub implementation 2021-10-05 00:02:03 +01:00
Joshua Barretto
59c8ee3c70 Added sail boat 2021-10-05 00:02:03 +01:00
Joshua Barretto
9ce37c8a2e Better shrubs 2021-10-05 00:02:02 +01:00
Joshua Barretto
8e01bb4bea Added shrub layer with example shrub 2021-10-05 00:02:02 +01:00
Imbris
e5442c3f20 Tweaks to the credits.ron file 2021-10-03 16:06:09 -04:00
Imbris
6f28f80e16 Merge branch 'imbris/credits' into 'master' 
Add credits screen

Closes 

See merge request
2021-10-03 04:26:58 +00:00
Imbris
d77a0779ca 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
4e9007b45a 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
065654f451 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
98382ea012 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
Sam
482194decb Cave now uses entity configs. 2021-09-27 15:09:22 +03:00
Sam
99e19dc5d0 Format fixes. 2021-09-27 15:09:22 +03:00
juliancoffee
38c004d494 Move loot tables to entity configs 2021-09-27 15:09:22 +03:00
juliancoffee
b53643e12a 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
06f3e04034 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Jakub Janeček
8334556c6c 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
f99211d482 Reduce duplication in glider asset identifiers 2021-09-26 13:49:49 +00:00
Samuel Keiffer
fcd865a3c7 Merge branch 'sam/energy-float' into 'master' 
Changed energy to a float

See merge request
2021-09-25 06:51:21 +00:00
Snowram
e9a9f0a278 Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master' 
Add setting to disable hotkey hints

See merge request
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
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
Sam
961782851f 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
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
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
2021-09-21 14:20:33 +00:00
Marcel
3c72722e48 Merge branch 'kimtinh/add-vietnamese' into 'master' 
Add Vietnamese translation

See merge request
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
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