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
3,837 Commits 151 Branches 18 Tags 2.1 GiB
4c6da3ed16
Commit Graph

1653 Commits

Author SHA1 Message Date
Pfauenauge90
0e7f3a6b00 Update vol.rs 2020-03-15 15:53:51 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
timokoesters
598a4c6cbb Add loadout struct for info on weapon configurations 2020-03-14 22:33:20 +01:00
AdamWhitehurst
6fc94c22ba Update timed combo, add CharacerBehavior trait 2020-03-14 12:50:07 -06:00
timokoesters
fe19698d52 Make abilities depend on weapon 2020-03-14 16:40:29 +01:00
Shane Handley
4e5d200b70 Fix: Make the dropped item collection range match the world item range limit. 2020-03-12 11:54:23 +09:00
Shane Handley
434dd96cd6 Check for the mousedown state before trying to collect an item via secondary mouse click. 2020-03-11 15:39:46 +09:00
Acrimon
406767ae31 Merge branch 'capucho/voxygen-logout-timeout' into 'master' 
FIX #513 logout timeout

See merge request veloren/veloren!837
 2020-03-10 22:12:29 +00:00
Mckol
c3f1afdf2b Merge branch 'controller' into 'master' 
Controller support

Closes #20

See merge request veloren/veloren!750
 2020-03-10 21:00:13 +00:00
Mckol
8838682f0b Added Controller support 2020-03-10 21:00:13 +00:00
S Handley
b2312a0487 Check that a targeted collectible is within a certain pickup range of the character before highlighting it 2020-03-10 20:50:04 +00:00
Capucho
16e4214a52 Switch states instead of popping 2020-03-10 20:34:50 +00:00
Capucho
9d805a745e Proper fix to the logout timeout problem using Disconnect ACK 2020-03-10 20:34:50 +00:00
Capucho
d8ba63ffdc Janky fix of the logout timeout problem 2020-03-10 20:34:50 +00:00
Acrimon
bc39b78173 Rebased. 2020-03-08 23:02:15 +01:00
Imbris
8d7c454029 Hide password text 2020-03-08 23:00:34 +01:00
Imbris
0022f8464d Update auth 2020-03-08 22:59:22 +01:00
Songtronix
d2e12fd166 feat(auth): localisation of authentication errors 2020-03-08 22:58:43 +01:00
Imbris
a04c1b1d1d Add uid to Player component 
fix: world examples
 2020-03-08 22:58:38 +01:00
Acrimon
d4225cfb45 Auth error help message. 
main menu message about auth
 2020-03-08 22:57:09 +01:00
Imbris
6cc07270ac improve(login): more precise error handling during login 2020-03-08 22:56:59 +01:00
Songtronix
ac5ff453cc improve(voxygen): error handling while connecting 2020-03-08 22:54:49 +01:00
Acrimon
7db0ff0b8c Update chat-cli to work properly. 
Update reqwest to 0.10.0
 2020-03-08 22:54:15 +01:00
Imbris
8ef1251dc2 Add warning prompt for untrusted auth servers, move some auth code into 2020-03-08 22:51:37 +01:00
Acrimon
584dcddba9 Updated to latest and greatest auth version. 2020-03-08 22:46:40 +01:00
Songtronix
50b845d1c3 :/ and reactivated the password field 2020-03-08 22:34:06 +01:00
jshipsey
bce9d4c24f animation corrections 2020-03-08 17:02:25 -04:00
Snow
72b2334434 more eagle adjustements 2020-03-08 15:07:47 +00:00
Adam Whitehurst
49c7143144 Clean up warnings 2020-03-07 13:03:10 -08:00
Adam Whitehurst
54a7112ad9 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
Adam Whitehurst
b1d1299fe6 Clean up character states 2020-03-07 10:15:02 -08:00
Imbris
ed5afaec8a Fix tests 2020-03-05 23:12:51 -05:00
Imbris
4a0c474be1 Remove Client dependency from Scene types and audio managers, add an 
example for using voxygen as a library to renderer images of characters
 2020-03-05 23:12:51 -05:00
Acrimon
511bbd3899 Merge branch 'capucho/screenshots-logs-directory' into 'master' 
Save screenshots and logs in a fixed directory

Closes #484

See merge request veloren/veloren!835
 2020-03-05 19:26:07 +00:00
S Handley
ea53dea8a7 Fixes https://gitlab.com/veloren/veloren/issues/484 partially by saving logs to a fixed place (defined in the settings file) 2020-03-05 19:26:07 +00:00
Capucho
a3479f6a49 Fixed the bugs in the settings tab and the character button in the escape menu and unpause when there is more than 1 player 2020-03-05 18:55:14 +00:00
Capucho
6f6b8986b6 Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
f13314e3da Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
af21d19ff3 Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button 2020-03-05 18:38:39 +00:00
Capucho
a97b694dfe Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration 2020-03-05 18:38:39 +00:00
Justin Shipsey
86e15695fc weapon control bone 2020-03-05 14:02:11 +00:00
Shane Handley
9d8d61736b Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00
S Handley
b0ca85069b Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it. 2020-03-04 10:09:48 +00:00
S Handley
daa0a10c2c Revert "Do that better, and add a TODO." 
This reverts commit 9b0f11bd89.

