Commit Graph

236 Commits

Author SHA1 Message Date
Avi Weinstock
0e394029de Mining skill tree. 2021-06-13 14:34:42 -04:00
Avi Weinstock
d02ff2db20 Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04: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
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
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
hqurve
95a6e35a3a Added chat tabs 2021-05-14 12:27:15 +00:00
Monty Marz
a17bb0ad73 Better inactive/active audio slider logic 2021-05-09 09:51:41 +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
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
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
João Capucho
164411cb43
Voxygen: Added translations for map zoom 2021-04-19 20:27:02 +01: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
Avi Weinstock
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Ben Wallis
a4cdb89987 Implemented inventory sorting 2021-04-17 22:04:08 +01: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
Rickey Chamblee
8a25ebb59a Show ctrl-click and shift-click usage in item tooltips during trades. 2021-04-11 22:56:02 +00:00
Monty Marz
6772e71aaa UI fixes and more 2021-04-11 03:49:47 +00:00
Joshua Yanovski
af94753ad9 Remove panics and unwraps, part 1.
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
hqurve
be42cc60c4 Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window 2021-04-07 20:24:22 +00:00
Vincent Foulon
5e23c164e6 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
James Melkonian
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
Joshua Barretto
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Samuel Keiffer
3c50321a80 Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.

See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
Samuel Keiffer
f79493f7d0 Merge branch 'sam/sceptre-nerfs' into 'master'
Sam/sceptre nerfs

See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
Joshua Barretto
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
Sam
ba0b6c309b Flattened roll progression. 2021-04-05 17:50:53 -04:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
theCow61
b99c02401d Change to auto walk/glide. 2021-04-05 16:07:17 -05:00
Snowram
9a3f6d8261 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
Vincent Foulon
dcde8df365 address review comments 2021-04-01 19:13:08 +02:00
Vincent Foulon
c2a8feada5 Add dialogue when the Merchant is busy and randomize some trading dialogues 2021-03-31 19:06:41 +02:00
Snowram
606dd64741 Fix a staff icon, some offset fixes, lower wolf spawn rate 2021-03-30 00:27:03 +02:00
Snowram
6adaac8106 Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
b8ac90d049 Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Snowram
508e35ca17 Add several new i18n lines 2021-03-29 18:34:45 +02:00
Scott Williams
9ca0388561 Character Creation Randomization Fix 2021-03-27 15:58:34 +00:00
aljazerzen
0ea102dc9c refactor handling of duplicate login 2021-03-25 12:33:56 +01:00
Avi Weinstock
4ec6b43693 Add a vertical camera clamp option and toggle to voxygen. 2021-03-23 18:22:32 -04:00
Vincent Foulon
e06870702f Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Vincent Foulon
d0aa68a9d2 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Tormod G. Hellen
f695b11171 Add monologue strings. 2021-03-17 01:58:12 +01:00
Monty Marz
e9cbac387e new loading bg, staff models
item images

fix paths

loot tables, adjustments

Update main.ron
2021-03-16 23:23:24 +00:00
James Melkonian
6ea43cfd75 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
DaforLynx
f924e047ac Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981 2021-03-14 12:18:29 -07:00
PersianKnight
b87514266d Bug fix debug info hotkey and axe skill tree text 2021-03-14 20:16:54 +03:30
DaforLynx
99261bf105 Many small changes to audio code, mainly sfx - changelog in MR 2021-03-12 15:00:09 -08:00
Marcel
93cab075f8 Merge branch 'xMAC94x/non_blocking_register' into 'master'
Auth requests are now done async, the register system is fetching it, via a PendingLogin component

See merge request veloren/veloren!1875
2021-03-11 21:51:55 +00:00
Joshua Barretto
a9bcaf0a37 Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master'
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings

See merge request veloren/veloren!1877
2021-03-11 21:29:11 +00:00
PersianKnight
3b3ffe30e9 Add Reset to Default Buttons for Interface, Gameplay and Sound Settings 2021-03-11 22:09:30 +03:30
Samuel Keiffer
9b198b5cda Merge branch 'sam/sceptre-overhaul' into 'master'
Overhaul sceptre

Closes #768

See merge request veloren/veloren!1845
2021-03-11 16:47:50 +00:00
Marcel Märtens
728bff610b Allow HTTP auth servers again.
only `localhost` are allowed in a release build.
 when debug assertions are on, others are also allowed.

This change undoes the changes to the settings, so compared to master, there is no effect
2021-03-11 17:24:52 +01:00
Marcel Märtens
a98e72c391 Auth requests are now done async, the register system is fetching it, via a PendingLogin component
The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without.
correct is now `auth.veloren.net`
incorrect is: `https://auth.veloren.net`
2021-03-11 17:05:02 +01:00
omm
ef7b215f07 File structure for lang es_ES aligned with EN 2021-03-11 12:08:37 +00:00
Sam
16222948a3 Sceptre skill tree and migration. 2021-03-09 18:02:07 -05:00
Sam
398370ca51 Changed lifesteal beam particles to look better.
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
2021-03-09 17:59:41 -05:00
Adam Blanchet
16b66f9cd6 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Joshua Barretto
0cbdc2b1b7 Better tree names 2021-03-07 14:25:07 +00:00
Joshua Barretto
db573f6b2d Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Vincent Foulon
fb953cc7f4 implement the new skilltree icons 2021-03-04 18:37:32 +00:00
Samuel Keiffer
0497a437a4 Merge branch 'sam/invulnerability-buff' into 'master'
Invulnerability Buff

Closes #965

See merge request veloren/veloren!1834
2021-03-01 05:46:46 +00:00
Samuel Keiffer
537efdd47e Merge branch 'aweinstock/trade-requestitem' into 'master'
During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829
2021-03-01 02:39:36 +00:00
Sam
531c38c3ad Factored formatting of buff text out to a single function. 2021-02-28 16:04:33 -05:00
Imbris
b7bd0306e6 Merge branch 'Lerg/Issue_#976' into 'master'
Issue #976 Some inputs are missing the ability to be rebound

See merge request veloren/veloren!1832
2021-02-28 18:23:30 +00:00
Justin Shipsey
13df691f69 Merge branch 'heydabop/966-controller-y-invert' into 'master'
#966 - Setting to invert controller Y axis

See merge request veloren/veloren!1817
2021-02-28 18:02:04 +00:00
Lerg
94bd1f2605 Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator 2021-02-28 19:02:32 +03:00
Avi Weinstock
7e458ecd40 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
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
heydabop
d4e3a3f29f #966 - Add setting to invert controller camera Y axis 2021-02-24 10:39:44 -06: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
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
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
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
Jesus Bracho
ec79890335 Provide buff information on killed entities 2021-01-18 05:46:53 +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
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
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