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
11,483 Commits 151 Branches 18 Tags 2.1 GiB
894e94bb2c
Commit Graph

579 Commits

Author SHA1 Message Date
Marcel Märtens
5012e2ba8b rename hud_settings to settings 2021-08-01 13:47:03 +02:00
Marcel Märtens
bb026ca21b move vector map out of manifest and switch to new manifest format 2021-08-01 13:12:01 +02:00
Marcel Märtens
49072702bc fix #1258 2021-08-01 11:20:51 +02:00
Marcel Märtens
2fd26bf41c make folders POSIX style and move skills to hud 2021-08-01 10:56:10 +02:00
Joshua Barretto
f51c4ed860 Merge branch 'zesterer/menacing' into 'master' 
Added menacing, made agent code less hacky

See merge request veloren/veloren!2707
 2021-08-01 00:27:02 +00:00
Imbris
97e5ad02ff Merge branch 'imbris/stamina-energy' into 'master' 
Replace stamina with energy

Closes #1214

See merge request veloren/veloren!2704
 2021-08-01 00:26:59 +00:00
Joshua Barretto
422e1c30f4 Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Monty Marz
f3d0d3f46a fix i18n 2021-07-31 18:17:34 +02:00
Imbris
c5c8ae4d30 Replace stamina -> energy in english localization strings 2021-07-31 01:35:28 -04:00
Imbris
89eee332c9 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Monty Marz
14eb0f9aa2 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Marcel
7ef11a41ef Merge branch 'fungoid/add_fr_translation_for_gameinput.greet' into 'master' 
Added fr translation for gameinput.greet

See merge request veloren/veloren!2685
 2021-07-28 15:52:16 +00:00
Marcel
7a3755b7b0 Merge branch 'tygyh/Update-missing-swedish-translations' into 'master' 
Tygyh/update missing swedish translations

See merge request veloren/veloren!2667
 2021-07-27 11:14:52 +00:00
Jonathan Berglin
a564602495 Tygyh/update missing swedish translations 2021-07-27 11:14:52 +00:00
Nico Janzen
84b010f16f Fix spelling errors in German translations 2021-07-27 11:06:22 +00:00
Alexis Maheu
9ed6abd3d7 Added fr translation for gameinput.greet 2021-07-26 20:29:30 -04:00
DanTheOne
18b5c1c35a Add shortcut to toggle chat 2021-07-26 02:42:35 +02:00
juliancoffee
7386da743e (uk_UA) address feedback 2021-07-24 18:34:57 +03:00
juliancoffee
2e72f5e1c2 (uk_UA) misc hud translation 2021-07-24 01:50:14 +03:00
juliancoffee
d1f9e34fc3 (uk_UA) force update 2021-07-24 01:13:50 +03:00
juliancoffee
0e3e3bef4e (uk_UA) MEAT translation 2021-07-24 01:13:02 +03:00
juliancoffee
eb3dd0a812 (uk_UA) graphics settings translation 2021-07-24 00:26:38 +03:00
juliancoffee
70a390e1d2 (uk_UA) frozen outcome translation 2021-07-24 00:12:41 +03:00
juliancoffee
c55bcd3475 (uk_UA) gameinput.greet translation 
Здоровенькі були
 2021-07-24 00:07:26 +03:00
juliancoffee
d0b15fa042 (uk_UA) update debuff translation 2021-07-24 00:03:34 +03:00
juliancoffee
a1bc725654 (uk_UA) update mining skills translation 2021-07-23 23:07:15 +03:00
juliancoffee
226dcb9f1a (uk_UA) update healing aura skill translation 2021-07-23 22:44:14 +03:00
juliancoffee
5516e91cfe (uk_UA) update bow skills translation 2021-07-23 22:18:49 +03:00
schnippl0r
342de16d2e Added en and de_DE translations for gameinput.greet. 2021-07-20 21:59:18 +02:00
Knightress Paladin
42c3872528 Added healing aura duration skill to voxygen UI 2021-07-10 20:02:36 -07:00
Szabó Lambert
0140e75ed4 Updating the Hungarian translation (minor changes in 6 files, major changes in 14 files) 2021-07-10 17:25:56 +00:00
Samuel Keiffer
351a68944b Merge branch 'juliancoffee/skill_truth' into 'master' 
Move skill boost modifiers to skills module

See merge request veloren/veloren!2540
 2021-07-09 23:05:48 +00:00
