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
Commit Graph

1128 Commits

Author SHA1 Message Date
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
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
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
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
501047496a Better (and faster) water shaders 2019-10-17 17:11:55 +01: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
75842895c5 Don't render water that isn't there, improved chunk render order 2019-10-16 12:40:18 +01: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
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
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
Marcel Märtens
bf0492d697 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
b65bbeba76 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
f6bf524497 Adjust far plane and bring near plane back in a bit 2019-10-10 22:24:24 +00:00
Marcel Märtens
5e0d7081ba Change the version number to 0.4 2019-10-10 15:48:01 +02:00
Luc Fauvel
7b2c1271fb Increased near plane value 2019-10-09 22:23:09 -04:00
Forest Anderson
87b4ceccb4 md5sum assets 2019-10-09 22:42:39 +00:00
Monty Marz
42a3ebeb21 Item icons, chests and more 2019-10-09 19:28:05 +00:00
Joshua Barretto
9d41ce8d39 More opaque water surface 2019-10-08 12:21:05 +01:00
Wu Yu Wei
1d224e5274 Switch portpicker dependemcy to git 
A pull request to fix has been created on original repository. But
since 0.4 is coming out pretty soon, let's swithc to this fork
temporary.
 2019-10-07 15:35:20 +00:00
Joshua Barretto
b1ec0dc822 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
7f3a0c3771
fix: orientation now supports z rotation 2019-10-06 22:03:29 +02:00
Monty Marz
39acda60f0 Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Brian Lewis
63277fc98d 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
604929b5c3 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
c442ff7d8a Chanced to ignore msvc instead of windows 
Change server to ignore msvc
 2019-10-05 17:57:29 -04:00
Forest Anderson
c37dd91647 Added jemalloc for Linux systems 2019-10-05 17:57:29 -04:00
Forest Anderson
34975879ad Remove heaptrack 2019-10-05 17:57:29 -04:00
Timo Koesters
27fa51b205 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
timokoesters
28cc67679a refactor: joined on &stats twice 2019-10-05 17:37:10 +02:00
Piotr Korgól
eb538d680d Make nametags display levels 2019-10-05 17:37:09 +02:00
Songtronix
c4edda1a80 Fix discord rich presence 2019-10-05 15:35:59 +00:00
Wu Yu Wei
888c52d161 Update client-side password hashing to argon2 2019-10-05 13:12:20 +00:00
jshipsey
86f1939dfd
added bow wielding animations 2019-10-04 21:02:45 +02:00
timokoesters
e0e7a6e390
fix(render): figures without vel don't render 2019-10-04 21:02:44 +02:00
Pfauenauge90
8939385b92
assets, rotation, offset changes 2019-10-04 21:02:42 +02:00
Pfauenauge90
ff722e7e59
made bow available in char selection 2019-10-04 21:02:40 +02:00
Pfauenauge
8bf3b87b1b
bow position 2019-10-04 21:02:40 +02:00
timokoesters
9c974232ae
Initial bow & arrow implementation 2019-10-04 21:02:39 +02:00
Monty Marz
b8ac93c4ca Assets update, aesthetics, minor fixes 2019-10-04 18:27:12 +00:00
Shane Handley
a58f01a022 Play some music on game launch 2019-10-05 02:31:24 +09:00
Mckol
a15c11f023 Hash the passwords client-side 2019-10-04 16:44:31 +00:00