It wasn't better.
 2020-03-01 19:45:05 +00:00
Shane Handley
0d2b26a3b8 SFX Fixes - Reinstate run, uncomment tests and make them pass, adjust 
config.
 2020-02-25 22:03:29 +09:00
Justin Shipsey
5438514343 animation housekeeping 2020-02-25 06:47:56 +00:00
Shane Handley
d6f72876e9 Fix tests for movement sfx. 2020-02-25 10:01:41 +09:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
timokoesters
ac611f4618 fix: sync characterstates, better energy management 2020-02-24 20:57:33 +01:00
Treeco
4c65a5aed3 Made LOD setting slider exponential 2020-02-24 19:00:32 +00:00
timokoesters
2fa902270e fix: block 2020-02-24 18:10:42 +01:00
Joshua Barretto
aab059a450 Added LoD slider 2020-02-24 15:14:06 +00:00
Joshua Barretto
9fea150473 Fixed maths, improved LoD resolution 2020-02-24 12:38:53 +00:00
Joshua Barretto
a3e36a50ab Simpler terrain spiral rendering 2020-02-23 18:13:51 +00:00
Joshua Barretto
be775c9484 Applied good ideas from experimental branch 2020-02-23 15:30:45 +00:00
S Handley
d87061fe14 Add a volume option to SfxEvents, and use this to dispatch movement sfx for quadripeds at a volume proportionate to their size. 2020-02-23 01:26:51 +00:00
Joshua Barretto
2400786c13 Use world map as LoD source 2020-02-21 13:48:40 +00:00
Joshua Barretto
5e6f81b86c sync 2020-02-21 11:12:25 +00:00
Joshua Barretto
745e7540dd Improved cloud falloff mist, faster noise sampling 2020-02-21 11:12:02 +00:00
Joshua Barretto
f6a200d0cb Improved long-range depth precision, removed unnecessary LoD polygons 2020-02-21 11:12:02 +00:00
Joshua Barretto
63d1b2bb22 Working LoD shader 2020-02-21 11:12:02 +00:00
Joshua Barretto
f13d98ee3e LoD first attempt (stack overflow issue) 2020-02-21 11:10:16 +00:00
S Handley
9ab2833056 Add weapon wield/unwield sfx support 2020-02-21 02:56:54 +00:00
Monty Marz
2180040f70 Orc hairstyles, several tiny UI fixes, fixed beard warnings 2020-02-20 10:32:03 +00:00
Monty Marz
18f46a6f83 Fix Fonts 2020-02-17 16:22:49 +00:00
Treeco
abe47d8621 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
aaf1de9f9b Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Rémy PHELIPOT
98c37d0b28 [i18n] Configurable fonts 
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
 2020-02-16 16:02:38 +01:00
Monty Marz
90680d5490 Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
S Handley
b739623579 Split the audio channels into SFX and music channels. This makes the 
Music Channel for exploration music a basic Sink without spatial audio
functionality, which is not required.
 2020-02-15 21:30:44 +00:00
Imbris
fb7edd2404 Make nametag positioning slightly better 2020-02-06 17:10:52 -05:00
Imbris
f8283116a8 Fix highlighting non-collectibles 2020-02-06 17:06:49 -05:00
Monty Marz
93d7c67cdc Hack to allow minimap rotation. 
Currently it just always rotates towards the camera, but it wouldn't be
hard to create a config option that swaps out the rotation of the
indicator and the map.
 2020-02-06 17:34:32 +00:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
timokoesters
aeb37a1f33 improvement: char speed 2020-02-03 20:43:36 +01:00
timokoesters
aa52c6fd4f fix: jumping and attacking 2020-02-03 17:03:52 +01:00
S Handley
b7ce91fead Move music under audio 
Also add some blank time after each track so that we get some silence
between tracks.
 2020-02-03 11:55:32 +00:00
Marcel Märtens
dae31ae5b6 apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Marcel Märtens
dd21235ff8 Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable, 
especially enumerations and other source code in errosions file
 2020-02-01 21:37:36 +01:00
Marcel Märtens
e960c2233b Change the version number to 0.5 2020-01-31 17:26:45 +01:00
Joshua Barretto
faa86226c7 Collars 2020-01-29 12:01:28 +00:00
Justin Shipsey
908e099aa5 minor anim tweaks 2020-01-29 06:38:08 +00:00
Rémy PHELIPOT
ce54f27531 Add missing translations 2020-01-27 20:34:36 +01:00
Rémy PHELIPOT
c501b2d0bf Use English instead of saved language if loading fails 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
8946ed8d82 Add missing translations in voxygen 
Fix #436
 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
