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
2,802 Commits 151 Branches 18 Tags
Commit Graph

2802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
7bcbfa9003 add: capability to disable blending for particular BlockKinds 2020-01-19 16:03:27 -05:00
timokoesters
c557dfeedf improvement: fog doesn't go back and forth anymore 2020-01-19 16:03:27 -05:00
Imbris
b3aa9d2aa4 fix: panic in terrain meshing 2020-01-19 16:03:27 -05:00
Imbris
7f04db1501 Add terrain meshing benchmark 2020-01-19 16:02:12 -05:00
Imbris
e7b30d1263 Cleanup 2020-01-19 16:02:12 -05:00
Imbris
cf07016c07 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
289102cbe9 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
488010ba19 Propagate light via queue to avoid block lookups 2020-01-19 16:02:12 -05:00
Imbris
59c94935f9 Remove unnecessary sampling in meshing light calculations 2020-01-19 16:02:12 -05:00
Imbris
3fc8f5de38 Experiment with replacing hashmap in light calculations 2020-01-19 16:02:12 -05:00
Imbris
5d608dd066 Merge branch 'zesterer/better-clouds' into 'master' 
Made clouds bigger, more performant and prettier

See merge request veloren/veloren!733
 2020-01-19 20:00:44 +00:00
Imbris
a5a8409294 Changelog 2020-01-19 14:28:24 -05:00
Imbris
f82a3a7a5c Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
Joshua Barretto
d48974d077 Fixed water normals 2020-01-19 18:39:20 +00:00
Songtronix
d80021cb13 Merge branch 'songtronix/update-toolchain' into 'master' 
update toolchain to nightly-2020-01-18

See merge request veloren/veloren!732
 2020-01-19 18:38:19 +00:00
Joshua Barretto
19b5143077 Fixed terrain normal decoding 2020-01-19 18:27:03 +00:00
Joshua Barretto
fcbaa0d3f8 Made clouds bigger, more performant and prettier 2020-01-19 18:06:34 +00:00
Songtronix
22723214dc update toolchain to nightly-2020-01-18 2020-01-19 18:50:48 +01:00
Imbris
9814ae3528 Merge branch 'shandley/bugfix-run-sfx-when-immobile' into 'master' 
fix: Prevent dispatching Run SFX if an entity is not moving

See merge request veloren/veloren!729
 2020-01-18 18:49:17 +00:00
S Handley
2914b1b57b 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
Imbris
d681e47277 Merge branch 'payload1/fix-ask-audio-device-only-when-audio-on' into 'master' 
Fix panic in case no default audio device found when audio off

See merge request veloren/veloren!722
 2020-01-18 18:34:17 +00:00
Gilbert Röhrbein
12ead2e33a Fix panic in case no default audio device found when audio off 2020-01-18 19:16:23 +01:00
Monty Marz
6e303f2f5b Merge branch 'pfau/char-creation-button' into 'master' 
create character button position change

See merge request veloren/veloren!730
 2020-01-18 15:42:21 +00:00
Monty Marz
6aa7913ab2 create character button position change 2020-01-18 15:42:21 +00:00
Monty Marz
17420fa905 Merge branch 'pfau/charge-icon' into 'master' 
Charge Icon and flashing skillbar

See merge request veloren/veloren!726
 2020-01-17 22:00:00 +00:00
Monty Marz
7e2153c537 Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
Acrimon
820df7ec3a Merge branch 'acrimon/precise-color-conversion' into 'master' 
More precise color conversion

See merge request veloren/veloren!721
 2020-01-14 07:04:51 +00:00
Imbris
7a1b43c6f1 Branch on lower color values for more accurate speedy color conversion, add simple color conversion benchmarks 2020-01-13 23:39:22 -05:00
Acrimon
a8b22f3daf
Even better conversion impl. 2020-01-13 20:54:56 +01:00
Acrimon
26c2239e7a
Made color conversion way more accurate. 2020-01-13 16:38:10 +01:00
Timo Koesters
5012ce9bac Merge branch 'payload1/energy-component' into 'master' 
payload1/energy component

Closes #405

See merge request veloren/veloren!719
 2020-01-12 21:41:34 +00:00
Gilbert Röhrbein
b9e7164b62 fixing #405 - Energy as its own component 2020-01-12 22:25:04 +01:00
Monty Marz
90c36bb9fd Merge branch 'pfau/map-transp-hotfix' into 'master' 
Hotfix for map flickering while turning

See merge request veloren/veloren!720
 2020-01-12 19:01:02 +00:00
Monty Marz
a2bec3d0eb fix 
slightly lower trigger velocity

slighty more transp map image
 2020-01-12 19:01:02 +00:00
Songtronix
2aa0cf0940 Merge branch 'shandley/sfx-land-on-ground' into 'master' 
Play the Run SFX when a character lands after jumping or falling

See merge request veloren/veloren!717
 2020-01-12 16:35:20 +00:00
S Handley
8bace0fb87 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
Acrimon
c2b1350d25 Merge branch 'qutrin/ez-optimisation' into 'master' 
Improvement: Replace all '..=b' with '..b + 1'

See merge request veloren/veloren!718
 2020-01-12 15:05:45 +00:00
Piotr Korgól
243263fecd Improvement: Replace all '..=b' with '..b + 1' 2020-01-12 15:46:53 +01:00
Monty Marz
0a51b12957 Merge branch 'pfau/sct-hotfix' into 'master' 
fixed number shadow for "0" damage appearing on level up

See merge request veloren/veloren!716
 2020-01-11 20:47:47 +00:00
Pfauenauge90
972d0c5dd7 fixed number shadow for "0" damage appearing on level up 2020-01-11 21:31:57 +01:00
Imbris
c26bb6a174 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
Imbris
460a05c31a Merge branch 'shandley/bugfix-stats-audio-event' into 'master' 
(fix) Remove emission of an audio event from stats sys

See merge request veloren/veloren!714
 2020-01-11 04:49:43 +00:00
Shane Handley
1c9094af4f Remove emission of an audio event from stats sys 
This was accidentally left in by me during some testing of server
emission of SFX events to all clients. There was no effect on gameplay since we dont
emit a sound for this event yet, but it should not be here.

The audio event is correctly handled elsewhere by each client.
 2020-01-11 13:08:33 +09:00
Songtronix
2c12fb5a21 Merge branch 'songtronix/improve-discord' into 'master' 
remove discord rich presence

See merge request veloren/veloren!695
 2020-01-10 16:15:27 +00:00
Songtronix
e4fe286f34 remove: discord rich presence 2020-01-10 17:01:50 +01:00
Monty Marz
59df649fe6 Merge branch 'pfau/assets' into 'master' 
Scrolling Combat Text (SCT)

See merge request veloren/veloren!711
 2020-01-10 00:33:38 +00:00
Monty Marz
178ad9479a Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
e3828a07b4 Fix lpindex not being updated for culled objects, and don't 
recalculate frustum for every entity
 2020-01-09 22:22:06 +03:00
Acrimon
f2ac3a5a49 Merge branch 'yusdacra/tweaks' into 'master' 
Improvements to frustum culling and some changes

Closes #210

See merge request veloren/veloren!708
 2020-01-08 17:43:40 +00:00
Yusuf Bera Ertan
44d9e7c590 Cargo fmt 2020-01-08 20:09:54 +03:00