Commit Graph

6390 Commits

Author SHA1 Message Date
Sam
cb3e44a811 Health can now be scaled for npcs again. 2021-01-19 08:07:40 -05:00
Sam
1d90b64898 Added function to get the max amount of skill points that can be spent in a tree. 2021-01-19 08:07:39 -05:00
Sam
b6d2d48ead Exp floaters.
You load in with correct energy and health values now.
2021-01-19 08:07:36 -05:00
30df603115 flashing buttons for available points, WIP lock/unlock indicator
Condensed UI code. Removed some hardcoding.

icons

squash later, WIP colouring for unavailable skills
2021-01-19 08:07:33 -05:00
Sam
51c0bd765f Database support for refunding skills.
Nonfunctional xp floaters, squash when working.

more icons, lock visuals
2021-01-19 08:07:29 -05:00
48bd921d0a EXP bar and available points UI
fix overhead UI

Add WIP overhead difficulty indicator

readd commented out exp counter for later use

Wired skill information into UI.
2021-01-19 08:07:25 -05:00
Sam
c0c45a1996 Purged stats, including level and experience 2021-01-19 08:07:23 -05:00
Sam
82885af9c4 UI now shows how many levels you've invested into a skill. 2021-01-19 08:07:22 -05:00
Sam
48c98b11cf General combat skill tree.
UI for general skill tree
2021-01-19 08:07:20 -05:00
58d9534496 cleaned up skillbar, adjusted buffs placing
cleaned up skillbar, adjusted buffs placing

cleaned up skillbar, adjusted buffs placing

render diary example items in voxygen instead of using pre-rendered image files
2021-01-19 08:07:16 -05:00
Sam
bde2bc1f77 UI for sword skill tree
Axe skill tree UI

Hammer skill tree UI

Bow skill tree UI

moar renders

Staff skill tree UI

Sceptre skill tree UI
2021-01-19 08:07:12 -05:00
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
Sam
0ccbdc3b8c Sceptre skill tree. 2021-01-19 08:07:03 -05:00
Sam
5c7705f874 Staff skill tree. 2021-01-19 08:07:03 -05:00
Sam
662a08defc Implemented bow skill tree. 2021-01-19 08:07:02 -05:00
Sam
4dfe14c103 Hammer skill tree complete. 2021-01-19 08:07:02 -05:00
Sam
72604e8a4e Axe skill tree functional. 2021-01-19 08:07:01 -05:00
Sam
495a8eba1c Added migrations for skill trees. 2021-01-19 08:07:00 -05:00
Sam
69be3a3d93 Added persistence for skill trees. 2021-01-19 08:07:00 -05:00
Sam
cc60ca58be Added sword skill tree 2021-01-19 08:06:59 -05:00
Sam
0e84ba18c2 Moved skill max level and skill prerequisites into ron files. 2021-01-19 08:06:59 -05:00
Sam
5a23f063a0 Ron file now used for skills belonging to each skill group. 2021-01-19 08:06:58 -05:00
Sam
fa073bceff Skills can now optionally have levels. Max level prevents adding skill of higher level. Support for skills having a prerequisite of a particular level. 2021-01-19 08:06:57 -05:00
Sam
5d474974b9 Skills can now have prerequisite skills. Skills can now cost different amounts of skill points. 2021-01-19 08:06:57 -05:00
Sam
cbfe064e4f You now gain skill points after a threshold of xp within a particular skill group.
Skills can now unlock skill groups. Temp method of using chat to unlock skills.
2021-01-19 08:06:52 -05:00
1312dc9252 Merge branch 'friendly-auras' into 'master'
Set up aura filtering

Closes #890

See merge request veloren/veloren!1698
2021-01-18 22:58:56 +00:00
42679201b0 Set up aura filtering 2021-01-18 22:58:56 +00:00
Sam
63eb71ed5b Exp is now awarded to specific skill groups. It's automatically split between a general pool and weapon pools based on if you have the weapon in your loadout and if you've unlocked the weapon pools. 2021-01-18 17:54:03 -05:00
1dd47bc6d9 Merge branch 'provide-buff-information-on-killed-entities' into 'master'
Provide buff information on killed entities

Closes #927

See merge request veloren/veloren!1696
2021-01-18 05:46:53 +00:00
ec79890335 Provide buff information on killed entities 2021-01-18 05:46:53 +00:00
16c865ac27 Merge branch 'ubruntu/bird-pathing' into 'master'
Slightly better bird pathing

