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
8,248 Commits 151 Branches 18 Tags 2.1 GiB
81397349da
Commit Graph

3295 Commits

Author SHA1 Message Date
Avi Weinstock
03d28f7d93 Implement tags for items, allowing a crafting recipe to take any item with that tag as input. 
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
 2021-02-16 01:05:54 +00:00
Ludvig Böklin
0f1227ca7d Use nlerp for interpolating rotations in animation 2021-02-15 11:01:59 +01:00
AdaLovegirls
390812f54e Improve controller keybindings 2021-02-14 21:31:31 -06:00
Avi Weinstock
c984035976 MR 1775 review fixes. 
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
 2021-02-14 11:13:56 -05:00
Avi Weinstock
232ddb0860 Polish trading implementation and address review comments. 
- Fix item swapping edge case
- Document more assumptions/edge cases
- fmt and clippy
- s/ServerGeneral::GroupInvite/ServerGeneral::Invite/
- Use `Client::current` in `Client::is_dead`
 2021-02-14 11:11:35 -05:00
Ludvig Böklin
84990553e0 Use Ori for base rotation matrix 2021-02-13 11:02:50 +01:00
Avi Weinstock
f6db8bb7c4 Implement actual inventory-manipulation part of trading server side. 2021-02-12 18:43:10 -05: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
aeb2398fc6 Trade implementation progress. 
- Server messages now bring up the trade window.
- When a trade is declined, it closes the window on both clients.
 2021-02-12 18:43:09 -05:00
Avi Weinstock
ae528124fc Trade implementation progress. 
- State machine for modifying trades.
- ServerGeneral/ClientGeneral messages.
 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
DaforLynx
ebbb06a400 Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic 2021-02-12 00:54:42 +00:00
Justin Shipsey
44a9d8dc71 Merge branch 'nward/chat-input-color-icon-rebased' into 'master' 
Rebase  !1447  Chat input color and icon reflect channel message is sent to.

See merge request veloren/veloren!1769
 2021-02-10 19:42:59 +00:00
Quellus
63952875d9 Rebase !1447 Chat input color and icon reflect channel message is sent to. 2021-02-10 19:42:59 +00:00
Imbris
3e98e18c46 Merge branch 'aweinstock/sort-crafting' into 'master' 
Crafting UI: sort items lexicographically by craftability and then alphabetically.

See merge request veloren/veloren!1767
 2021-02-10 04:04:42 +00:00
Avi Weinstock
5d0c18efeb Crafting UI: sort items lexicographically by craftability and then alphabetically. 2021-02-09 19:30:54 -05:00
Snowram
477bdfdfe7 Adresses some comments, various visual tweaks 2021-02-10 00:30:23 +01:00
Ludvig Böklin
065e260e78 Code quality 2021-02-09 14:06:27 +01:00
Ludvig Böklin
fa78674840 Encourage migration towards using quaternion in animations 2021-02-09 13:52:44 +01:00
Ludvig Böklin
582ddfc3cd Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot 2021-02-09 13:52:03 +01:00
Imbris
357cb26e05 Update native_dialog to 0.5.2 2021-02-07 00:48:57 -05:00
Ludvig Böklin
a1ff9ab83f Redefine Ori as a quaternion 2021-02-05 09:33:14 +01:00
Pascal Fuhrmann
9f7637ab21 Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts 2021-02-05 01:39:12 +00:00
James Melkonian
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
Joshua Barretto
60c16e57b1 Added snow particles 2021-01-31 15:15:17 +00:00
DaforLynx
b906473f4e Aughihopethisworks 2021-01-30 22:27:12 -08:00
Marcel
b88f04215e Merge branch 'DaforLynx/small-sound-fixes' into 'master' 
Small audio fixes; addresses #939 and #940

Closes #940 and #939

See merge request veloren/veloren!1739
 2021-01-29 11:37:10 +00:00
DaforLynx
c6e262c4ce Small audio fixes; addresses #939 and #940 2021-01-29 11:37:10 +00:00
jiminycrick
a02444825d Address some comments 
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
 2021-01-28 17:31:05 -08:00
jiminycrick
152156d065 Fix rebase and scrub poise from UI 2021-01-28 17:22:39 -08:00
jshipsey
d456271921 animal stuns 
Fix rebase
 2021-01-28 17:22:39 -08:00
jiminycrick
661764f4aa Some preliminary balancing 
Fix rebase
 2021-01-28 17:22:39 -08:00
jshipsey
29732bb763 starting stun anim 
stagger anim, mirroring, bettern walk anim

wielding with stuns/stagger

Knockback fix

Added Poise documentation/comments
 2021-01-28 17:22:37 -08:00
jiminycrick
8b97199245 Update rand dependency 2021-01-26 20:35:08 -08:00
Entropy9s
1f6cf7e155 StaminaPlus buff, modifying stamina via buffs 
trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

bracket bulldozing, boldly

hopefully this should be good?

need to rebase real quick

please let me be done

StaminaPlus buff, modifying stamina via buffs

trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

hopefully this should be good?

cargo clippy fmt stuff

deleted an extraneous file?? how did that even...?
 2021-01-26 22:47:55 +00:00
Scott Williams
0cde434e3b All gems make a sound. 2021-01-25 22:53:23 +00:00
Scott Williams
157e56d8ca Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Justin Shipsey
5117edcff9 Merge branch 'pfau/sceptres' into 'master' 
6 new sceptres, add DPS display to tooltips

See merge request veloren/veloren!1724
 2021-01-24 03:14:32 +00:00
Marcel
82147653df Merge branch 'torvus-quick-fix' into 'master' 
Fix torvus

See merge request veloren/veloren!1720
 2021-01-23 22:31:15 +00:00
Monty
7cbf946a65 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
Samuel Keiffer
39d1c9e885 Merge branch 'sam/skill-balancing-1' into 'master' 
Skill balancing

See merge request veloren/veloren!1716
 2021-01-23 21:12:35 +00:00
Sam
77312ccdd4 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05:00
Imbris
47bd74469b Merge branch 'imbris/update-winit' into 'master' 
Update winit and iced

See merge request veloren/veloren!1717
 2021-01-23 09:22:58 +00:00
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
Imbris
adaea096d2 Update winit and iced 2021-01-23 01:09:33 -05:00
Sam
5e4b6809ca Sceptre nerfs. 2021-01-22 22:46:18 -05: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
Benoît du Garreau
67642b0467 Use concat to build i18n specifiers" 2021-01-04 00:06:14 +01:00
Benoît du Garreau
055df2a8df Avoid a reallocation 2021-01-04 00:06:14 +01:00
Benoît du Garreau
09e38e085c Fix i18n::list_localization scanning the filesystem on each call 2021-01-04 00:06:14 +01:00
Marcel Märtens
c37384979c switch toolchain to nightly-2021-01-01 2021-01-03 21:31:21 +01:00
Benoît du Garreau
8ced0a3810 Fix i18n::list_localizations 2021-01-03 17:48:23 +01:00
Imbris
17be17834e Merge branch 'cache-video-modes' into 'master' 
Caching video modes fixes #729

Closes #729

See merge request veloren/veloren!1670
 2021-01-02 06:43:34 +00:00