f60a68d96d Improve i18n "get" performances by returning a &str 2020-01-27 19:59:17 +01:00
timokoesters
76dfac7366 fix: rolling 2020-01-27 18:32:05 +01:00
Justin Shipsey
53e57cb5dc quad_medium animation 2020-01-27 14:16:23 +00:00
Treeco
6bcab1e89b Fixed lag caused when turning the camera with large entity counts 2020-01-26 20:04:56 +00:00
Joshua Barretto
d04a595b3f Made waypoints work, added waypoint spawning 2020-01-26 12:52:28 +00:00
Joshua Barretto
11193a692a Better neutral AI, initial waypoint objects 2020-01-26 12:52:28 +00:00
Joshua Barretto
2d9aa21eef Added test world, friendly NPC pathfinding 2020-01-26 12:52:07 +00:00
Monty Marz
49071400d2 Fix: Healthbars size 2020-01-26 01:19:36 +00:00
Justin Shipsey
64690279af new mobs 
alligators
 2020-01-26 00:22:48 +00:00
Monty Marz
b583f60326 35 new ground sprites, UI fixes 2020-01-25 11:14:02 +00:00
Monty Marz
4287c76e95 Fix: Player can't push the "Enter World" button anymore without having a character. 2020-01-25 10:36:30 +00:00
Imbris
460f5e6f26 Enable pixel art resizing for voxel based ui elements 2020-01-24 23:14:59 -05:00
Imbris
e5d841e62f Adds fullscreen and window size settings and coverage based pixel art 
scaling
 2020-01-24 23:14:59 -05:00
Imbris
166aba61f0 Make nametages etc fixed size and only display within limited range 2020-01-24 22:09:45 -05:00
timokoesters
6515daddce fixes 2020-01-24 16:57:24 +01:00
Pfauenauge90
c08c545474 fixed numbers spam 2020-01-24 16:10:38 +01:00
Joshua Yanovski
3383e991e7 Erosion cleanup, part 1. 
Covers all files touched by MR that are not in world/src/sim.
 2020-01-23 18:18:17 +01:00
Joshua Yanovski
49e7e55cd6 Fix warnings in examples and benchmarks. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
1d6d0ea03d Fix all warnings. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
1358f1dffa Changes to worldgen, adding more sedmient etc. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
14e4dfb53f Re-fix map orientation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
e91578ffdb Cargo fmt most things (except erosion.rs). 2020-01-23 18:18:12 +01:00
Joshua Yanovski
2b38927345 Fixes for nonstandard chunk and map sizes. 
Also fixes a longstanding map rendering issue.
 2020-01-23 18:18:11 +01:00
Joshua Yanovski
9520ef4f6d Implement sending world map across the network. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
72287f2041 Implement carving strategy for lake connections. 
Also fix mapgen slopes and make a much more pleasing world.
 2020-01-23 18:18:08 +01:00
Monty Marz
bfee0a6f9e Character stats displayed in char window, pulsating active slot in inventory 2020-01-23 17:14:02 +00:00
Monty Marz
1365abae99 Clean up unused UI assets 2020-01-22 21:56:03 +00:00
timokoesters
7b558b4542 refactor: combine actionstate and movestate 2020-01-21 23:54:59 +01:00
Monty Marz
e2707ff24a start menu text 2020-01-21 22:04:39 +00:00
Gilbert Röhrbein
c2b99f3a62 Fix panic in case no default audio device found when audio off 2020-01-21 18:09:37 +01:00
Joshua Barretto
8e7a8aa4f9 Shader optimisations 2020-01-21 12:58:20 +00:00
Joshua Barretto
8a0bd9220b Fixed button font 2020-01-20 22:54:51 +00:00
Joshua Barretto
4b5cc272ac sync 2020-01-20 22:51:55 +00:00
Joshua Barretto
397fa7777f Switched to enum-based char creation state 2020-01-20 22:29:14 +00:00
Rémy PHELIPOT
a6f9f533a5 Localization system for Voxygen 
- Added a localization system in voxygen
- Support English and French languages
- Added a configuration option in the interface settings to change
  the language
 2020-01-20 21:07:25 +01:00
Joshua Barretto
0223a60a1e Merge branch 'zesterer/cs-char-saving' into 'master' 
Client-side character saving

See merge request veloren/veloren!737
 2020-01-20 18:03:28 +00:00
Joshua Barretto
6f26f2afb1 fmt 2020-01-20 17:45:28 +00:00
Pfauenauge
caa5abf183 updated info main menu info 2020-01-20 18:08:05 +01:00
S Handley
b44955ba30 Remove currently unused audio assets 
This clears out about 56MB of unused audio files.

There were also some unused methods in the audio modules which
referenced a file, which has also been removed.
 2020-01-20 15:07:30 +00:00
Joshua Barretto
fc1e66fb31 Solved character select body bug 2020-01-20 15:04:53 +00:00
Joshua Barretto
8f86e45a72 Enumerated Body type 2020-01-20 14:21:06 +00:00
Joshua Barretto
2c42aaf5f5 Added client-side character saving 2020-01-20 13:37:29 +00:00
Joshua Yanovski
898b5c6593 Fix benchmarks and profile overrides. 
This was necessary because Cargo recently deprecated the "overrides"
keyword in favor of "package", and Criterion changed its interface.