Monty Marz
7c8d73a0c6 Minimap modes, Danari customizations update & bald hairstyles 2021-07-08 00:01:08 +00:00
juliancoffee
20c0c7f44f Use code-spliced values for i18n skill description 2021-07-07 17:51:30 +03:00
Swagazaki
cb3e932832 Just updated common.ron to correct a few French translations! 2021-07-07 10:55:15 +00:00
Ács Zoltán
9fbd8ae5ce Add Hungarian translation 2021-07-05 15:14:35 +02:00
Marcel
f063dcd939 Merge branch 'alphyr/assets_manager0_5' into 'master' 
Update `assets_manager` to 0.5

See merge request veloren/veloren!2501
 2021-06-27 15:50:16 +00:00
Nícolas Wildner
81010e8465 Update pt br 20210627 2021-06-27 03:26:44 +00:00
Benoît du Garreau
1cba7db9b6 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
juliancoffee
1eb9c165be (uk_UA) small fitting fix 2021-06-24 19:52:38 +03:00
Sam
0a32b676c8 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Joshua Barretto
b84708ca75 Added chat toggle 2021-06-21 20:16:03 +01:00
jshipsey
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
K. Kisa
fbb34b7331 Veloren/veloren/master 2021-06-15 16:36:41 +00:00
Marcel
1b36f6cab3 Merge branch 'aweinstock/forcemove-no-pushback' into 'master' 
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
 2021-06-14 14:42:01 +00:00
Marcel
4cafdb3bfd Merge branch 'aweinstock/mining-skill-tree' into 'master' 
Mining skill tree.

See merge request veloren/veloren!2406
 2021-06-14 14:19:06 +00:00
Marcel
0ef6cc6576 Merge branch 'Veloren_Kisa-master-patch-51169' into 'master' 
Не полный перевод навыков, исправлены оригинальные описания и названия.

See merge request veloren/veloren!2432
 2021-06-13 21:55:57 +00:00
Marcel
4ea189f056 Merge branch 'Veloren_Kisa-master-patch-14791' into 'master' 
Полный перевод на русский язык

See merge request veloren/veloren!2434
 2021-06-13 21:55:55 +00:00
Monty Marz
01a04a80fa icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
0e394029de Mining skill tree. 2021-06-13 14:34:42 -04:00
K. Kisa
883297d4cc Upload New File 2021-06-13 13:30:42 +00:00
K. Kisa
acb0589277 Полный перевод на русский язык 2021-06-13 13:24:57 +00:00
K. Kisa
2e305744fe Не полный перевод навыков, исправлены оригинальные описания и названия. 2021-06-13 13:08:52 +00:00
Avi Weinstock
d02ff2db20 Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
João Victor Cardoso Kdouk
228d2f05a6 Small fixes to pt_br language. 2021-06-09 14:36:10 +00:00
Marcel Märtens
e96dc21d30 fix swedish ron files 2021-06-07 12:02:02 +02:00
Marcel
97b7c8d68a Merge branch 'master' into 'master' 
Update Swedish translation

See merge request veloren/veloren!2380
 2021-06-07 09:42:09 +00:00