Vincent Foulon
d54f5ac5f8 cargo fmt 2021-01-01 23:37:21 +01:00
nobbele
c1859b46f2 caching video modes fixes #729 2021-01-01 17:51:37 +01:00
Vincent Foulon
f8cb45f2f0 verify every localization file instead of just the manifest 2020-12-31 12:32:23 +01:00
Vincent Foulon
b1f2a4eff5 fix wrongly named variables + rename i18n_files function + capitalize comments 2020-12-31 12:32:22 +01:00
Vincent Foulon
017bd86185 cargo fmt 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
5b62398e80 update tests to match the new folder layout 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
4d7b985be1 clean even more code 2020-12-31 12:32:19 +01:00
Vincent Foulon
a0a51110a5 clear i18n code + revert back some other part of the code to its original state 2020-12-31 12:32:18 +01:00
Vincent Foulon
59651eb032 Convert Localization from Asset to Compound 2020-12-31 12:32:18 +01:00
Vincent Foulon
2b6b2fd12e use RonLoader as LocalizationFragment's loader directly 2020-12-31 12:32:17 +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
70c336c6cb fix init_localization return value being in comment 2020-12-31 12:32:15 +01:00
Vincent Foulon
924c24fa78 (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
Ben Wallis
5636083e27 * Fixed character load errors not being handled in Voxygen. 
* Improved server error message for character load errors.
* Added server logging for item asset load errors during character load.
* Fixed character select error message dialog not supporting long messages.
 2020-12-30 19:29:22 +00:00
Acrimon
ce27cfb30f
update some error handling code 2020-12-29 01:21:09 +01:00
Sarra Kitty
e8eb2b3a6c new gliders 
added sandraptor glider

added sandraptor glider

stuff

working on other raptor gliders

adding file and placeholder model (copy of morpho) for monarch butterfly gliders

adding models for snow and wood raptor gliders

added a proper model for the monarch glider

adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table

made raptors drop their feathers

fmt
 2020-12-24 02:54:18 +00:00
Frinksy
53d5a9373e fixing #881 
- Multiple buffs make the UI icons flicker
 2020-12-22 15:40:57 +00:00
Adam Blanchet
5f9984df12 working towards #861 - 
Use scancodes for (at minimum) key remapping

added ScanCode fallback for when winit doesn't provide a VirtualKeyCode

renamed SKey to ScanKey
 2020-12-18 10:01:30 +01:00
Benoît du Garreau
8aac030ecd Fix bad specifier breaking on Windows 2020-12-17 17:22:02 +00:00
Marcel
d2da8d671f Merge branch 'a1phyr/use_assets_manager' into 'master' 
Use `assets_manager` to load assets

See merge request veloren/veloren!1624
 2020-12-17 12:25:29 +00:00
Marcel
78e9f3de28 Merge branch 'test_util' into 'master' 
Add simple tests to utils description functions

See merge request veloren/veloren!1526
 2020-12-17 11:20:19 +00:00
Benoît du Garreau
989683d2d3 Improve world::Index 2020-12-17 12:08:04 +01:00
Benoît du Garreau
ce9d706ed4 Fix clippy lints 2020-12-17 12:06:28 +01:00
Benoît du Garreau
7b4aa6d4cc cargo fmt 2020-12-17 12:06:22 +01:00
Benoît du Garreau
d090eefb00 Move the asset module to a single file 2020-12-17 12:06:13 +01:00
Benoît du Garreau
0cf164f33a Use assets_manager to load assets 2020-12-17 12:06:07 +01:00
jiminycrick
60d5d62eef Switched to hashbrown everywhere 2020-12-17 10:31:35 +01:00
Marcel Märtens
ea84cb138f fix wrong alignment 2020-12-16 15:17:17 +01:00
Marcel Märtens
e8003a44dd update specs 2020-12-16 14:31:16 +01:00
Marcel Märtens
a1b50a86c4 update guillotiere 2020-12-16 10:56:00 +01:00
Marcel Märtens
e3307344ab get rid of some insecure dependencies 2020-12-16 10:42:36 +01:00
Marcel
24a840bc6b Merge branch 'xMAC94x/dependencies' into 'master' 
update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel)

See merge request veloren/veloren!1641
 2020-12-16 09:33:34 +00:00
Justin Shipsey
e7249210f6 accel based run 2020-12-16 08:07:38 +00:00
Marcel Märtens
107fd432f5 update further crates 2020-12-16 08:56:21 +01:00
Marcel Märtens
26918d10c9 update chrossbeam, tracy, prometheus (and reduce server deps to crossbeam-channel) 2020-12-16 00:51:07 +01:00
Marcel
5600d93844 Merge branch 'james/healbomb-sfx-fix' into 'master' 
Healing bomb sfx fix

See merge request veloren/veloren!1637
 2020-12-15 13:15:32 +00:00
Joshua Barretto
494436be01 Hid plugins behind a feature flag to resolve Windows CI issue 2020-12-15 11:14:26 +00:00
jiminycrick
ce03fcfda3 Healing bomb sfx fix 2020-12-14 21:36:51 -08:00
Monty
8b9db7b179 cleanup, changelog, small bugfixes 
fmt
fix rebase
fmt
 2020-12-14 21:52:24 +01:00
Monty Marz
b5a2104ca5 group member indicator visuals 
functional group member indicators
adjust visuals
z-comparison
 2020-12-14 21:16:13 +01:00
Snowram
834670a641 Merge branch 'snowram/objects-offsets-ron' into 'master' 
Put objects offsets into a .ron file

See merge request veloren/veloren!1627
 2020-12-14 18:00:07 +00:00
Snowram
96ed008348 Puts objects offsets into a .ron file 2020-12-14 02:43:49 +01:00
Joshua Barretto
9f2e01617e Merge branch 'plugins' into 'master' 
Plugins and codebase refactor

See merge request veloren/veloren!1625
 2020-12-14 00:53:09 +00:00
Samuel Keiffer
c3732a8a8c Merge branch 'nahua/replace_sceptre_m2_sound' into 'master' 
Issue 872: Replace explosion sound with heal bomb sound for sceptre M2

See merge request veloren/veloren!1618
 2020-12-13 23:18:30 +00:00
nahuakang
f3ed13ca09 Replace explosion sound with heal bomb sound for sceptre M2 2020-12-13 22:09:28 +01:00
Joshua Barretto
023888f560 Updated changelog, fmt and clippy fixes 2020-12-13 17:40:15 +00:00
Joshua Barretto
f8c8e342e6 Moved common networking code to common/net, clippy fixes 2020-12-13 17:23:45 +00:00
Marcel Märtens
534f083b08 get rid of insecure dependency completly 2020-12-11 16:13:57 +01:00
Monty Marz
f9d4d744a0 Better group frame placement 2020-12-10 21:31:19 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Marcel Märtens
ccb01e1898 adjust fmt and clippy after toolchain upgrade 2020-12-10 14:53:01 +01:00
Snowram
6713ac935f Addressed comments 2020-12-08 23:04:21 +01:00
Snowram
2e8ac0688c Adds accumulated velocity for animation 2020-12-08 23:03:41 +01:00
Snowram
f94a4ec90d Improves fish_small, new npc 2020-12-08 23:03:39 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01:00
Marcel
ed9413e96a Merge branch 'HiggsTardigradeTau/deltatime-lowest-delta-usage' into 'master' 
Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike

Closes #867

See merge request veloren/veloren!1592
 2020-12-08 21:07:15 +00:00
HiggsTardigradeTau
57d3a595ce Resolve #867 - Make deltatime use the lowest delta of several frames to avoid 'teleport' effect after single-frame lag spike 2020-12-08 21:07:14 +00:00
Sam
490915d384 Modified how most abilites that could scale were scaled. 2020-12-07 22:00:24 -06:00
Ben Wallis
81a8ee0c19 Changed logging to use termcolor crate to fix ansi control codes showing when run under Windows Command Prompt 2020-12-06 14:49:13 +00:00
Joshua Barretto
77a39d74d4 Removed public fields from Client, turned a character error into a frontend event 2020-12-05 11:20:25 +00:00
Joshua Barretto
e5ebbd31fa Began using Grid<T> for LoD data 2020-12-05 11:20:25 +00:00
James Melkonian
71303fecfd Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
Imbris
d1431d734a Merge branch 'imbris/update-winit' into 'master' 
Don't drop the wayland clipboard

Closes #855

See merge request veloren/veloren!1576
 2020-12-02 01:33:29 +00:00
Imbris
d7f506cf71 Don't drop wayland clipboard 2020-12-01 19:35:32 -05:00
Imbris
b6b03c4a5f Merge branch 'weldar/remove-ssaa' into 'master' 
Removed SSAA option

Closes #871

See merge request veloren/veloren!1587
 2020-12-02 00:21:30 +00:00
Marcel
bf136a62c5 Merge branch 'xMAC94x/veloren_anim_move' into 'master' 
move anim code from voxygen/src/anim to voxygen/anim

See merge request veloren/veloren!1585
 2020-12-01 20:01:26 +00:00
Marcel Märtens
e5e255cbd3 move anim code from voxygen/src/anim to voxygen/anim 2020-12-01 20:20:01 +01:00
Forest Anderson
57c2f21e4d Cleaning 2020-12-01 10:28:39 -05:00
weldar
a2d98d31a7 Removed SSAA option to resolve issue #871. 2020-12-01 09:43:06 -05:00
Marcel Märtens
e398cca53c move common_state into common_sys 2020-12-01 13:46:28 +01:00
Marcel Märtens
add7922653 Move Systems out of common into common_sys 
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
 2020-12-01 13:44:07 +01:00
Marcel
9e5c31a27e Merge branch 'xvar/tooltip-fade-fix' into 'master' 
Changed tooltip fade time from 100 to 0ms to fix tooltip glitching

See merge request veloren/veloren!1567
 2020-11-30 21:13:05 +00:00