This commit also now lists more configurable keys, so if they aren't set
to their defaults the user will be able to find them.  This includes the
roll key, which wasn't listed earlier and is different on Windows and
Mac.  It does *not* include the respawn key because that key is already
shown when you die.
 2020-01-20 14:16:28 +01:00
Joshua Yanovski
355a1b204a Fixes for OS X machines. 
Handles scroll wheel events in pixels (enabling the scroll wheel) and
sets rolling and wall leaping to use left shift by default on OS X
(instead of middle mouse click, which is absent by default on Apple
trackpads).  Also updates the controls UI to show the actual assigned
keys for those controls which are configurable.
 2020-01-20 05:12:41 +01:00
Imbris
38c48317f7 Fix lighting calc bug, lower meshing bench sample size 2020-01-19 18:14:07 -05:00
Pfauenauge90
8a0efd3654 added TODO for energy numbers 2020-01-19 22:39:20 +01:00
Pfauenauge90
885e698e5a charge icon update 2020-01-19 22:39:19 +01:00
Pfauenauge90
6a32845e58 various fixes 2020-01-19 22:39:19 +01:00
Pfauenauge90
480b920fa3 skillbar background fix 2020-01-19 22:39:18 +01:00
Pfauenauge90
863e4c4962 darkened button for unavailabe charge 2020-01-19 22:39:18 +01:00
Imbris
94210070f7 fmt fix 2020-01-19 16:03:27 -05:00
Imbris
3c8d0a3bb9 fix typo, replace u32 with Vec3<u8> in light propagation queue 2020-01-19 16:03:27 -05:00
Imbris
4b01c1b082 add: capability to disable blending for particular BlockKinds 2020-01-19 16:03:27 -05:00
timokoesters
ae1fa5e4c4 improvement: fog doesn't go back and forth anymore 2020-01-19 16:03:27 -05:00
Imbris
b3cdde3ce9 fix: panic in terrain meshing 2020-01-19 16:03:27 -05:00
Imbris
5666f18ded Add terrain meshing benchmark 2020-01-19 16:02:12 -05:00
Imbris
6f6dc1b16b Cleanup 2020-01-19 16:02:12 -05:00
Imbris
aa48729376 Compress position used in propagation queue, decrease outer bounds to the area sunlight can reach the inner area from 2020-01-19 16:02:12 -05:00
Imbris
09239caf88 While copying terrain sample to flat array, keep track of highest and lowest positions with exposed faces in order to constrain further iteration 2020-01-19 16:02:12 -05:00
Imbris
3347438d51 Propagate light via queue to avoid block lookups 2020-01-19 16:02:12 -05:00
Imbris
211c076b8d Remove unnecessary sampling in meshing light calculations 2020-01-19 16:02:12 -05:00
Imbris
33993638fe Experiment with replacing hashmap in light calculations 2020-01-19 16:02:12 -05:00
Imbris
9d6bf66a32 Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
S Handley
309834df1b fix: Prevent dispatching Run SFX if an entity is not moving 
This adds the entity's velocity as an argument when mapping the
movement state to an SFX event, and prevents the run SFX from being
returned if the velocity is below a threshold.

This will prevent hearing the run sfx when stuck in a corner, or running
into a surface where the character is not actually moving their feet.
 2020-01-18 18:49:17 +00:00
Gilbert Röhrbein
b2503397c9 Fix panic in case no default audio device found when audio off 2020-01-18 19:16:23 +01:00
Monty Marz
cb5976b9de create character button position change 2020-01-18 15:42:21 +00:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
AdamWhitehurst
976eface66 Update from MR comments 2020-01-17 08:39:21 -08:00
Adam Whitehurst
5959d2a5c7 Fix SFX and Assets 2020-01-16 05:28:45 -08:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Gilbert Röhrbein
28060e7b6e fixing #405 - Energy as its own component 2020-01-12 22:25:04 +01:00
Monty Marz
f6dfb74b3e fix 
slightly lower trigger velocity

slighty more transp map image
 2020-01-12 19:01:02 +00:00
S Handley
00c1493548 Play the Run SFX when a character lands after jumping or falling 
This is a small detail but makes a noticable difference.
 2020-01-12 16:35:20 +00:00
Piotr Korgól
e1adf40856 Improvement: Replace all '..=b' with '..b + 1' 2020-01-12 15:46:53 +01:00
Pfauenauge90
e0fc3ce425 fixed number shadow for "0" damage appearing on level up 2020-01-11 21:31:57 +01:00
Imbris
2b4d4aa480 Merge branch 'yusdacra/tweaks' into 'master' 
Fixes minor issues with frustum culling

See merge request veloren/veloren!712
 2020-01-11 16:36:51 +00:00
Songtronix
70eb2eed33 remove: discord rich presence 2020-01-10 17:01:50 +01:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
127f8fb72b Fix lpindex not being updated for culled objects, and don't 
recalculate frustum for every entity
 2020-01-09 22:22:06 +03:00