Sam
0488b2fcd0 Adressed comments on energy and armor functions. 2021-06-07 11:06:25 +02:00
Snowram
76ca99ece4 Derive str from Material, better deserialization 2021-06-07 11:03:50 +02:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
0e269b59d7 tooltip work 2021-06-07 11:01:32 +02:00
Snowram
29a38e6d4f Split tags into material class and material 2021-06-07 11:00:57 +02:00
Snowram
3fa7d0b6d4 Add material and armor class tags 2021-06-07 11:00:31 +02:00
jshipsey
7a573efab7 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
754b60d810 crafting stations 2021-06-07 10:59:35 +02:00
Filip Bengtsson
172c96d83d Missed strings 2021-06-06 17:48:09 +02:00
Filip Bengtsson
cba9affbb3 Strings in various files 2021-06-06 01:05:08 +02:00
Filip Bengtsson
fcc266bfa8 Translate trade.ron 2021-06-06 00:42:50 +02:00
Filip Bengtsson
1b6c43dfe2 Translate social.ron 2021-06-06 00:42:07 +02:00
Filip Bengtsson
3e37549518 Translate sct.ron 2021-06-06 00:40:30 +02:00
Filip Bengtsson
5191a90432 Translate misc.ron 2021-06-06 00:39:55 +02:00
Filip Bengtsson
3cbf362462 Translate hud/map.ron 2021-06-06 00:34:06 +02:00
Filip Bengtsson
28c44b6bb9 Translate hud/hud_setting.ron 2021-06-06 00:32:16 +02:00
Filip Bengtsson
12ba5e1848 Translate hud/group.ron 2021-06-06 00:07:53 +02:00
Filip Bengtsson
1841923795 Translate hud/crafting.ron 2021-06-06 00:07:03 +02:00
Filip Bengtsson
f9e42f4107 Translate hud/chat.ron 2021-06-06 00:06:05 +02:00
Filip Bengtsson
10ac6b3d4c Translate hud/char_window.ron 2021-06-06 00:00:51 +02:00
Filip Bengtsson
fd608ccb6f Translate hud/bag.ron 2021-06-05 23:39:24 +02:00
Filip Bengtsson
f111b87fe5 template.ron boilerplate 2021-06-05 23:33:54 +02:00
Filip Bengtsson
6277106e78 Start translating skills.ron 2021-06-05 23:25:11 +02:00
Filip Bengtsson
cf051fd9fb Translate main.ron 2021-06-05 23:13:42 +02:00
Filip Bengtsson
37c12977c1 Translate most of gameinput.ron 2021-06-05 23:08:59 +02:00
Filip Bengtsson
cb0f00d447 Translate esc_menu.ron 2021-06-05 23:04:55 +02:00
Filip Bengtsson
35f7c206e5 Translate most of common.ron 2021-06-05 23:03:48 +02:00
Filip Bengtsson
8db65e0554 Translate char_selection.ron 2021-06-05 22:45:55 +02:00
Filip Bengtsson
d663d05f4f Translate buff.ron 2021-06-05 22:28:01 +02:00
Filip Bengtsson
d0bb260057 Translate _manifest.ron 2021-06-05 14:26:00 +02:00
Filip Bengtsson
6df35564c2 Copy files from English 2021-06-05 13:26:41 +02:00
Sam
c81e1534f7 First 3 abilities for tidal warrior functional. Added bubble particles. 2021-06-03 21:39:13 -05:00
Avi Weinstock
cf6717ac90 Show hitbox cylinders based on actual ECS data, and add a settings toggle in voxygen for it. 2021-06-03 00:10:06 -04:00
Imbris
d8520c8743 Add localization text for GPU timing checkbox 2021-06-03 00:10:06 -04:00
Imbris
e1af485e5f Add setting for the PresentMode 2021-06-02 23:59:49 -04:00
Avi Weinstock
6d3dcc3835 Address MR 2301 review comments. 
- Replace tabs with spaces in map-related i18n.
- Use `retain` in `remove_unloaded_chunks`.
 2021-06-02 00:39:58 -04:00
Avi Weinstock
cbe7521259 Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry. 2021-06-02 00:39:04 -04:00
Adam Whitehurst
77cb2ae783 fix: commas 2021-05-30 14:47:42 -07:00
Adam Whitehurst
9eefa89f90 feat: add frozen debuff icon, en strings 2021-05-30 08:49:32 -07:00
Justin Shipsey
d7c7f6bf5d Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request veloren/veloren!2310
 2021-05-26 04:44:09 +00:00
hqurve
854930bc1a Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Sam
7828112486 Balance tweaks. 2021-05-22 15:00:05 -05:00
Illia Denysenko
1b5f06cff9 update uk ua 2021-05-22 18:58:11 +00:00
Sam
1014ac45bf Made new skills for reworked bow. 
Created migration to reset bow skills.
 2021-05-22 12:33:21 -05:00
Samuel Keiffer
a0599ac046 Merge branch 'sam/extra-equip-slots' into 'master' 
Added Extra Loadout Slots

See merge request veloren/veloren!2295
 2021-05-21 20:28:53 +00:00
hqurve
6974ab9199 Added swap_equipped_weapons icon and resized inactive weapons 2021-05-17 15:35:27 -04:00
Nícolas Wildner
68f3359238 Update pt br 20210517 2021-05-17 18:12:20 +00:00
hqurve
a4384b81c7 Add offhand weapons to bag ui 2021-05-16 20:43:19 -04:00
Marcel
740ec3208d Merge branch 'xMAC94x/czech' into 'master' 
add czech language. fixed #1044

Closes #1044

See merge request veloren/veloren!2297
 2021-05-16 16:39:51 +00:00
Marcel
695ffa96b9 Merge branch 'juliancoffee/update-it_IT' into 'master' 
update Italian translation by 'Чингис Хан'

See merge request veloren/veloren!2305
 2021-05-14 15:35:05 +00:00