Marcel
a189163910 Merge branch 'azymohliad/sun-movement-direction' into 'master' 
Fix Sun and Moon movement direction

See merge request veloren/veloren!1568
 2020-11-30 21:13:03 +00:00
Nicholas Kinney
885e1aac61 Offspec/larger scalemode range 2020-11-30 20:36:58 +00:00
Marcel Märtens
ca1601a980 Change the version number to 0.8 2020-11-28 11:25:58 +01:00
Andrii Zymohliad
8a6f08df91 Fix sun & moon movement direction 
They were rising on the west and setting on the east
 2020-11-27 23:17:59 +02:00
Ben Wallis
7ce0c7fc05 Changed tooltip fade time from 100 to 0ms to fix tooltip glitching 2020-11-27 19:51:45 +00:00
Forest Anderson
9065d0ca02 Merge branch 'imbris/audio-fixes' into 'master' 
Stop unbounded wind volume when zooming out, make campfires quieter

Closes #844

See merge request veloren/veloren!1566
 2020-11-27 18:59:23 +00:00
Forest Anderson
c8735ba946 Merge branch 'timsueberkrueb/log-path-override' into 'master' 
Make VOXYGEN_LOGS override logs_path setting

See merge request veloren/veloren!1565
 2020-11-27 18:25:39 +00:00
Imbris
a96e9982c7 Stop unbounded wind volume when zooming out, make campfires quieter 2020-11-27 12:43:47 -05:00
Marcel
a431fe3fad Merge branch 'sam/dehardcode-energy' into 'master' 
Graying out skills with insufficient energy no longer dependent on hard-coded values

Closes #824

See merge request veloren/veloren!1560
 2020-11-27 16:27:09 +00:00
Samuel Keiffer
352917d9cb Graying out skills with insufficient energy no longer dependent on hard-coded values 2020-11-27 16:27:09 +00:00
Treeco
ca2e4080c0 Various tiny fixes: 
Text over lootbags no longer scales with distance due to performance

Fixed meshing panic

Fixed ambiant lighting default
 2020-11-26 21:46:41 +00:00
Tim Süberkrüb
49e892b948 Make VOXYGEN_LOGS override settings 
This is needed to support package managers that enforce
strict application confinement (e.g. snap).
 2020-11-25 20:36:41 +01:00
Monty Marz
e7d27a2c21 fmt 
cleanup
 2020-11-25 16:53:48 +00:00
Imbris
a545d099a2 Restore fix for dragging on windows platforms 2020-11-25 00:29:28 -05:00
Marcel
d1a9264a99 Merge branch 'angryanimals' into 'master' 
animal attacks

See merge request veloren/veloren!1542
 2020-11-25 01:33:20 +00:00
Sam
33e4448542 Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work 
balance

Lavadrake AI tweaks

feedback tweaks
 2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jshipsey
a27b086401 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jshipsey
c07d8df58b assigning weapons, building animations 
ability mapping
 2020-11-24 17:48:43 -06:00
jshipsey
e3e513cc11 initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a Wolf attacks and ai. 
initial wolf dash testing

tool.rs

Wolf attack AI
 2020-11-24 17:48:20 -06:00
Joshua Barretto
46dc49bc0a Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00
Christof Petig
a3db20c9d6 Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
26fd40c0e3 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Treeco
8922fd949f Make zooming in then back out return to the previous zoom level 2020-11-23 10:58:22 +00:00
Joshua Barretto
0513a41981 Iteration order fix x2 2020-11-23 10:58:22 +00:00
Imbris
7c6fe69922 Show indicator over site icons 2020-11-23 10:58:22 +00:00
Joshua Barretto
765a1ca17b Switched light map iteration order, fire bowls in dungeons 2020-11-23 10:58:21 +00:00
Treeco
a1236d4da0 Fixed map screens for rectangular worlds 2020-11-23 10:58:21 +00:00
Monty Marz
d069eb9a57 street lamp particles, ground fire bowl, misc fixes 2020-11-23 10:58:21 +00:00
Imbris
898bba8884 Demystify map site icon placement calculations 2020-11-23 10:58:21 +00:00
Joshua Barretto
b539ecf438 More lights, minimised light and glow map data 2020-11-23 10:58:21 +00:00
Joshua Barretto
4bb0da24b6 Addressed review comments 2020-11-23 10:57:57 +00:00
Joshua Barretto
df1b19ed64 Light/glow temporal interpolation hack 2020-11-23 10:57:57 +00:00
Joshua Barretto
bb9e593a44 Fixed glow AO 2020-11-23 10:57:57 +00:00
Joshua Barretto
d7bbceca2d Added light/glow map sample interpolation for entities 2020-11-23 10:57:56 +00:00
Joshua Barretto
27e7fd0727 Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be 2020-11-23 10:57:56 +00:00
Joshua Barretto
51d1a2ecff Added glow 2020-11-23 10:57:56 +00:00
Monty Marz
099dfc959f translations, fixes 2020-11-23 10:57:56 +00:00
Joshua Barretto
93a86a951e Tweaked default graphics settings 2020-11-23 10:57:56 +00:00
Monty Marz
82da969707 fix overly long names clipping on the minimap 2020-11-23 10:57:56 +00:00
Joshua Barretto
7850b0bcaf Added site names, dungeon difficulty, better explosions 2020-11-23 10:57:55 +00:00
Monty Marz
5b907ede9e fix hints 2020-11-23 10:57:55 +00:00
Monty Marz
884a5d9c51 fix scrolling on non-windows OS 2020-11-23 10:57:55 +00:00
Joshua Barretto
058908f603 Made flamethrower and healing staff emit light on use 2020-11-23 10:57:55 +00:00
Monty Marz
97934d1070 map fixes 2020-11-23 10:57:55 +00:00
Joshua Barretto
5930ca4a59 Temporarily make particles opaque to avoid depth-related rendering problems 2020-11-23 10:57:55 +00:00
Joshua Barretto
7eb437501d Fixed various particle issues 2020-11-23 10:57:55 +00:00
Joshua Barretto
bcc220804a Added exposure to settings 2020-11-23 10:57:55 +00:00
Monty Marz
8b6c73744e more map stuff 2020-11-23 10:57:16 +00:00
Joshua Barretto
aa59d66a76 Fixed many map problems, re-added surface mist 2020-11-23 10:57:15 +00:00
Monty Marz
99b3a4465a WIP map zooming and dragging 2020-11-23 10:57:15 +00:00
Monty Marz
c825e33f1a map icon options WIP 2020-11-23 10:45:02 +00:00
Joshua Barretto
1d031538f9 Added HDR 2020-11-23 10:45:02 +00:00
Joshua Barretto
49df604de0 Better scattering and scatter (of both varieties) 2020-11-23 10:45:02 +00:00
Joshua Barretto
ee65b4fb17 Improved cloud quality by improving sun access heuristic 2020-11-23 10:45:02 +00:00
Monty Marz
1864f4626c map icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
b352ef5d55 Terrain pop-in, fixed agent pathfinding in water 2020-11-23 10:45:01 +00:00
Joshua Barretto
6adfa547db Added site icons to main map 2020-11-23 10:45:01 +00:00
Joshua Barretto
d4d4f17d3c Added world map size icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
fc26305ac8 Increases maximum sprite dimensions (if you suspect an issue, check this commit) 2020-11-23 10:37:59 +00:00
Imbris
7ba2efcde2 Attempt to fix ui bug with changing screens causing inventory slots and such to disappear, presumably due to dpi differences 2020-11-22 14:22:39 -05:00
Imbris
1355c1e8f5 Move tracy frame markers to proper locations, add a few spans 2020-11-22 14:22:39 -05:00
Imbris
82b95974f1 Log errors occuring when client keeps retrying connection to the server 2020-11-22 03:54:19 -05:00
Imbris
e72c69ca41 Merge branch 'imbris/fix-apple-bug' into 'master' 
Fix issues with not being able to grab highlighted apples by unifying distance checking

Closes #820

See merge request veloren/veloren!1532
 2020-11-21 02:55:09 +00:00
Imbris
ea275e320f Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module 2020-11-20 20:51:44 -05:00
Samuel Keiffer
435d354dad Merge branch 'sam/interrupting-rolls' into 'master' 
Rolling can now interrupt any attack.

See merge request veloren/veloren!1537
 2020-11-20 18:37:44 +00:00
Sam
987df30dc4 Fixed audio test, added changelog line. 2020-11-20 11:50:01 -06:00
Monty Marz
dd338eb142 Update simple.rs 2020-11-20 17:56:26 +01:00
Joshua Barretto
8981dce4c9 Merge branch 'Awkor/rotate-camera-character-selection' into 'master' 
Implement #334 - Enable camera rotation in character selection screen

