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

2441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
bf52b09e86 Merge branch 'xacrimon/fix-ci-this-retarded' into 'master' 
CI improvements

Closes #274

See merge request veloren/veloren!552
 2019-10-08 08:13:40 +00:00
Acrimon
035949b0f7 CI improvements 2019-10-08 08:13:40 +00:00
Forest Anderson
cbcf02a477 Merge branch 'wusyong/fix_ipv6' into 'master' 
Fix singleplayer not working if IPv6 is not available

Closes #281

See merge request veloren/veloren!561
 2019-10-07 15:35:20 +00: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
Marcel
7363224997 Merge branch 'songtronix/partially-fix-ghosting' into 'master' 
reduce amount of network related ghosts

See merge request veloren/veloren!562
 2019-10-07 14:03:49 +00:00
Songtronix
0beaf26192 fix: reduce amount of network related ghosts 2019-10-07 15:15:29 +02:00
Joshua Barretto
6006270c93 Merge branch 'zesterer/small-fixes' into 'master' 
Minor Tweaks

See merge request veloren/veloren!560
 2019-10-07 08:21:44 +00:00
Acrimon
567ce08c1b Merge branch 'kyozm/removelights' into 'master' 
create /removelights command

Closes #270

See merge request veloren/veloren!559
 2019-10-07 08:05:51 +00:00
Joshua Barretto
6c8c512f60 Proper tree colour variation 2019-10-07 09:05:18 +01:00
Joshua Barretto
6839a8b0c6 Better grass colours, made flora more common 2019-10-07 08:49:02 +01:00
KyoZM
39b5f091fc consume vector without calling the iterator 2019-10-07 01:49:56 -03:00
KyoZM
782d757c48 cargo format 2019-10-07 01:38:28 -03:00
KyoZM
34ff9e0e2c removelights no longer deletes players with lanterns 2019-10-07 01:03:53 -03:00
KyoZM
aabce1274f create /removelights command 2019-10-07 00:19:46 -03: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
timokoesters
ffe63acfdd
feat(bow): arrow spawn height 2019-10-06 21:21:33 +02:00
Monty Marz
a2e165b783 Merge branch 'pfau/help-window' into 'master' 
Help window, UI fixes, asset fixes

See merge request veloren/veloren!556
 2019-10-06 19:19:09 +00:00
Monty Marz
39acda60f0 Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Monty Marz
58a8e2351a Merge branch 'timo-msg' into 'master' 
fix: error message for give_exp

See merge request veloren/veloren!557
 2019-10-06 19:03:57 +00:00
timokoesters
da7a9c1970
fix: error message for give_exp 2019-10-06 20:52:26 +02:00
Joshua Barretto
2c03587a84 Merge branch 'timo-arrow-despawn' into 'master' 
feat(bow): arrows despawn after some time

See merge request veloren/veloren!554
 2019-10-06 17:48:27 +00:00
timokoesters
aad78d3a1f
feat(bow): arrows despawn after some time 2019-10-06 19:32:46 +02:00
Timo Koesters
745f84c1a4 Merge branch 'timo-logout' into 'master' 
Fix bugs causing duplicate login/logout messages

See merge request veloren/veloren!553
 2019-10-06 17:05:23 +00:00
timokoesters
7ac8869cd1
fix: selecting another character no longer shows a new login message 2019-10-06 18:26:51 +02:00
timokoesters
caf1576022
fix: don't show logout message when player never was ingame 2019-10-06 17:34:51 +02:00
Acrimon
dfd72fb0c9 Merge branch 'zuwow/veloren-fix-alsa-crash' into 'master' 
Fix crashing due to error in Alsa.

Closes #280

See merge request veloren/veloren!551
 2019-10-06 10:00:21 +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
Acrimon
5a0a9e5373 Merge branch 'songtronix/disable-lfs-check-with-env' into 'master' 
Disable git lfs check with DISABLE_GIT_LFS_CHECK Enviroment Variable

See merge request veloren/veloren!542
 2019-10-06 07:47:50 +00:00
Acrimon
7f29b83f31 Merge branch 'revert-4498cece' into 'master' 
Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'"

See merge request veloren/veloren!549
 2019-10-06 07:32:43 +00:00
Songtronix
775f556d64 feat(env): added DISABLE_GIT_LFS_CHECK 2019-10-06 07:33:24 +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
Acrimon
7bb05ce2e8 Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master' 
Change memory allocator to jemalloc

Closes #278

See merge request veloren/veloren!547
 2019-10-05 22:49:19 +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
Monty Marz
8899c0aadd Merge branch 'timo-icon' into 'master' 
fix(bow): use axe as default icon, not debug stick

See merge request veloren/veloren!539
 2019-10-05 21:51:08 +00:00
Timo Koesters
27fa51b205 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
Acrimon
3d422d9295 Merge branch 'qutrin/npc-levels' into 'master' 
Enemies spawn with random levels, Nametags display levels

See merge request veloren/veloren!532
 2019-10-05 15:54:06 +00:00
timokoesters
28cc67679a refactor: joined on &stats twice 2019-10-05 17:37:10 +02:00
timokoesters
2dd51fe2a9 fix(exp): crash when gaining many levels at once 2019-10-05 17:37:10 +02:00
Piotr Korgól
6d0c71042e Make /adminify admin-only and /waypoint free 2019-10-05 17:37:10 +02:00
Piotr Korgól
bca68e6ed8 Make enemies spawn with different levels 2019-10-05 17:37:09 +02:00
Piotr Korgól
eb538d680d Make nametags display levels 2019-10-05 17:37:09 +02:00
Songtronix
256e3d873f Merge branch 'songtronix/fix-rich-presence' into 'master' 
Fix discord rich presence

See merge request veloren/veloren!543
 2019-10-05 15:35:59 +00:00
Songtronix
c4edda1a80 Fix discord rich presence 2019-10-05 15:35:59 +00:00
Marcel
07fc8367cc Merge branch 'password-argon2' into 'master' 
Update client-side password hashing to argon2

See merge request veloren/veloren!544
 2019-10-05 13:12:20 +00:00
Wu Yu Wei
888c52d161 Update client-side password hashing to argon2 2019-10-05 13:12:20 +00:00
Forest Anderson
d6fab64d1f Merge branch 'revert-129674eb' into 'master' 
Revert "Added to systems directory"

See merge request veloren/veloren!541
 2019-10-05 00:28:30 +00:00
Forest Anderson
e6ee44aa1b Revert "Added to systems directory" 
This reverts commit 129674eb1c34e9e8d35d00d7973b99143d3a888e
 2019-10-04 23:53:10 +00:00