juliancoffee
776f772b58 update Italian translation by 'Чингис Хан' 2021-05-14 17:31:01 +03:00
hqurve
95a6e35a3a Added chat tabs 2021-05-14 12:27:15 +00:00
Marcel Märtens
962f8b982c add czech language. fixed #1044 2021-05-12 22:36:11 +02:00
Monty Marz
a17bb0ad73 Better inactive/active audio slider logic 2021-05-09 09:51:41 +00:00
Nícolas Wildner
f517b06d50 Update pt br 20210507 2021-05-07 20:07:14 +00:00
Illia Denysenko
07ba3e659d Update uk_UA 2021-05-07 14:32:03 +00:00
Sam
062c290e49 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Sam
2652660a58 Addressed comments and more testing feedback. 2021-05-04 08:45:14 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
d1139c3b7c Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Illia Denysenko
f04a4f907a Add possibility to translate buff outcomes 2021-05-03 23:02:59 +00:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
James Melkonian
f553700e8c Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
Joshua Barretto
d0953fcab0 Added map marker 2021-05-01 16:26:13 +00:00
Jan Dre
8f5370f372 German translation 2021-04-30 11:58:31 +00:00
Daniel Mizerski
ec55c176fe Polish translations update. 2021-04-27 17:33:30 +02:00
Samuel Keiffer
3f451ef7b3 Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master' 
Fix campfire heal buff description

See merge request veloren/veloren!2165
 2021-04-25 23:06:48 +00:00
Illia Denysenko
efd54021a7 Fix campfire heal buff description 2021-04-25 23:06:47 +00:00
Monty
2e24fcf165 Add i18n, change SCT Blocked col and string 2021-04-25 13:09:09 -04:00
Ada Lovegirls
01c30868eb Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee Merge branch 'xvar/server-version-check' into 'master' 
Added client/server version mismatch warnings

See merge request veloren/veloren!2184
 2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f Added client/server version mismatch message when a network error is encountered during client init. 
Added warning banner on character select when successfully connected to a server with a mismatched version.
 2021-04-24 09:08:30 +01:00
holychowders
516f2fec4a Fix grammatical error in NPC message 2021-04-23 22:43:37 -07:00
Illia Denysenko
4e7aba5b3f update uk_UA localization 2021-04-23 21:30:46 +00:00
Nícolas Wildner
6188bb9e96 update pt_br 20210422 2021-04-23 01:00:41 +00:00
Monty
a4d56e7843 more sprite stuff and crafting UI update 
fix item images
fix CR display
 2021-04-20 02:46:06 +02:00
Imbris
8c9d4dc3dd Merge branch 'capucho/inactive-master' into 'master' 
Lower volume of window on focus loss

See merge request veloren/veloren!2150
 2021-04-19 20:39:49 +00:00
Marcel
c5caec4921 Merge branch 'capucho/map-kb-zoom' into 'master' 
Add keybindings for map/minimap zoom

See merge request veloren/veloren!2161
 2021-04-19 19:52:27 +00:00
João Capucho
164411cb43
Voxygen: Added translations for map zoom 2021-04-19 20:27:02 +01:00
Illia Denysenko
ef8926bc5c Update localization for uk_UA 2021-04-19 19:26:20 +00:00
João Capucho
f23b515dd8
Voxygen: Add master volume sliders to the settings 2021-04-19 19:58:14 +01:00
Sam
ce7581037c Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Samuel Keiffer
60d38cc03b Merge branch 'aweinstock/dodgesplosion' into 'master' 
Unlock dodge roll iframes and staff explosion by default.

See merge request veloren/veloren!2146
 2021-04-18 20:46:15 +00:00
Avi Weinstock
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Marcel
62fcdcd998 Merge branch 'nwildner/update_pt_BR_20210417' into 'master' 
update pt_br 20210417

See merge request veloren/veloren!2143
 2021-04-18 19:33:39 +00:00
Nícolas Wildner
24b55d0f07 update pt_br 20210417 2021-04-18 19:33:39 +00:00
Ben Wallis
a4cdb89987 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Marcel
2a0c8e575f Merge branch 'kinggred-master-patch-80352' into 'master' 
Update main.ron

See merge request veloren/veloren!2123
 2021-04-17 18:28:31 +00:00
Samuel Keiffer
c962c5f12e Merge branch 'gGmMsS/Burning' into 'master' 
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
 2021-04-15 23:51:33 +00:00
gGmMsS123
e33961e1fa M2 Staff Final Touch 2021-04-16 00:34:24 +03:00
gGmMsS123
0d956610ec Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
Avi Weinstock
2fb7575d60 Address MR 2126 comments. 2021-04-15 15:17:39 -04:00
Avi Weinstock
50d0314a75 Add a toggle to negotiate the use of server-authoritative physics. 2021-04-15 08:50:17 -04:00