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

1354 Commits

Author SHA1 Message Date
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
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
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
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
Imbris
2651cb9179 Adjust far plane and bring near plane back in a bit 2019-10-10 22:24:24 +00: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
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
Joshua Barretto
889fd678c6 More opaque water surface 2019-10-08 12:21:05 +01:00
Joshua Barretto
1a9408c397 Merge branch 'timo-arrowheight' into 'master' 
timo arrow spawn height

See merge request veloren/veloren!558
 2019-10-06 20:19:01 +00:00
timokoesters
25cc1f0103
fix: orientation now supports z rotation 2019-10-06 22:03:29 +02:00
Monty Marz
b3862278af Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Brian Lewis
86619d4192 Fix crashing due to error in Alsa. 
This uses a more recent version of cpal (a dependency of rodio hence the
rodio change) which seems to have fixed a crash due to
'device not available: "Invalid argument"' coming from Alsa.

The change in cpal also made some functions now return `Result` instead
of a bare type which I dealt with by using `expect` to minimize how far
these changes fan out into the code but maybe this isn't ideal.

Fixing https://gitlab.com/veloren/veloren/issues/280 - Crash with ALSA
 2019-10-06 11:24:42 +02:00
Forest Anderson
b13f9f37f7 Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" 
This reverts merge request !547
 2019-10-06 01:31:47 +00:00
Forest Anderson
0304b51159 Chanced to ignore msvc instead of windows 
Change server to ignore msvc
 2019-10-05 17:57:29 -04:00
Forest Anderson
e1bab6afe0 Added jemalloc for Linux systems 2019-10-05 17:57:29 -04:00
Forest Anderson
9ef98ce1a5 Remove heaptrack 2019-10-05 17:57:29 -04:00
Timo Koesters
f3787879d3 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
timokoesters
4a99e5bc1e refactor: joined on &stats twice 2019-10-05 17:37:10 +02:00
Piotr Korgól
152efaee3b Make nametags display levels 2019-10-05 17:37:09 +02:00
Songtronix
43cae5ea64 Fix discord rich presence 2019-10-05 15:35:59 +00:00
Wu Yu Wei
193ff105e2 Update client-side password hashing to argon2 2019-10-05 13:12:20 +00:00
jshipsey
66e8f4c4bc
added bow wielding animations 2019-10-04 21:02:45 +02:00
timokoesters
469349a426
fix(render): figures without vel don't render 2019-10-04 21:02:44 +02:00
Pfauenauge90
e404ea0d4f
assets, rotation, offset changes 2019-10-04 21:02:42 +02:00
Pfauenauge90
39e5530d45
made bow available in char selection 2019-10-04 21:02:40 +02:00