Closes #334

See merge request veloren/veloren!1377
 2020-11-20 16:32:39 +00:00
jiminycrick
3ef00c4e76 Fix audio disabling 2020-11-19 10:46:31 -08:00
Snowram
d98bfa72ad Improves bipedlarge and theropod anims, balance tweaks 2020-11-19 00:56:50 +01:00
Snowram
b48de84f8c Adds 3 new npcs 2020-11-19 00:53:17 +01:00
Snowram
44fe398ba3 Adds 2 new npcs, some models tweaks 2020-11-19 00:53:13 +01:00
Snowram
42d2108c39 Adds mindflayer npc 2020-11-19 00:53:09 +01:00
Snowram
9bfccd42d3 Adds new animals 2020-11-19 00:53:02 +01:00
jiminycrick
1ce3827e22 Address comment 2020-11-18 13:31:13 -08:00
jiminycrick
2d2f267907 Addressed comments and fixed pipeline 2020-11-18 13:31:13 -08:00
jiminycrick
3b47add55a Fully move sfx away from ECS event bus 2020-11-18 13:31:13 -08:00
jiminycrick
b3aa454f8e Initial work to move combat sfx to outcomes 2020-11-18 13:31:12 -08:00
jiminycrick
77d624f640 Made level up sounds use outcomes instead of emitting an event 2020-11-18 13:31:12 -08:00
jiminycrick
9c87345135 Moved functions to client out of audio and generalized non-positional ambient sfx 2020-11-18 13:31:12 -08:00
jiminycrick
a9711eea01 Beginning to address comments 2020-11-18 13:31:12 -08:00
jiminycrick
c44a9092d3 Biome definition tweaks and more sfx 2020-11-18 13:31:12 -08:00
jiminycrick
f0d14ebe20 fix rebase 2020-11-18 13:31:12 -08:00
jiminycrick
a684bc90fd Quadraped footsteps and songs in biomes 2020-11-18 13:31:12 -08:00
jiminycrick
27dc43fe18 Audio test fixes 2020-11-18 13:31:12 -08:00
jiminycrick
ddd970b986 Even more clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
e1fcb3744e Comment out audio device picker 2020-11-18 13:31:12 -08:00
jiminycrick
ea1bc2941b Clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
d47e0bbb73 Getting merge ready minus device picker 2020-11-18 13:31:12 -08:00
jiminycrick
2d088faea4 Wind transition smoothing 2020-11-18 13:31:12 -08:00
jiminycrick
f182002e38 Underwater and cave reverb 2020-11-18 13:31:12 -08:00
jiminycrick
695cc7f5cb Broken wind implementation 2020-11-18 13:31:12 -08:00
jiminycrick
9b759efe41 Snow footsteps 2020-11-18 13:31:12 -08:00
jiminycrick
09a1974974 River water sfx 2020-11-18 13:31:12 -08:00
jiminycrick
8f5a22671d Re-added device selector to settings with new rodio 2020-11-18 13:31:12 -08:00
jiminycrick
decb0e3e24 Hackily upgraded rodio and cpal to 0.13 2020-11-18 13:31:12 -08:00
jiminycrick
d0bd5118bf Made biome probabilities neater 2020-11-18 13:31:12 -08:00
jiminycrick
e880654f2e Probability for biome play 2020-11-18 13:31:12 -08:00
jiminycrick
c8d79b0b0e Dungeon and cave specific music 2020-11-18 13:31:12 -08:00
jiminycrick
0a9f1ee11c Remove ambient channel system in favor of sfx system 2020-11-18 13:31:12 -08:00
jiminycrick
39d4ee8a96 Owls, campfires, and better bird sfx handling 2020-11-18 13:31:12 -08:00
jiminycrick
3169562a80 Night time sfx and swimming 2020-11-18 13:31:12 -08:00
jiminycrick
aa6b7cbb65 Bird calls from trees 2020-11-18 13:31:12 -08:00
jiminycrick
9e790f6cac Really broken block sfx pushed so others can see 2020-11-18 13:31:12 -08:00
jiminycrick
3473347742 Sfx from blocks 2020-11-18 13:31:12 -08:00
jiminycrick
0689630d98 Fading music/ambient sounds decently upon biome transition 2020-11-18 13:31:11 -08:00
jiminycrick
b5aea464f3 Switch music at biome transitions 2020-11-18 13:31:11 -08:00
jiminycrick
46d3f6f6d2 Initial biome specific music and ambient sound channel 2020-11-18 13:31:11 -08:00
Imbris
7427367d96 Fix issues with not being able to grab highlighted apples by unifying distance checking 2020-11-17 23:06:02 -05:00
Snowram
950eb1976d Addressed more comments 2020-11-17 23:54:01 +01:00
Snowram
83b2640e02 Makes basic beam Y offset depend on body scale 2020-11-17 23:27:13 +01:00
Snowram
7af561263d Addressed comments 2020-11-17 23:27:13 +01:00
Snowram
93642428f2 Move eye sight and scale in body.rs, mounts tweaks 2020-11-17 23:27:13 +01:00
David Fisher
b93d4bf85c Add simple tests to utils description functions 
I initially ended up in this file looking to take on issue #707
which I realized had been already done. Having touched the file though
I thought it good to add some basic tests to get used to the workflow
on the project and how things are setup here.

This commit adds some basic requests and cleans up some comments
which appear to have been left as placeholders for work which appears
to have been completed already.

I attempted to test the tool_desc and armor_desc functions, but realized
I wasn't sure how to best create an instance of Armor or Tool without
modifying other files to make more things public.

This is my first commit on the project, and was intentionally kept
simple accordingly.
 2020-11-15 18:53:20 -05:00
Odd-Harald Lillestø Myhren
774ef72344 Merge branch 'master' into 'knarkzel/persist-combo-roll' 
# Conflicts:
#   CHANGELOG.md
 2020-11-15 22:37:30 +00:00
Knarkzel
64da99a4d7 add new was_combo field to test 2020-11-15 23:49:01 +01:00
Joshua Barretto
171ef1d7b9 Upscaling support 2020-11-15 22:18:35 +00:00
Imbris
4872d285c3 Merge branch 'imbris/fix-font-selection' into 'master' 
Properly use localization specified fonts, fix swedish translation by adding...

Closes #834

See merge request veloren/veloren!1521
 2020-11-15 03:18:29 +00:00
Imbris
03c96a7c7b Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list 2020-11-14 21:31:31 -05:00
Imbris
4f2512f126 Save the selected character, deselect character when deleting, auto select newly created character 2020-11-14 19:17:42 -05:00
Imbris
5dbb1aeae7 Merge branch 'imbris/fix-7' into 'master' 
Fix panic on minimizing window before the game starts up

See merge request veloren/veloren!1514
 2020-11-14 03:30:13 +00:00
Imbris
ff5b152525 Merge branch 'imbris/fix-6' into 'master' 
Fix issue where ui scale in the login menu was not updated when changed in-game

Closes #578

See merge request veloren/veloren!1513
 2020-11-14 02:49:41 +00:00
Imbris
a044981fd7 Fix panic on minimizing window before the game starts up 2020-11-13 21:09:19 -05:00
Imbris
1373b752ff Merge branch 'imbris/fix-5' into 'master' 
Remove randomization of species and body_type with the randomize button in char creation

See merge request veloren/veloren!1512
 2020-11-14 01:56:28 +00:00
Imbris
51dd5110d0 Merge branch 'imbris/fix-3' into 'master' 
Tweak clock related things and fix voxygen tracy feature

See merge request veloren/veloren!1506
 2020-11-14 01:39:33 +00:00
Imbris
cff5439796 Fix issue where ui scale in the login menu was not updated when changed in-game 2020-11-13 20:17:59 -05:00
Imbris
1952785af2 Remove randomization of species and body_type with the randomize button in char creation 2020-11-13 19:43:32 -05:00
Samuel Keiffer
1ed90bd0bf Merge branch 'sam/ron-abilities' into 'master' 
Move abilities to .ron files

Closes #821

See merge request veloren/veloren!1508
 2020-11-13 17:55:57 +00:00