See merge request veloren/veloren!1692
2021-01-15 00:42:57 +00:00
74d17ff4c8 Slightly better bird pathing 2021-01-15 00:42:57 +00:00
c54aa354d4 Merge branch 'mailmap' into 'master'
Added a `.mailmap` file to unify my name in commits made with my email address

See merge request veloren/veloren!1693
2021-01-14 23:29:12 +00:00
331f19dd8b Added a .mailmap file to unify my name in commits made with my email address 2021-01-15 00:19:47 +01:00
69476f46af Merge branch 'acrimon/925-campfire-fix' into 'master'
Don't apply campfire healing buff if the player is at maximum health.

Closes #925

See merge request veloren/veloren!1690
2021-01-14 15:19:49 +00:00
0ce08906cb Merge branch 'xMAC94x/remove_cargo_check' into 'master'
remove `cargo check` as its already included in `cargo clippy`

See merge request veloren/veloren!1689
2021-01-14 14:29:04 +00:00
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
ceae51b0b7 fix #925 2021-01-14 13:21:55 +01:00
0826707b0d use --all-targets which is the same as before AND --lib.
Just to be future proof, lib should not matter ATM, but might in the future when we produce libs that are not used in any binary target
2021-01-14 08:16:25 +00:00
6390e758d4 fix clippy in all examples.
added a ignore for plugins, as we cannot remove the `Result<>` type, it is necessary
2021-01-13 15:06:04 +01:00
68be467138 After some discussion with XVar, Song and Yakei we found out that cargo clippy is a superset of cargo check.
There are multiple hints:
 - one guy in discord  https://discord.gg/nWGhnbRb  https://discord.com/channels/273534239310479360/335502067432947748/798886188923617290
 - a old stackoverflow https://stackoverflow.com/questions/57449356/is-cargo-clippy-a-superset-of-cargo-check which lead us to the source code:
   7fa1d78c89/src/main.rs (L73)
   which either uses `check` or `fix`.
   cargo fix is documented in the docs with (https://doc.rust-lang.org/cargo/commands/cargo-fix.html)
   "executing cargo fix will under the hood execute cargo-check(1)."
 - `cargo clippy` fails after running `cargo check` prob as there is nothing to do.
 - `cargo clippy --help` points us to `cargo check --help`
Thus we are removing `cargo check` from the CI as a seperate check.

However `cargo check --examples` did check the examples.
In order to have them covered we are also running clippy now for examples, benches and all bins.
Also we moved `--locked` from cargo check to clippy.
2021-01-13 14:22:54 +01:00
11deb97d5a Merge branch 'xMAC94x/fix-cache-check' into 'master'
fix CI cache for cargo check

See merge request veloren/veloren!1688
2021-01-12 02:04:12 +00:00
a3351be221 running cargo check with -D warnings seems to trigger a complete cache invalidation.
AND cargo check was implicitly run in clippy. In order to be future save we now ALWAYS run all CI with -D warnings.
(i verified that this works in a test pipeline)
2021-01-12 01:15:13 +01:00
8539b67d9c Merge branch 'ccgauche/fix-test-for-plugins' into 'master'
Fixed tests on WIndows due to target arch wasm32

See merge request veloren/veloren!1686
2021-01-10 23:03:38 +00:00
19eb7d1814 Fixed tests on WIndows due to target arch wasm32 2021-01-10 21:49:10 +01:00
109a76e1b3 Merge branch 'xvar/inventory-followup' into 'master'
Inventory followup fixes

Closes #920

See merge request veloren/veloren!1685
2021-01-10 13:10:09 +00:00
c785e75e60 Follow-up fixes from review of inventory MR 2021-01-10 11:27:09 +00:00
9f7ccbb24d Merge branch 'pfau/hotfix-drops' into 'master'
Fix loot tables, enemy bar color change

See merge request veloren/veloren!1684
2021-01-09 16:06:11 +00:00
06e7ac25c1 fix loot tables, enemy bar color change 2021-01-09 15:26:24 +01:00
3d46d51871 Merge branch 'xvar/fix-stackable-item-pickup' into 'master'
Fixed a bug which prevented picking up stackable items with a full inventory

Closes #921

See merge request veloren/veloren!1683
2021-01-09 01:23:14 +00:00