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,346 Commits 151 Branches 18 Tags 2.1 GiB
7cbbb70c42
Commit Graph

2698 Commits

Author SHA1 Message Date
Imbris
7cbbb70c42 Merge branch 'pizzaluc/unlimited_FPS' into 'master' 
Implemented #896 - Added option for Unlimited FPS

Closes #896

See merge request veloren/veloren!1713
 2021-01-23 08:34:38 +00:00
Lucas Vulpius
43b5559325 Implemented #896 - Added option for Unlimited FPS 2021-01-23 08:34:38 +00:00
Justin Shipsey
fb09d14725 Merge branch 'Rotsuoy/SavannaGrass' into 'master' 
Rotsuoy/savanna grass

See merge request veloren/veloren!1711
 2021-01-23 07:46:54 +00:00
Rotsuoy
994677a4d0 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
Sam
4014b28d19 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
Justin Shipsey
6de8ca32ce Merge branch 'sam/lactose-tolerant-golems' into 'master' 
Gives golems a spin attack

See merge request veloren/veloren!1709
 2021-01-22 07:30:53 +00:00
Snowram
6ee87221e6 Use improved pullback on golem anim 2021-01-22 06:13:43 +01:00
Sam
b5a3b3442c Addressed comments. 2021-01-21 17:45:03 -05:00
Snowram
8b06d844f7 Golem spinmelee anim 2021-01-21 01:23:10 +01:00
Acrimon
b464a1876e
update itertools for voxygen 2021-01-20 16:00:08 +01:00
Acrimon
9f16a946ee
update a few deps 2021-01-20 15:53:58 +01:00
Monty Marz
1eb7f78189 Revert "Added TR translations for deaths by debuffs." 
This reverts commit 0817e45e13.
 2021-01-20 11:20:06 +00:00
jiminycrick
7dda25a66d More footstep sfx based on distance 2021-01-19 19:51:19 -08:00
Monty Marz
ac60bf5794 Better visuals for skill button labels, don't show "0 EXP" in the SCT 
Made functions that were called every frame significantly cheaper.

Final UI fixes.
 2021-01-19 08:08:29 -05:00
Sam
eaa41c7dea Skills are now factored into combat rating. New formula for exp scaling per SP. 
Adjust lvl up msg fade

Add female humanoid names WIP

Changed text formatting when skill is max level. Added message to show you have 0 skill points available.

Addressed a lot of comments.

various changes to UI

- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon

Exp reward tweaks.

Fixed flamethrower range skill description.
 2021-01-19 08:08:26 -05:00
jshipsey
0b156542e4 roll keyframes 
Changed roll to have non-fixed acceleration.
 2021-01-19 08:08:21 -05:00
jshipsey
5d1993009f keyframed axe spin 
Fixed error in converting FK to entity_id from character_id.

Giant match statements in persistence.

Tweaked roll.

Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
 2021-01-19 08:08:18 -05: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
jiminycrick
3d44ac2c35 Humanoid skill config and AI skill check 
updated axe skill with correct icons
 2021-01-19 08:08:05 -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
6ce422748c Added SkillSetConfig to specify skill sets for npcs. 2021-01-19 08:07:55 -05:00
Sam
968b66260e Levling health gives you health. Added combat scaling to UI. 2021-01-19 08:07:54 -05:00
Sam
4f552a736e Added skill point costs to tooltips. 2021-01-19 08:07:53 -05:00
Sam
ae8c8b47f1 Added tooltips with numbers. Balancing on some skills. 
Added experience scaling for tougher enemies.
 2021-01-19 08:07:51 -05:00
Sam
89766b2b34 Added command to give yourself skill points. 
adjusted social window

Changelog
 2021-01-19 08:07:49 -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
Sam
b6d2d48ead Exp floaters. 
You load in with correct energy and health values now.
 2021-01-19 08:07:36 -05:00
Monty Marz
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
Monty Marz
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
Monty Marz
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
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
Sam
cc60ca58be Added sword skill tree 2021-01-19 08:06:59 -05:00
Jesus Bracho
ec79890335 Provide buff information on killed entities 2021-01-18 05:46:53 +00:00
Ben Wallis
c785e75e60 Follow-up fixes from review of inventory MR 2021-01-10 11:27:09 +00:00
Monty Marz
06e7ac25c1 fix loot tables, enemy bar color change 2021-01-09 15:26:24 +01:00
Scott Williams
c09098ee5f Changed default option to false for smooth_pan_enable. 2021-01-08 21:08:57 +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
Joshua Barretto
1604616768 Merge branch 'ccgauche/new-wasmer-backend' into 'master' 
ccgauche/new wasmer backend

See merge request veloren/veloren!1644
 2021-01-08 08:48:31 +00:00
ccgauche
06ffe61219 Added feature flag 
changed field name to size
 2021-01-08 08:48:30 +00:00
Imbris
58ec4760a5 Move to WindowEvent from DeviceEvent for zooming 2021-01-08 01:38:33 -05:00
Joshua Barretto
a4b9230f03 fixed Cargo.lock conflict 
Fixed `crossbeam-queue` being referenced  twice in the lockfile
 2021-01-07 20:25:12 +00:00