Sam
b5f59f9cf3 Fixed tests. Addressed comments. 2020-11-13 10:41:34 -06:00
Monty Marz
7da8c71d89 radio buttons for buff position in settings 2020-11-13 14:32:15 +01:00
Monty Marz
691d1f5243 bigger buff icons above skillbar 2020-11-13 14:20:33 +01:00
Imbris
5fa2ac6e38 Handle window resizing properly to fix some bugs on startup 2020-11-12 23:56:36 -05:00
Imbris
f1ca3ccc69 Fix language and ui resolution in menus not updating when they are changed ingame 2020-11-12 23:03:44 -05:00
Imbris
37e4ea4669 Remove ability map from top level functions 2020-11-12 21:24:35 -06:00
Sam
9b4fa4e961 Started moving loading of ability manifest to an ecs variable. 2020-11-12 21:24:34 -06:00
Imbris
27d4310498 Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds 2020-11-12 19:18:54 -05:00
Imbris
fffd5d0ef0 Fix offset issue in ui on startup 2020-11-11 23:47:07 -05:00
Imbris
c0e8298ac3 Display averaged busy dt 2020-11-11 23:26:13 -05:00
Imbris
d5dd126724 Add tracy feature that randomly disappeared back into voxygen 2020-11-11 22:33:02 -05:00
Imbris
a97b188bea Make fps display and specification more precise 2020-11-11 21:47:22 -05:00
Snowram
af346806de Addressed comments 2020-11-11 22:03:54 +01:00
Snowram
fe977f0a6c Adds a speed stat to weapons 2020-11-11 22:03:53 +01:00
Joshua Barretto
7bce8b9615 More resiliant settings, better key defaults 2020-11-11 17:37:26 +00:00
Imbris
865482d768 ui: Improve login info banner gradient, smallify things, put login menu quit button at the bottom 2020-11-11 03:02:51 -05:00
Imbris
61c0780872 Remove uneeded commented code, add notes to remaining commented code, use source rect calculations from conrod backend code 2020-11-11 03:02:51 -05:00
Imbris
64d885a192 Clippy fixes 2020-11-11 03:02:51 -05:00
Imbris
584824d405 Tweak scrollbar in char select screen to look nicer, fix warnings, remove old ui code, add character loading/deleting/creating/error info popups 2020-11-11 03:02:23 -05:00
Imbris
9df8368c88 Add some tracing spans 2020-11-11 03:02:23 -05:00
Imbris
d2166fed3d Make iced ui use scale from the settings 2020-11-11 03:02:22 -05:00
Imbris
eda7b380dd Change glyph cache position tolerance to match changes in master 2020-11-11 03:02:22 -05:00
Imbris
469b048de9 Update iced 2020-11-11 03:02:22 -05:00
Imbris
90bfafc469 Fix tooltip positioning for tooltipped elements inside Scrollable widgets 2020-11-11 03:02:22 -05:00
Imbris
cd1a134c26 Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style 2020-11-11 03:02:22 -05:00
Imbris
7aa8412556 Add tooltips in iced char creation to species, tools, randomize button, and create button 2020-11-11 03:02:22 -05:00
Imbris
fe7d65843b Highlight button of selected character, enter the world if character is selected when enter key is pressed 2020-11-11 03:02:22 -05:00
Imbris
3b664d2efb Fix tooltip border images, fade tooltips properly, improve tooltip positioning 2020-11-11 03:02:22 -05:00
Imbris
d8854e9300 Add a tooltip to the char select screen to test 2020-11-11 03:02:22 -05:00
Imbris
5c85a29111 Create Tooltip widget in iced 2020-11-11 03:02:22 -05:00
Imbris
0361272746 Update to reflect changes in master ui: switched daggers with sceptre, added background at the bottom of the loading screen, added randomize button in the char creation screen 2020-11-11 03:02:22 -05:00
Imbris
0ab1a1ebb0 Loading screen: show animated gears instead of status message, show tips 2020-11-11 03:02:22 -05:00
Imbris
489a8a8f9e Remove background banner from login screen input boxes and move logo to right corner 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
bae7f56393 add padding to language select and server select menu buttons so that the scrollbar doesn't overlap them 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
52479fec2f add title to server select menu, don't use unneeded Container in language select menu 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
12abd64a01 change the text arrows in language select and server select with proper ui elements 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
5af6757de0 add language selection menu to main menu screen 2020-11-11 03:02:22 -05:00
Imbris
c247263258 Update to the latest git iced 2020-11-11 03:02:22 -05:00
Imbris
42c6550a0b Add more parts of the character selection screen, add mouse detector widget, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
de770694d8 Basic structure of character selection 2020-11-11 03:02:22 -05:00
Imbris
bc42f3f229 Add tabbing between fields in login screen 2020-11-11 03:02:22 -05:00
Imbris
586bdddc9e Add gradient primitive to ui, adjust textbox aspect ratio, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
3baac6aeba Update to latest iced git, rebase fixes 2020-11-11 03:02:22 -05:00
Imbris
545f3bd44b Start rewrite of character selection with iced 2020-11-11 03:02:21 -05:00
CapsizeGlimmer
34f92c7076 Implement renderer for slider 2020-11-11 03:02:21 -05:00
Imbris
10c046be2f Delete conrod main menu code!!!!!!, small tweaks 2020-11-11 03:02:21 -05:00
Imbris
ba573d2065 Add error message box (is the main menu finished?) 2020-11-11 03:02:21 -05:00
Imbris
e29364eedf Add border styling to container 2020-11-11 03:02:21 -05:00
Imbris
a94bc4b725 Make cancel button in connecting screen visble again, don't save username & server for singleplayer login, make iced version go back to login screen properly. 2020-11-11 03:02:21 -05:00
Yusuf Bera Ertan
a9541f1506 Implemented server selection screen 2020-11-11 03:02:21 -05:00
Imbris
e2bf974ecb Add Scrollable widget support, implement disclaimer screen, rearrangements of main menu ui code 2020-11-11 03:02:21 -05:00
Imbris
01eb061a83 Fill in username & server fields in ui reimplementation, stop saving password in the settings file 2020-11-11 03:02:21 -05:00
Imbris
73982637b2 Add styling for Container, implement auth trust prompt, misc additions 2020-11-11 03:02:21 -05:00
Imbris
20a46eb526 Make all the fonts available in iced ui rework 2020-11-11 03:02:21 -05:00
Imbris
5c13983631 Add parts of main menu such as version text and info text banner, make connection screen 2020-11-11 03:02:21 -05:00
Imbris
d6b38c8cd2 More main menu work, split main menu ui into multiple modules, misc fixes in the renderer 2020-11-11 03:02:21 -05:00
Imbris
d2f5a44d02 Input fields layout tweaks 2020-11-11 03:02:21 -05:00
Imbris
80426f352b Fix whitespace glitches, center text cursor 2020-11-11 03:02:21 -05:00
Imbris
561068106e Add input fields to main menu attempt, fix a few bugs, add bullet point to the font (might have done this wrong). (just a few glitches left when text contains spaces) 2020-11-11 03:02:21 -05:00
Imbris
e4bc035a62 Add support for TextInput widget, rename widgets module to widget, update to glyph_brush 0.7.0 2020-11-11 03:02:21 -05:00
Imbris
75adcb20e8 More buttons, FillText custom widget that adjusts text size based on available space, created button component thing (a reusable composition of widgets), fixed log to tracing rebase error 2020-11-11 03:02:21 -05:00
Imbris
04fe308b9c Rearrange iced renderer modules, wire up events for the main menu iced ui 2020-11-11 03:02:21 -05:00
Imbris
095345d8c6 Add support for Button widget, new custom widget AspectRatioContainer 2020-11-11 03:02:21 -05:00
Imbris
bc0792a57a Rename localization/font types (e.g. VoxygenLocalization -> Localization) 2020-11-11 03:02:21 -05:00
Imbris
0053299b14 Text rendering for iced with glyph_brush works now 2020-11-11 03:02:20 -05:00
Imbris
fa1cd17a71 Add for<'b> lifetime annotation (almost worked) 2020-11-11 03:02:20 -05:00
Imbris
a7458c099c Implement text renderering with glyph_brush (lifetime error) 2020-11-11 03:02:20 -05:00
Imbris
29526977d8 Add support for Space widget, refine main menu ui, misc fixes and improvements. 2020-11-11 03:02:20 -05:00
Imbris
b25162635a Revamp BackgroundContainer with scale specific padding, and use in main menu attempt 2020-11-11 03:02:20 -05:00
Imbris
5428feb0df Add Stack and CompoundGraphic widgets 2020-11-11 03:02:20 -05:00
Imbris
b5d31f6cba Begin implementing container widget with an image background 2020-11-11 03:02:20 -05:00
Imbris
6a4b7b70c2 Start experimenting with replicating main menu 2020-11-11 03:02:20 -05:00
Imbris
0305c1979a Get resizing working 2020-11-11 03:02:20 -05:00
Imbris
bbbede68fc Initial setup to use iced 2020-11-11 03:02:20 -05:00
Marcel
696f607a70 Merge branch 'xMAC94x/clock' into 'master' 
massivly switch clock algorithm.

