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

2489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forest Anderson
adb95e61ea Added loc into readme 2019-10-23 13:27:04 -04:00
Justin Shipsey
a6e377552c Merge branch 'ifreund-drop-items' into 'master' 
Allow dropping items

See merge request veloren/veloren!615
 2019-10-22 01:22:50 +00:00
Imbris
244fe7fb60 Merge branch 'vechro/aa-fix' into 'master' 
Fix MSAA x16

See merge request veloren/veloren!613
 2019-10-22 00:58:43 +00:00
Isaac Freund
9712d6dcd7 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
3d7dddcf6f Merge branch 'soruh/veloren-help-only-show-allowed-main-repo' into 'master' 
Don't display commands that the player cannot use.

Closes #351

See merge request veloren/veloren!612
 2019-10-21 19:22:23 +00:00
Vechro
2354d10cfa Fix MSAA x16 2019-10-21 21:55:49 +03:00
soruh
258aa59f92 Don't display commands that the player cannot use. 2019-10-21 18:36:35 +02:00
Imbris
31a2dd8516 Merge branch 'shandley/cargo-update-conrod' into 'master' 
Update conrod_core

Closes #171

See merge request veloren/veloren!608
 2019-10-19 23:09:46 +00:00
Shane Handley
f8a6a997ad WIP (testing) Update conrod_core 
This is a `cargo update -p conrod_core` to bring in updates to
`veloren/conrod/conrod_core` to add support for copy and paste.

Ref: veloren/conrod!2

Fixes #171
 2019-10-19 15:12:37 +09:00
Songtronix
4a27282832 Merge branch 'songtronix/hotfix' into 'master' 
Fix singleplayer

See merge request veloren/veloren!605
 2019-10-18 16:21:28 +00:00
Songtronix
c5a5f59fd7 fix(crash): singleplayer 2019-10-18 17:39:57 +02:00
Songtronix
00c89ab510 Merge branch 'songtronix/QoL' into 'master' 
Quality of Life

See merge request veloren/veloren!604
 2019-10-18 15:06:21 +00:00
Songtronix
eda188dc37 fix(crash): overflowing the stack 2019-10-18 14:19:02 +02:00
Songtronix
4191b1bf9c change(menu): display version with hash and date 2019-10-18 15:51:07 +02:00
Songtronix
c9bf0ad875 change(githash): provide date and hash 2019-10-18 15:32:55 +02:00
Imbris
c6f8125b6c 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
ab9c6dc5db Removed the recolor property from the armor ron files. 2019-10-17 19:45:29 -04:00
Joshua Barretto
332f1ab12b Merge branch 'pfau/assets' into 'master' 
Initial staff implementation

See merge request veloren/veloren!602
 2019-10-17 20:59:37 +00:00
Monty Marz
8990469581 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
d292d1900a 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
127d618fdd Fixed srgb normal bug 2019-10-17 17:35:17 +01:00
Joshua Barretto
501047496a Better (and faster) water shaders 2019-10-17 17:11:55 +01:00
Joshua Barretto
5a7b7ee15e Merge branch 'songtronix/include-license' into 'master' 
Include LICENSE file in artifacts

Closes #343

See merge request veloren/veloren!601
 2019-10-17 14:22:41 +00:00
Songtronix
2bc9dd815a fix(CI): remove unneeded copy 2019-10-17 15:35:14 +02:00
Songtronix
9dcb855937 change(CI): include LICENSE in artifacts 2019-10-17 15:06:20 +02:00
Joshua Barretto
6b0c64f412 Made rolling less violent when changing directions 2019-10-17 12:21:22 +01:00
Joshua Barretto
ccb99059dc Merge branch 'shandley/title-music-single-play' into 'master' 
Title music fix

Closes #342

See merge request veloren/veloren!600
 2019-10-17 07:58:58 +00:00
Shane Handley
7a84e998ff 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
bcbec3f9d0 Move computations to terrain fragment shaders 2019-10-16 15:05:45 +01:00
Joshua Barretto
75842895c5 Don't render water that isn't there, improved chunk render order 2019-10-16 12:40:18 +01:00
Marcel
7c0fd6217d Merge branch 'sharp/erosion' into 'master' 
Add erosion, rivers, and lakes.

See merge request veloren/veloren!593
 2019-10-16 11:39:41 +00:00
Joshua Yanovski
663d535bd9 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
584e2b45c7 Code cleanup, formatting changes, and fixed the cloth belt's offset. 2019-10-16 00:42:57 -04:00
Marcel
08c0ed836c Merge branch 'zesterer/small-fixes' into 'master' 
Small fixes: Faster meshing, smoother movement, better interpolation, and a return to space for climbing

See merge request veloren/veloren!596
 2019-10-14 12:32:42 +00:00
Joshua Barretto
75c021f141 Smoother movement, Space for climbing 2019-10-14 11:22:48 +01:00
Joshua Barretto
8235876a41 Faster meshing, better dusk 2019-10-14 10:48:40 +01:00
Imbris
8b6e97eed9 Merge branch 'heydabop/bug/324-modulo-panic' into 'master' 
fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0

Closes #324

See merge request veloren/veloren!595
 2019-10-14 03:14:29 +00:00
heydabop
b3254a1d1c fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0 2019-10-13 21:39:37 -05:00
Songtronix
d3397a2ef7 Merge branch 'kyozm/proper-lack-of-permission-messages' into 'master' 
proper message on permission check failure  for commands

Closes #303

See merge request veloren/veloren!592
 2019-10-13 08:39:30 +00:00
KyoZM
a4f67d9141 proper message on permission check failure for commands 2019-10-12 18:24:44 -03:00
Justin Shipsey
99fb1ceef6 Merge branch 'slipped/shadowfix' into 'master' 
shadow bug fix

See merge request veloren/veloren!591
 2019-10-12 18:51:43 +00:00
jshipsey
8690bf31b8 tweaks animations to better align with true positions 2019-10-12 14:19:55 -04:00
Adam Fogle
4f46f4b942 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
03adbc4340 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
aaffb958a7 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
8a4aedda78 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
Adam Fogle
7089039ede Added manifest files per armor type using the existing vox names. 2019-10-12 08:31:42 -04:00
Imbris
5e5b569a84 Merge branch 'imbris/projectile-exp' into 'master' 
Make projectiles give experience

See merge request veloren/veloren!588
 2019-10-12 00:50:50 +00:00
Imbris
3a245f1fba Make bows give experience via giving projectiles an owner field 2019-10-11 19:33:01 -04:00
Imbris
dde81c38b2 Add new debug item 2019-10-11 19:32:46 -04:00