AdamWhitehurst
de36e75264 Fix imports, update matches 2020-01-08 11:31:42 -08:00
Yusuf Bera Ertan
4a0a2d5229 Cargo fmt 2020-01-08 20:09:54 +03:00
Yusuf Bera Ertan
71db9d6350 Replace radio list with drop down selector for AA mode setting 2020-01-07 20:37:55 +03:00
Yusuf Bera Ertan
24013f1a32 Use treeculler crate 2020-01-07 19:40:06 +03:00
Adam Whitehurst
8648641362 Grooming 2020-01-07 07:49:08 -08:00
Yusuf Bera Ertan
0b67dad4a5 Fix figure visible value not updating 2020-01-07 18:46:37 +03:00
Yusuf Bera Ertan
31d18b3381 Use temporal coherence for figure frustum culling, don't process figures if they are not in view frustum 2020-01-07 18:46:22 +03:00
Yusuf Bera Ertan
c19c222a90 Use temporal coherence for chunk frustum culling 2020-01-07 18:46:09 +03:00
Yusuf Bera Ertan
e32153e980 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00
Yusuf Bera Ertan
fd9cc76786 Reimplement #210 2020-01-07 18:40:45 +03:00
Pierce Brooks
43febb5bf3 fix #426: Use new dispatch dependency to ensure proper thread routing of msgbox NSAlert calls ( correct MR workflow ) 2020-01-07 05:45:43 +00:00
Imbris
4fa05150a2 Merge branch 'imbris/char-screen-transition' into 'master' 
Fix issues regarding going back to the character selection screen

Closes #386

See merge request veloren/veloren!700
 2020-01-02 19:40:21 +00:00
Joshua Barretto
423e741cb6 Merge branch 'zesterer/better-rollin' into 'master' 
Made rolling less slippy, added tilt

See merge request veloren/veloren!699
 2020-01-02 18:35:27 +00:00
S Handley
2644e29484 Refactor and Rename for clarity 
Implements a potential structure for splitting the SFX event mapping
into smaller individual files for maintainability.

- Remove inventory events for now: For a later commit.
- No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.
 2020-01-01 02:55:48 +00:00
Imbris
06ea29bd4c Small connection error handling improvement 2019-12-31 16:38:13 -05:00
Imbris
ede05c47b0 fix(char screen induced ghosts): 
Adds removing extra components and deleting entities clientside when
going back to the character screen. Also, simplifies ClientState by
removing the Dead variant and removing ClientMsg::StateRequest in favor
of more specific ClientMsg variants.
 2019-12-31 16:38:13 -05:00
AdamWhitehurst
b67a4835f4 Update disabled state flags 2019-12-31 05:19:23 -08:00
Joshua Barretto
cfbf69ae89 Made rolling less slippy, added tilt 2019-12-30 15:16:21 +00:00
AdamWhitehurst
ba7ca785f6 Successful build 2019-12-30 05:56:42 -08:00
Monty Marz
8aff5faa83 assets update 
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
 2019-12-30 12:16:35 +00:00