See merge request veloren/veloren!1499
 2020-11-10 22:12:12 +00:00
Monty Marz
0e072f72cc frost cleaver 
velorite mage set

offsets
armor stats
 2020-11-10 21:43:45 +00:00
Marcel Märtens
e4e5c6e55b massivly switch clock algorithm. 
- before we had a Clock that tried to average multiple ticks and predict the next sleep.
   This system is massivly bugged.
   a) We know exactly how long the busy time took, so we dont need to predict anything in the first place
   b) Preduction was totally unrealistic after a single lag spike
   c) When a very slow tick happens, we dont benefit from 10 fast ticks.
 - Instead we just try to keep the tick time exact what we expect.
   If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.
 2020-11-10 18:31:42 +01:00
jshipsey
db753c4f3b adjust to comments 2020-11-09 18:47:52 -05:00
Sam
9b0e1c8dfc Slight balance tweaks. 2020-11-08 19:33:24 -06:00
jshipsey
7aa3de35c9 hammer keyframes 2020-11-08 19:54:46 -05:00
Sam
8fa7e246e9 Minor tweaks. 2020-11-08 18:11:53 -06:00
jshipsey
0618de138e rebase 2020-11-08 19:02:48 -05:00
jshipsey
20efc692fd ranged 2020-11-08 18:52:22 -05:00
jshipsey
92aa6a1b12 axe basic 2020-11-08 18:51:35 -05:00
jiminycrick
33e87de17e Initial combo melee for axe M1 2020-11-08 18:48:48 -05:00
AlKabir
9424ecfb4d centering assets 2020-11-08 00:35:11 -06:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
4ae946d699 Fix audio tests. 2020-11-07 15:53:19 -06:00
Sam
a4046872b2 Yeeted from code files. 2020-11-07 15:53:10 -06:00
AlKabir
77f3c7e3c5 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
b2ec207979 Revert "Removed toolCategory" 
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
 2020-11-06 15:33:20 +00:00
Marcel Märtens
40f5afc2b0 ci cleanup, dependency update 2020-11-06 14:34:42 +01:00
Samuel Keiffer
44f676d90c Merge branch 'sam/make-roll-great-again' into 'master' 
Roll overhaul

See merge request veloren/veloren!1484
 2020-11-06 03:25:18 +00:00
Sam
37ecb165ef Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox. 2020-11-05 20:40:20 -06:00
Snowram
262ceac060 fmt 2020-11-06 01:08:35 +01:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +01:00
Snowram
a52f83e92c Addresses some comments 2020-11-06 01:08:31 +01:00
Snowram
ce96af4363 Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
66850a5878 Fixed audio tests. Added changelog line. 2020-11-05 18:01:46 -06:00
jshipsey
fae3ef6e59 roll anim speedup 2020-11-05 16:40:30 -05:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
87bff41a66 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
c48c022f7e Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Snowram
a6d5d87bbc Fix animations regressions for biped_large 2020-11-04 02:12:43 +01:00
jshipsey
3bb839da85 convert humanoid anims, warnings 2020-11-04 01:48:06 +01:00
Snowram
b47f42bad5 More biped_large work 2020-11-04 01:48:05 +01:00
jshipsey
f009492319 cleanup 4 2020-11-04 01:48:05 +01:00
unknown
14ec1b9f5f starting to wire in new wield setup for bipedlarge 2020-11-04 01:48:05 +01:00
jshipsey
e6eeef4524 setup for axe/bow wield 2020-11-04 01:48:05 +01:00
jshipsey
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Snowram
ef1428f9fe Bones scaling cleanup 2020-11-04 01:48:05 +01:00
jshipsey
3d23475abd starting to wire in new wield setup 2020-11-04 01:48:05 +01:00
Snowram
72b15a1e24 More new style keyframe translation 2020-11-04 01:48:05 +01:00
jshipsey
c878673a84 cleanup 3 2020-11-04 01:48:05 +01:00
jshipsey
f79181c01f cleanup 2 2020-11-04 01:48:05 +01:00
jshipsey
e5734c1829 adjust skeleton_attr to s_a 2020-11-04 01:48:05 +01:00
Snowram
f9f3d33189 More new style keyframe translation 2020-11-04 01:48:04 +01:00
jshipsey
e928dbe4db start cleanup 2020-11-04 01:48:04 +01:00
Snowram
a8dd44325f Convert some animations to new style keyframes 2020-11-04 01:48:04 +01:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Marcel Märtens
00456c8373 extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game 2020-11-03 08:56:02 +01:00
Marcel Märtens
6bb74c9c6f Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly 2020-11-03 08:55:54 +01:00
ubruntu
8c1e1fdc5c Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance 2020-11-03 04:09:38 +00:00
Imbris
a556d2b5e7 Merge branch 'bbenton91/fix-password-length' into 'master' 
Changed password scale to allow 34 characters. Fixes issue #743

Closes #743

See merge request veloren/veloren!1464
 2020-10-30 02:37:54 +00:00
Brad
8b39dafe2e Changed password scale to allow 34 characters 2020-10-29 21:17:31 -04:00
Imbris
cb68aec291 Update changelog, address comments, fmt 2020-10-29 19:12:54 -04:00
Imbris
64def3cde4 Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts 2020-10-29 18:40:11 -04:00
Imbris
325695e937 Only try to connect to the singleplayer server after it has been initialized 2020-10-29 18:30:49 -04:00
Imbris
47b06658b0 Log where the userdata folder is in binary crates, fix bug where the old 
path was logged instead of the new path when renaming invalid settings
 2020-10-29 18:30:49 -04:00
Imbris
0ca3d51f29 Only allow hotbar keys instead of all UI related keys when the UI is hidden 2020-10-29 18:30:48 -04:00
Sam
7971034fde Fixed audio tests. 2020-10-28 18:15:28 -05:00
Sam
844e6f2b60 Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3. 2020-10-28 18:15:25 -05:00
Sam
63011241ea Added keyframes to all states that were lacking them. 2020-10-28 18:15:23 -05:00
Sam
f60985d733 Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now. 2020-10-26 19:30:17 -05:00
Sam
337cf6e137 Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented. 2020-10-26 19:30:10 -05:00
Sam
fdf8decb18 Handled health change over time buff effect better. 2020-10-26 19:28:27 -05:00
Sam
5a5d35fade Cleaned up logic used to handle buff addition. Old active buffs now get deleted if they had a smaller duration and weaker strength. 2020-10-26 19:28:26 -05:00
Monty Marz
3f7b5a095b player buffs at minimap visuals 
Update settings.rs
buff timers
 2020-10-26 19:28:25 -05:00
Imbris
be1767a5af Fix group tooltips, make ui buff code more efficient, avoid crashing on characters button press 2020-10-26 19:28:25 -05:00
Monty Marz
8fa398954d Initial implementation of buffs UI 
player buffs animation

more testing debuffs

sorting and display limit fix

overhead buffs

fix

WIP buff removal function

fmt

Update buffs.rs

Now with compiling: WIP group UI buffs

positioning

Update group.rs

Update group.rs

Small optimizations.

Fixed positioning of buffs in group panel. Broke buff tooltips in group panel.

buff frame visuals

added setting for displaying buffs at minimap
 2020-10-26 19:28:24 -05:00
Sam
007d3c09ac Buffs now get removed on death by default. Buffs are now required to have either the 'Buff' or 'Debuff' tag. RemoveByCategory function now has support for blacklisting certain categories. Support for UI stuffs. 2020-10-26 19:28:23 -05:00
Monty Marz
b31c6877b4 skillbar fixes, buff UI module 
adjustments, fixes, assets, test buffs widgets
 2020-10-26 19:28:23 -05:00
Monty Marz
f096bece5c skillbar update part 1 
skillbar rework part 2
 2020-10-26 19:28:21 -05:00
Sam
1a1ceb54bc Server event used to deal damage/heal with buffs. Buff kills now award xp. 2020-10-26 19:28:20 -05:00
Marcel Märtens
1b47913835 fix clippy after toolchain update 2020-10-26 22:30:51 +01:00
Marcel Märtens
153c6c3b13 Fixing Tarpaulin isn't easy. 
So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version.
Then we had to update several dependencies, which broke:
 - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27
 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23
 - update conrod to use modern copypasta 0.7
 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project.
 - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type.
   It was called `convert_event`
 - make a `simd` feature which is default and introduce conditional compiling.
   AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS.
 - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
 2020-10-26 17:04:20 +01:00
