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
6,740 Commits 151 Branches 18 Tags 2.1 GiB
911c0b7157
Commit Graph

246 Commits

Author SHA1 Message Date
Monty Marz
e5273e3a8e reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button 2021-02-27 19:02:26 +00:00
Snowram
914266c705 Merge branch 'nwildner/pt_BR_trade-updates' into 'master' 
pt br trade updates

See merge request veloren/veloren!1810
 2021-02-23 23:21:30 +00:00
Nícolas Wildner
e4f8a9ed6c pt br trade updates 2021-02-23 23:21:30 +00:00
Marcel
72bd0f42fc Merge branch 'xMAC94x/prot_improvements' into 'master' 
xMAC94x/prot_improvements

See merge request veloren/veloren!1796
 2021-02-22 22:47:43 +00:00
Marcel Märtens
3f5c64bec0 Client::new can now resolve DNS requests, better networking error messages 2021-02-22 17:35:19 +01:00
steanne
838a0d8928 Update _manifest.ron for minor typos in villager statements 2021-02-22 00:04:02 +00:00
Avi Weinstock
559ad7b7f5 Client-side trade improvements. 
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
 2021-02-19 15:20:27 -05:00
Nícolas Wildner
7a29cc9eff creating char_selection.ron plus minor portuguese fixes for better formal language (like olhos - eyes and not olho) 2021-02-17 08:28:04 +00:00
TheThirdSpartan
f10f88081d Small chat message formatting changes and fixed missing player alias during admin entity possession 2021-02-17 02:15:45 +00:00
Avi Weinstock
abb5684883 Trade implementation progress. 
- Accept/decline buttons that submit the proper messages
- A phase2 screen that renders the (item, quantity) pairs as text
- More checks in the trade state machine server-side.
 2021-02-12 18:43:10 -05:00
Avi Weinstock
e2b55e0706 Implement enough of a trade UI that dragging & dropping items into it round-trips between clients. 2021-02-12 18:43:09 -05:00
Avi Weinstock
e9b811b62b Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement. 2021-02-12 18:43:09 -05:00
Avi Weinstock
250391656f Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key). 2021-02-12 18:43:09 -05:00
Andrii Zymohliad
7be836318b Update Ukrainian translation 2021-02-03 16:18:49 +00:00
James Melkonian
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
DaforLynx
c6e262c4ce Small audio fixes; addresses #939 and #940 2021-01-29 11:37:10 +00:00
Sam
6dd740feaa Nerfed bow M1 and M2, slightly buffed bow skillbar ability. 2021-01-24 14:24:59 -05:00
Sam
5e4b6809ca Sceptre nerfs. 2021-01-22 22:46:18 -05:00
Acrimon
21ecb15571
build tip 2021-01-19 19:02:41 +01:00
Monty
5362000de4 adjusted potions, refined level up message animation 
fixed incorrect translation used on axe double strike regen skill

Changed migration so that skills and skill groups foreign key to entity_id instead of character_id
 2021-01-19 08:08:14 -05:00
Monty Marz
de5c5702b3 stats display 
Addressed comments.

Addressed comments.
 2021-01-19 08:08:11 -05:00
Sam
c809569f6b Added level up sound to skill point gain. Fixed tests. 
Fixed duplicate roll description.
 2021-01-19 08:08:08 -05:00
Noé
acbd965e65 implemented en translation for Hammer, Bow, Scepter and Staff skills 
skill tree translation

Clamped earning SP to avoid u16 overflow.

translation fixes

Fixed exp scaling function

Fixed exp scaling function

remove debug combat rating display

Update overhead.rs

implemented en translation for Axe
 2021-01-19 08:08:02 -05:00
Sam
a606313856 Added scaling exp costs per skill point. 
Fix tooltip being red.

multiple fixes, started translation

change exp giving items
adjust loot tables
adjust combat rating indicators
fix group frame offsets
 2021-01-19 08:07:57 -05:00
Sam
986c05621a Wired up skill UI to check for prerequisites being met and sufficient skill points. 
available SP check in general HUD, more skill icons

Trimmed 2000 lines from a file.

UI tweaks
 2021-01-19 08:07:45 -05:00
Sam
4b52574750 Skill point gains are displayed in hud. 
level up message visuals and functionality

Handles simultaneous skill point gains in UI.
 2021-01-19 08:07:41 -05:00
Monty Marz
3f436079e8 Skill-Tree UI 
switchable tabs
rework icons, fix cursor toggle
auto slot placing

Bow leap skill changed to bow glide skill.
 2021-01-19 08:07:06 -05:00
Jesus Bracho
ec79890335 Provide buff information on killed entities 2021-01-18 05:46:53 +00:00
Acrimon
c5e3828c64 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
Ben Wallis
aef2637288 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
db9a6a4cec Update tr_TR to new multi file format. 2021-01-02 12:04:04 +03:00
Vincent Foulon
da81b2f0b2 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
7a4c3fa9a6 renamed _root.ron files to _manifest.ron 2020-12-31 12:32:21 +01:00
Vincent Foulon
b3758d12e4 rename a translation file to prevent it from being ignored by git 2020-12-31 12:32:20 +01:00
Vincent Foulon
7150e1f820 rename a translation file and clear some commented code 2020-12-31 12:32:19 +01:00
Vincent Foulon
bb7cc3d53b (temp?) fixed list_localization function + add sub_directories to other languages 2020-12-31 12:32:17 +01:00
Vincent Foulon
00140384f7 convert the other languages into folders 2020-12-31 12:32:16 +01:00
Vincent Foulon
3295ff2c58 created LocalizationFragment + load localization sub directories 2020-12-31 12:32:16 +01:00
Vincent Foulon
924c24fa78 (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
Nícolas Wildner
dc46618b4c Update pt_BR.ron 2020-12-27 00:09:12 +00:00
Marcel
e54b4d5797 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
70814ee922 Loading screen tip for campfire healing 2020-12-12 00:29:57 +00:00
Marcel
9b1bc41f6e 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
23e3964059 Updated de_DE translation 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
 2020-12-11 23:51:00 +00:00
Vincent Foulon
2503d79567 Update French Translation 2020-12-11 23:29:44 +00:00
Pfauenauge90
6d1bae67d0 adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes 2020-12-10 18:06:31 +01:00
James Melkonian
71303fecfd Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
Snowram
b316e9aa7c Updates ru_RU translation 2020-11-26 22:59:39 +01:00
Andrii Zymohliad
733a471090 Added Ukrainian translation 2020-11-25 17:21:32 +00:00
Yusuf Bera Ertan
3c887315ae
update Turkish translations 2020-11-25 15:46:56 +03:00