Imbris
ec3e075020 fix(player list): Show players not in range on the player list 
fix(overflow): Stops including block updates that fail (since chunks
don't exist on the client) in `TerrainUpdates` (which would trigger
meshing of those nonexistent chunks). Furthermore, removes
remeshing of chunks with block updates if those chunks don't have all their
neighbours (since those wouldn't be meshed in the first place).
 2019-12-29 20:51:05 -05:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
AdamWhitehurst
ca44497258 Add movement_utils 2019-12-28 08:10:39 -08:00
AdamWhitehurst
8e0317e03d refactor states to handle update logic 2019-12-26 06:43:59 -08:00
AdamWhitehurst
c2ceabea0e finish movment states handle() fn logic 2019-12-22 08:08:48 -08:00
AdamWhitehurst
1ab09220b0 Rudimentary Stand State handle() move 2019-12-21 07:57:15 -08:00
Imbris
934c5d6846 Various tweaks: moved radius determination to function on , comments, simplified server Destroy event code, debug assert modified components aren't removed in change tracking, etc 2019-12-20 22:51:35 -05:00
Imbris
5813f626d1 cleanup 2019-12-20 22:48:14 -05:00
Imbris
d341073a44 Upgrade to specs 0.15.1 2019-12-20 22:48:14 -05:00
Imbris
e49cafafbf Actually send deletion messages 2019-12-20 22:48:14 -05:00
Songtronix
f070c139e9 change(log): only print out log file errors, no panic 2019-12-20 15:59:50 +01:00
Songtronix
b03e4ac261 feat(log): configurable creation of log file 
additionally allows to ignore any errors with the log file

furthermore prints out full log file path to the user incase of a panic
 2019-12-20 15:45:30 +01:00
Songtronix
9141cc07d0 feat(env): configurable verbosity of log file via VOXYGEN_FILE_LOG environment variable 2019-12-20 15:45:30 +01:00
Songtronix
0d919a9dc6 improve(log): adjust verbosity of some logging 
fix: settings do not log due to logging being initialized to late
 2019-12-20 15:45:30 +01:00
S Handley
8c5320d20f Update title music and temporarily remove attack sfx 
- Updated title music with a version provided by aeronic which fades out
more gracefully
- Removed attack SFX as it was included in the movement processing, but
will return later as part of a similar chunk of code which processes
combat sfx independent of movement.
 2019-12-20 04:04:05 +00:00
S Handley
da2d36ed76 (fix) Set the music and sfx volumes immediately after initialising the 
audio frontend.

Fixes #373
 2019-12-10 14:02:51 +00:00
Adam Whitehurst
20575e0aab Update controller 2019-12-09 14:45:10 +00:00
S Handley
56f9c5d35f Fix the glider_close sfx event 
This was failing to trigger since we now have a MovementState::Fall, but
the sfx mapper was still trying to work this out itself based on
velocity. We no longer need to track velocity as a result and can use
the MovementState.

Also silenced warnings resulting from unused vars when running tests.
 2019-12-09 09:50:14 +00:00
Treeco
d88376f365 Added mouse inversion setting 2019-12-06 23:00:02 +00:00
Adam Whitehurst
92d99af53c feat: weapon-type dependent wield and attack durations 
also some controller.rs cleanup
 2019-12-03 06:30:08 +00:00
Treeco
7c17c45f47 made first person camera follow race heights, minor zoom chances 2019-12-01 19:05:28 +00:00
Adam Whitehurst
4e574cb29a Inputs enhancements 2019-11-29 15:20:35 +00:00
Monty Marz
d0b7891a34 Set overflow checks to 'false' for release builds in order to bandaid fix recent master error 2019-11-28 13:32:38 +00:00
Monty Marz
040e1a7535 Fix map being inverted and indicator positioning 2019-11-26 22:39:07 +00:00
Monty Marz
b3eb0b270f Region name display fix 2019-11-24 16:45:13 +00:00
Songtronix
fa93e35861 upgrade(dep): msgbox 
Fix: FreeBSD compilation
 2019-11-24 08:49:14 +01:00
S Handley
ea2e0d17de SFX system 
This is an event based approach to SFX sounds. There is a specific
character sound event mapper which determines sfx to play based on
character or NPC state, as well as emitting sfx events for
non-character-triggers such as levelling up.
 2019-11-23 08:26:39 +00:00
Monty Marz
370e94b1ad Loading Screen with pulsating text, 2 new hairstyles 2019-11-23 00:51:18 +00:00
Songtronix
e885a78deb change(deps): enforce crossbeam version 2019-11-22 19:12:58 +01:00
Songtronix
2f93dd2c38 adjust logging level 2019-11-22 19:12:58 +01:00
Songtronix
bdcea57201 feat(log): add date to log file 2019-11-22 19:12:58 +01:00
Songtronix
bb64c8ed76 change(log): remove all spam from logging 2019-11-22 19:12:58 +01:00
Songtronix
7abf2a0fb9 change(log): switch to fern 2019-11-22 19:12:58 +01:00
Joshua Barretto
8745d0a3af Non-linear depth buffer 2019-11-20 09:59:27 +00:00
Joshua Barretto
9993a4c81a Smoother water at distance, fixed warnings 2019-11-19 19:22:56 +00:00
Joshua Barretto
28e625635f Split terrain rendering to avoid redrawing skybox 2019-11-19 19:09:22 +00:00
Joshua Barretto
5162256e45 Faster and more visually pleasing clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
aa111d34e5 Added clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
eb7b55d3ad Merge branch 'zesterer/better-water' into 'master' 
Better water

See merge request veloren/veloren!643
 2019-11-12 14:55:54 +00:00
Adam Whitehurst
59826a364a Remove unnecessary elided lifetimes 2019-11-11 08:26:44 -08:00
Adam Whitehurst
64a0d8d91f Make character anims conditional by Tool held 2019-11-10 15:36:47 -08:00
Monty Marz
a9a7b95037 Login desc 2019-11-09 23:19:41 +00:00
timokoesters
b6552556e7 fix: show error on client failure again 2019-11-07 09:42:03 +09:00
Shane Handley
0fabe70960
Ignore warning about variant never being constructed. It's being used 
elsewhere. Not sure why that isn't being picked up.
 2019-11-06 21:34:19 +01:00
Shane Handley
4330b33ce0
Hmm, alright have it your way rust. Not my change, so leaving it alone. 2019-11-06 21:34:18 +01:00
Shane Handley
fb3350c605
Removed error which is now handled by the ServerTimeout case 2019-11-06 21:34:18 +01:00
Shane Handley
15c725bfde
Address code review points: 
- Clarify caffeine fueled comment
- Be better at comparing Instant's, and catch the 0 seconds case to say
Goodbye to the user
- Switch println for 'info!'
 2019-11-06 21:34:18 +01:00
Shane Handley
b15c107f0b
Re-add the handling of error when the player loses connection on the character select screen. 2019-11-06 21:34:17 +01:00
Shane Handley
69b008e0e6
Fix issue with the timeout error showing when there is an intentional logout from the game. 2019-11-06 21:34:17 +01:00
Shane Handley
81f41e278e
Remove unused warn and fix dangling parameter. 2019-11-06 21:34:17 +01:00
timokoesters
4a65cddd15
improvement: remove wait because it now always retries 2019-11-06 21:34:16 +01:00
Shane Handley
26acd8b427
Bump up the timeout tie for booting the single player server 2019-11-06 21:34:16 +01:00
timokoesters
c733c95718
improvement: UI for connecting to singleplayer servers + threading fixes 2019-11-06 21:34:15 +01:00
timokoesters
21f126acd4
feat: show errors in main menu when client fails 
Instead of `[ERROR] Failed to tick the scene: Network(Bincode(Io(Custom { kind: UnexpectedEof, error: "failed to fill whole buffer" })))`
 2019-11-06 21:34:15 +01:00
Shane Handley
3b24af76ab
Formatting 2019-11-06 21:34:15 +01:00
Shane Handley
ef6f8b509a
Eeek, remove logging. 2019-11-06 21:34:14 +01:00
Shane Handley
fe9ad3fa19
Network timeout updates 
- Bugfix: Check whether the server response (pong) is greater than the timeout period, rather than the ping (which will always fire regardless of connection status) This was causing the timeout error event to never fire.

- Feature: Send the player notifications to the chat window that they will be kicked due to disconnection for 6 seconds before kicking them back to the main menu.
 2019-11-06 21:34:14 +01:00
Joshua Barretto
671313a523 Overhauled water shaders 2019-11-05 15:45:01 +00:00
soruh
6dfa146484 Mitgated RUSTSEC-2019-0014 by updating noise and 
disabling its default features, specifically `image`,
which had the vulnerability.
 2019-11-05 11:14:39 +00:00
soruh
e3bd152d24 update toolchain to nightly-2019-11-04 2019-11-04 18:26:32 +01:00
Monty Marz
240b620c13 login info text 2019-11-01 20:53:52 +00:00
Acrimon
5beea76624 Remove heaptrack as it is now deprecated. 2019-10-29 06:55:45 +00:00
Monty Marz
a0a8011d7e Updated: Help Window, Map, Item Descriptions 2019-10-27 22:22:40 +00:00
jshipsey
12f83cf270 rebase, small fixes 2019-10-25 22:20:38 -04:00
jshipsey
c5942dfcc9 purged references to npckind from anim files, removed warnings 2019-10-25 21:50:14 -04:00
jshipsey
2b5fd372c5 streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally. 2019-10-25 21:50:14 -04:00
jshipsey
ada6142c1f added large bipeds, small birbs, small fish skeletons 2019-10-25 21:47:23 -04:00
jshipsey
4f5f7402f0 added dragon skeleton 2019-10-25 21:44:33 -04:00
jshipsey
e858c31b4c fish_medium and bird_medium skelingtons 2019-10-25 21:39:06 -04:00
jshipsey
574f070758 added large bipeds, small birbs, small fish skeletons 2019-10-25 21:34:29 -04:00
jshipsey
644939810f added dragon skeleton 2019-10-25 21:33:59 -04:00
jshipsey
54fc712076 fish_medium and bird_medium skelingtons 2019-10-25 21:33:02 -04:00
Marcel
ee915671ef Merge branch 'songtronix/set-voxygen-config-via-env' into 'master' 
customizable config file location via environment variable

See merge request veloren/veloren!617
 2019-10-25 18:52:38 +00:00
Timo Koesters
0ae15bb251 Merge branch 'timo-items-as-ron' into 'master' 
feat: store items as RON files

See merge request veloren/veloren!618
 2019-10-25 08:57:39 +00:00
Imbris
c18fe8042b Merge branch 'imbris/mesh-speed' into 'master' 
Speed up terrain meshing ~20%

See merge request veloren/veloren!625
 2019-10-25 02:22:03 +00:00
Imbris
4bcc55ad34 improvement: roughly ~20% speedup of terrain meshing by eliminating redundant lookups of terrain blocks 2019-10-24 20:02:29 -04:00
timokoesters
f1b728b89b
improvement: load_cloned returns a result 2019-10-24 23:55:24 +02:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool 
This way all items that can be held in a hand are tools
 2019-10-24 23:55:24 +02:00
timokoesters
20248a4818
feat: store items as RON files 
When a new item is created, a ron file will be used as a template
 2019-10-24 23:47:26 +02:00
Monty Marz
f4ba68c60d .floating(true) for help window background to make it layer above every recent and future widget 2019-10-24 18:21:17 +00:00
Joshua Barretto
7d86a360d6 Merge branch 'soruh/fix-welcome-window-depth' into 'master' 
fix the welcome window not being closeable, due to it being obscured by the chat

See merge request veloren/veloren!623
 2019-10-24 12:49:20 +00:00
Imbris
2fad65c749 Merge branch 'imbris/graphic-cache' into 'master' 
Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures.

See merge request veloren/veloren!609
 2019-10-24 05:27:09 +00:00
Imbris
a200dafd45 Fix possess bug, remove commented code, drain controller events 2019-10-24 00:00:00 -04:00
Imbris
966b2bfbff Integrate new systems with metrics 2019-10-23 23:50:06 -04:00
Imbris
2703c8afe1 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
soruh
f186aac2ea fix the welcome window not being closeable 
due to the chat being in front of it,
by giving the welcome window a depth of -1.0.
The value of -1.0 is very arbitrary, but has some effect on
further development*, so there should be consideration concerning it.

* if something is supposed to be over/under the welcome window and
over/under something else with a different depth at the same time,
the resulting depth could become really ugly.
Of course it's always possible to change depths afterwards, but this often
breaks things, so the general scope of depths should
imo be considered, before this becomes a problem.
 2019-10-24 00:46:40 +02:00
Monty Marz
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Songtronix
e8a077a5d6 feat(env): customizable config file location 2019-10-22 17:15:10 +02:00
Isaac Freund
355c7666b9 Allow dropping items 
Items can now be dropped by clicking to select the item then clicking
outside of the bag.
 2019-10-22 01:40:58 +02:00
Imbris
8bb54976eb Rework GraphicCache to use multiple texture atlases and put large images in their own textures. 2019-10-19 21:28:30 -04:00
Songtronix
fffffff536 fix(crash): overflowing the stack 2019-10-18 14:19:02 +02:00
Songtronix
fe4a61354a change(menu): display version with hash and date 2019-10-18 15:51:07 +02:00
Imbris
39656e92be Merge branch '276-hotloading-armor' into 'master' 
Resolve "Enable hotloading of different offsets for armors/weapons"

Closes #276

See merge request veloren/veloren!545
 2019-10-18 00:29:09 +00:00
Adam Fogle
c41627d75f Removed the recolor property from the armor ron files. 2019-10-17 19:45:29 -04:00
Monty Marz
fdfab6a807 refactor: create_projectile doesn't take a light 
It returns a builder so the caller can just do it
 2019-10-17 20:59:36 +00:00
Joshua Barretto
1f39659a54 Merge branch 'zesterer/small-fixes' into 'master' 
Performance Improvements

See merge request veloren/veloren!597
 2019-10-17 20:56:37 +00:00
Joshua Barretto
04c64dc122 Better (and faster) water shaders 2019-10-17 17:11:55 +01:00
Shane Handley
ab59d1f262 Title music fix (fixes #342) 
Fix issue with title music restarting and playing in multiple channels
when the player chooses a play state but then returns to the main menu.
 2019-10-17 16:14:16 +09:00
Joshua Barretto
c01e19fc05 Don't render water that isn't there, improved chunk render order 2019-10-16 12:40:18 +01:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation. 
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
 2019-10-16 11:39:41 +00:00
Adam Fogle
3a4c307d38 Code cleanup, formatting changes, and fixed the cloth belt's offset. 2019-10-16 00:42:57 -04:00
Joshua Barretto
707b79f2c8 Smoother movement, Space for climbing 2019-10-14 11:22:48 +01:00
Joshua Barretto
4bbc340f52 Faster meshing, better dusk 2019-10-14 10:48:40 +01:00
jshipsey
deadd665c8 tweaks animations to better align with true positions 2019-10-12 14:19:55 -04:00
Adam Fogle
8f7b4afafd Manifest file is now used to load armor. 
Redid how pants renders so they can use underlying skin model/coloring,
same as chest armor.
Redid how belts render so they can use the underly skin color,
same as shoulder or foot.
Converted a manifest variable name to snake case.
 2019-10-12 08:31:42 -04:00
Adam Fogle
a5db28113f Redid the mainfest files to remove race/gender. 
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
 2019-10-12 08:31:42 -04:00
Adam Fogle
a2b2d0d493 Created Spec structs for each armor type. 
Moved mesh creating code for each armor type
into matching struct.
Each Spec struct now loads the matching manifest file.
Manifest file is NOT used yet.
Warning thrown due to adding new parameter to the mesh function
for use reading the manifest file.
 2019-10-12 08:31:42 -04:00
Adam Fogle
da54cf76bc Armor names now end with left/right. 
Armor names no longer include their armor part.
This should be inferred from their folder.
 2019-10-12 08:31:42 -04:00
Marcel Märtens
30c9fcc911 Fix bug that metrics took a random port always introduced in !584 
also removed the duplicate port from the server creation process, using the server settings struct now
 2019-10-11 14:19:55 +02:00
Acrimon
a70f3cfd68 Merge branch 'overclockx64/near-plane-increase' into 'master' 
Increased near plane value, fixing character flickering on macOS

See merge request veloren/veloren!575
 2019-10-10 22:45:06 +00:00
Imbris
2651cb9179 Adjust far plane and bring near plane back in a bit 2019-10-10 22:24:24 +00:00
Marcel Märtens
20c520a044 Change the version number to 0.4 2019-10-10 15:48:01 +02:00
Luc Fauvel
b3697e1ea7 Increased near plane value 2019-10-09 22:23:09 -04:00
Forest Anderson
e7b97e0c66 md5sum assets 2019-10-09 22:42:39 +00:00