NathanW
7e92e21f8b Address issue #808: Add Frame Time in DebugInfo 2020-10-22 16:42:10 -06:00
Joshua Barretto
2237500743 Clouds 2020-10-21 21:05:25 +00:00
jshipsey
c74133740e remove commented code 2020-10-19 16:20:59 +02:00
Snowram
d5e60d93b4 Add missing biped_large anims 2020-10-19 16:20:59 +02:00
jshipsey
9c003cf572 bipedlarge hammer fixes 2020-10-19 16:20:59 +02:00
jshipsey
64d73abdec roshwalr fix 2020-10-19 16:20:59 +02:00
jshipsey
caa048b1d5 small fixes 2020-10-19 16:20:59 +02:00
Snowram
7a62ddfd3f Add BeastClaw npc weapontype 2020-10-19 16:20:59 +02:00
Snowram
f9383e4dd8 Add roshwalr npc 2020-10-19 16:20:59 +02:00
jshipsey
66b1fe67dc rebase 2020-10-19 16:20:58 +02:00
Snowram
c9985e14cb Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
65df398672 werewolf work 2020-10-19 16:20:58 +02:00
Snowram
6c54e6d8fe Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee Add treant npc 2020-10-19 16:20:58 +02:00
Snowram
290adcfad8 Standardizes character bone names 2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad More bipedlarge anim work 2020-10-19 16:20:58 +02:00
Snowram
c1c2c9dc07 Add bipedlarge spin and beta anims 2020-10-19 16:20:58 +02:00
unknown
94cbe3faf4 Better bipedlarge weild, charge and shoot anims 2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
Snowram
0a9ec848a7 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
4dcd450382 Add beast attributes 2020-10-19 16:20:57 +02:00
Snowram
a4f4fa38e2 Improve bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
f4a068c422 Initial bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
204fa50de9 Add werewolf npc 2020-10-19 16:20:57 +02:00
Marcel
f6692aee74 Merge branch 'UMR1352/fix#788' into 'master' 
Fix issue #788

Closes #788

See merge request veloren/veloren!1432
 2020-10-16 12:17:49 +00:00
Samuel Keiffer
b5a969862a Merge branch 'sam/staff-overhaul' into 'master' 
Staff Rework

Closes #767 and #762

See merge request veloren/veloren!1429
 2020-10-16 02:22:00 +00:00
Joshua Barretto
8617b17569 Merge branch 'UMR1352/fix#790' into 'master' 
Fix issue #790

Closes #790

See merge request veloren/veloren!1439
 2020-10-15 14:14:52 +00:00
Enrico Marconi
af0542db90 Suggested edit 2020-10-15 14:47:29 +02:00
Enrico Marconi
d85473bccf Reviewer's suggested edit 2020-10-15 14:36:59 +02:00
Enrico Marconi
9c184b60e4 Fix issue #790: hotbar working while ui is toggled off 2020-10-15 13:28:29 +02:00
Sam
14e4af7ab6 Addressed playtesting feedback. 2020-10-14 21:06:52 -05:00
jshipsey
6f3f6996a6 clippy 2020-10-14 21:06:35 -05:00
jshipsey
6a744eed82 anims 2020-10-14 21:06:32 -05:00
Monty Marz
4b2eba71e7 new staff skill icons 2020-10-14 20:56:58 -05:00
Sam
1c21362bc3 Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles. 2020-10-14 20:56:23 -05:00
Sam
7ef73f5981 Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second. 2020-10-14 20:56:22 -05:00
Sam
cbb72363af Reworked explosions. Tweaked staff fireball. 2020-10-14 20:56:21 -05:00
Sam
04dcd012da Flamethrower particles. 2020-10-14 20:56:21 -05:00
Sam
c80f16ae74 Started to add particles. 2020-10-14 20:56:20 -05:00
Sam
256846a669 Initial implementation of new staff abilities. 2020-10-14 20:56:16 -05:00
jshipsey
3bb59b36cd energy values, remove hotload 2020-10-14 12:50:33 -07:00
jshipsey
64f72a73f9 axeleap tweaks 2020-10-14 12:50:33 -07:00
jshipsey
22d8792c4b adjustments to chargedmelee, repeater 2020-10-14 12:50:33 -07:00
Snowram
697ea80665 Axe MeleeLeap character animation 2020-10-14 12:50:33 -07:00
jshipsey
521ffd64ba cleanup 2020-10-14 12:50:33 -07:00
jshipsey
28eb58ddfa anims 2020-10-14 12:50:33 -07:00
jshipsey
281155186f hammer leap melee anim 2020-10-14 12:50:33 -07:00
jiminycrick
9ebda3c353 Made bow leap more graceful and set energy costs and removed jitter for no leap 2020-10-14 12:50:32 -07:00
jiminycrick
ae4b259250 Fix what broke during rebase 2020-10-14 12:50:32 -07:00
jiminycrick
431f99a791 Reducing the amount of data in character state 2020-10-14 12:50:32 -07:00
jiminycrick
05623eb8bd Addressed comments 2020-10-14 12:50:32 -07:00
jiminycrick
04175bab09 Add skillbar stuff for 3rd skills 2020-10-14 12:50:32 -07:00
jiminycrick
951acfca21 Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff 2020-10-14 12:50:32 -07:00
Marcel Märtens
f1c9b959f4 rename a file, fix error msg, dont spam persistence by default 2020-10-13 00:06:24 +02:00
Enrico Marconi
7a5b7cb478 Fix issue #788 
Missing items in the 'require' section are now shown in red.
 2020-10-12 17:41:17 +02:00
Marcel Märtens
55b59fbe07 various small fixes according to the MR 2020-10-12 11:25:20 +02:00
Marcel Märtens
d7a74c0cf1 fix voxygen state system. before we had a timing error that we did the next voxygen step before client set in_game which lead us to a disconnect. 
now assume in_game is correct in client unless told by server in its answer
 2020-10-11 22:49:19 +02:00
Marcel Märtens
b1db5ef488 Redo Network Frontend. 
Rather than having a single Stream to handle ALL data, seperate into multiple streams:
 - Ping Stream, for seperate PINGS
 - Register Stream, only used till the client is registered, then no longer used!
 - General Stream, used for msg that can occur always
 - NotInGame Stream, used for everything NOT ingame, e.g. Character Screen
 - InGame Stream, used for all GAME data, players, terrain, entities, etc...

This version does compile, and gets the client registered (with auth too) but doesnt get to the char screen yet.

This fixes also the ignoring messages problem we had, as we are not sending data to the register stream!
This fixes also the problem that the server had to sleep for the Stream Creation, as the Server is now creating the streams and client has to sleep.
 2020-10-11 22:49:14 +02:00
Imbris
b9b84d2890 Migrate singleplayer save folders to the new location if they have not already been generated 2020-10-10 20:25:32 -04:00
Imbris
83fb26c4f9 Group editable server settings into one struct that is stored in the ecs, don't expose DataDir, use Uuid in the whitelist instead of usernames, replace Banlist record tuple with new type with named fields, remove commented code 2020-10-10 02:10:32 -04:00
Imbris
a3ee5a4006 Rename model_col -> highligh_col to better reflect its usage 2020-10-10 02:10:32 -04:00
Imbris
308cca0dc9 Put server-cli specific settings in their own structure, serde_derive -> serde 2020-10-10 02:10:32 -04:00
Imbris
7c14a3f4a4 New userdata folder that holds voxygen settings and logs and server saves and settings, split up server settings file into parts that are persisted back to their files and parts that are read-only, misc fixes 2020-10-10 02:10:32 -04:00
Imbris
ef74d395a6 Improve figure and sprite highlighting 2020-10-10 02:10:31 -04:00
Monty Marz
2b800a2b63 make clippy happy 
Delete glider.ron
 2020-10-07 02:23:20 +00:00
Marcel
33be0a0e9f Merge branch 'mdroogle/interaction_hint' into 'master' 
Add interaction hint #615

See merge request veloren/veloren!1394
 2020-10-01 09:31:54 +00:00
Sam
47abf49751 Addressed comments 2020-09-29 20:48:23 -05:00
Sam
207586cfab Beam particles fixed/tweaked. 2020-09-29 19:48:17 -05:00
Sam
51141b2c1a Changelog line, final balance tweaks. 2020-09-29 19:48:16 -05:00
Sam
56d2afc0dc Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
ffe456c703 Fixed what broke after rebasing. 2020-09-29 19:48:13 -05:00
Sam
3d6c26a3c7 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Monty Marz
2a884df8de fix SCT decimals not being absolutes 2020-09-29 19:48:10 -05:00
Sam
de45784596 Addressed round of testing feedback. 2020-09-29 19:48:09 -05:00
Monty Marz
13d9b814ab separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre 
remove firebolt from starting sceptre
 2020-09-29 19:48:07 -05:00
Sam
095433abcc Addressed comments. 2020-09-29 19:48:06 -05:00
Sam
46563e7008 Added beam system. Added collision code for spherical wedge/cylinder detection. 2020-09-29 19:48:04 -05:00
Sam
ddbe871b50 Placeholder animation for beam attack. 2020-09-29 19:48:03 -05:00
Sam
36762be2a7 Fixed explosion color of sceptre M2. 2020-09-29 19:47:59 -05:00
Sam
6b23af6e0b Tweaked particles. Added skill icons. 2020-09-29 19:47:58 -05:00
Sam
8b9202710f New sceptre M2 is functional. 2020-09-29 19:47:57 -05:00
Sam
921d224ef6 Lifesteal now works. Added particles to healing beam. 2020-09-29 19:47:57 -05:00
Forest Anderson
25ab132d73 Merge branch 'xvar/add-clone-on-ref-ptr-clippy-lint' into 'master' 
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors

See merge request veloren/veloren!1411
 2020-09-28 19:32:03 +00:00
Joshua Yanovski
443f3287e4 Merge branch 'sharp/remove-spurious-vox' into 'master' 
Remove spurious uses of Vox.

See merge request veloren/veloren!1406
 2020-09-27 16:41:29 +00:00
Ben Wallis
b3dd8e8a02 Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors 2020-09-27 17:25:33 +01:00
Ben Wallis
11fc74642e Refactored crafting to use ItemDef instead of Item 2020-09-27 14:55:31 +01:00
Joshua Yanovski
938039a56e Remove spurious uses of Vox. 
In the process, also try to address a few edge cases related to block
detection, such as adding back previously solid sprites and removing
filters that may be vestiges of earlier logic.
 2020-09-26 16:30:40 +02:00
Marcel Märtens
b7dc17c11f switch version to pre-alpha-2020-09-22 vs pre-alpha-v0.7.0 2020-09-22 12:04:07 +02:00
Marcel Märtens
8eec46424f switching veloren naming scheme, to either one of the following: 
`stable-0.7.0 (<hash>-<datetime>)` for release versions.
And
`nightly-<date> (<hash>)` for nightly and master versions

Reason is, many players only give information that they are running `0.x.0` but are not giving us the information which day, or commit they are running. So we should make master builds less confusing.
 2020-09-22 11:47:18 +02:00
jshipsey
4f0faf4c56 small corrections 2020-09-21 23:57:10 -04:00
Snowram
fa2dd28587 Fixed various issues from better-things branch 2020-09-21 23:57:10 -04:00
Sam
2ff59c9f60 Addressed comments 2020-09-21 17:55:29 -05:00
Sam
8ab0d5e5e0 Added icon for skillbar ability of sword. 2020-09-21 17:40:20 -05:00
jshipsey
0796337a8c resolve minor anim hiccup 2020-09-21 17:40:19 -05:00
Sam
1fbcf2be80 Fixed pipeline errors. 2020-09-21 17:40:19 -05:00
Sam
b4018e7d42 Made 3rd ability interruptible. Final balance tweaks. 2020-09-21 17:40:16 -05:00
jshipsey
8070a38a89 spin anim 2020-09-21 17:38:57 -05:00
jshipsey
e79cef4824 dash animation 2020-09-21 17:38:55 -05:00
Sam
a8e834e754 Initial implementation of spin attack for sword. 2020-09-21 17:38:54 -05:00
jshipsey
b0d359e29f slightly quicker alpha, improved anims 2020-09-21 17:38:54 -05:00
Sam
fe70b7fbce Addressed second round of feedback. 2020-09-21 17:38:53 -05:00
Sam
b06ab250cc Addressed first round of feedback on sword overhaul. 2020-09-21 17:38:52 -05:00
Sam
c99e4c3c18 Added swing duration to dash melee. Added framework for animation to be added. 2020-09-21 17:38:51 -05:00
Sam
04af75bf8d Initial implementation of new dash melee. 2020-09-21 17:38:48 -05:00
jshipsey
a18c23025e stage 2 and 3 anim 2020-09-21 17:38:46 -05:00
Sam
847bddbd89 Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states. 2020-09-21 17:38:46 -05:00
Sam
2ba9d1e54f Added support for different swings in the combo melee having differnt fractions of time buildup duration is split. 2020-09-21 17:38:45 -05:00
jshipsey
2451a64b97 stage 2 animation 2020-09-21 17:38:44 -05:00
Sam
0ba5740265 Added enum for stage section instead of using 4 bools. 2020-09-21 17:38:43 -05:00
Sam
440e45f2bc Did stuff to support addition of keyframes for combo melee animation. 2020-09-21 17:38:43 -05:00
Sam
aab56ea636 Animation time for combo melee now resets between stages. 2020-09-21 17:38:42 -05:00
Sam
cf573a42bd Initial implementation of combo melee attack. 2020-09-21 17:38:41 -05:00
Joshua Barretto
388a899a7f Added make_sprite command 2020-09-21 16:39:20 +01:00
Joshua Barretto
ece4a01867 Improved representation of Block for better performance, more features, and better backwards-compatibility 2020-09-20 11:46:12 +01:00
Samuel Keiffer
b2f42a117c Merge branch 'sam/boss' into 'master' 
Boss

Closes #769

See merge request veloren/veloren!1364
 2020-09-19 20:47:07 +00:00
Joshua Yanovski
7b43752785 Merge branch 'droogmic/scene_terrain_refator' into 'master' 
Voxygen scene terrain - minor refactor

See merge request veloren/veloren!1392
 2020-09-19 20:29:02 +00:00
Sam
6deeb7fcfe Addressed another comment. 2020-09-19 14:40:22 -05:00
Sam
45fef87f32 Addressed comments 2020-09-19 14:40:21 -05:00
Sam
e39770d1d9 Golem now spawns in dungeon. 2020-09-19 14:40:20 -05:00
Sam
6327dd18b6 Moved knockback to a server event so that it would actually be applied to the player. 2020-09-19 14:40:17 -05:00
scott-c
1f2ed53c42 Tweak particle effects 2020-09-19 14:40:15 -05:00
Sam
0c48efd445 Added particles dedicated for shockwave. 2020-09-19 14:40:15 -05:00
Sam
23fa3c2f8d Added particles to shockwave attack. 2020-09-19 14:40:14 -05:00
Sam
717142d5ea Started to implement shockwave system. 2020-09-19 14:29:06 -05:00
Sam
66b0fee3c7 Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it. 2020-09-19 14:29:04 -05:00
Michael Droogleever Fortuyn
7fd50f36ef Add interaction hint #615 
Add text above dropped items hinting at
the use of the interaction control

e.g. pressing E
 2020-09-19 20:38:48 +02:00
Imbris
9464fd49a9 Unify healthbar showing calculation, move bubble acquisition into closure 2020-09-19 13:54:05 -04:00
Imbris
ca2aad0080 Make chat bubbles show up even if nametags are not displayed 2020-09-19 13:54:05 -04:00
Imbris
b31df2f34e Use proper fps in voxygen graphics settings tab 2020-09-19 13:54:05 -04:00
Michael Droogleever Fortuyn
a3c4040063 Scene terrain worker refactor 
Simplify ChunkMeshState's active worker tracking to a bool,
as the tick value was never being used.
 2020-09-19 16:13:29 +02:00
scott-c
2686598f1f Improve first-person projectile aiming 2020-09-19 19:14:23 +08:00
Monty Marz
5fe79e1c6a new loading screen bgs (part 1) 
Add a basic random feature to char creation

loading screen bg (part 2)

loading screen changes, random button graphics
Random appearance also pick a random npc name
 2020-09-18 23:17:47 +00:00
Snowram
f9fada87cf Addresses comments 2020-09-18 18:45:03 +02:00
jshipsey
8330d087e6 clippy 2020-09-17 22:58:02 -04:00
jshipsey
fff6a6fb0a finish odonto 2020-09-17 22:32:11 -04:00
jshipsey
b0767cb7a5 minor anim fix 2020-09-17 22:32:11 -04:00
jshipsey
5bb45a4861 spawn tweaks, improved odonto 2020-09-17 22:32:11 -04:00
Snowram
fecc40ad8e Better quadmed legs/feet ratio 2020-09-17 22:32:11 -04:00