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
1,494 Commits 151 Branches 18 Tags 2.1 GiB
c47bb5ed45
Commit Graph

1494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Broński
c47bb5ed45 Merge branch 'xacrimon/update-d' into 'master' 
Update UVTH dependency to fix some minor issues.

See merge request veloren/veloren!338
 2019-07-15 20:39:59 +00:00
Acrimon
b11bc46e09 Update uvth in lockfile. 2019-07-15 22:11:18 +02:00
Joshua Barretto
0c31fb7e91 Merge branch 'tmpportchange' into 'master' 
Change the default port for the veloren server because the original server is...

See merge request veloren/veloren!337
 2019-07-15 17:48:22 +00:00
Marcel Märtens
242cdbe6e5 Change the default port for the veloren server because the original server is unanvailable for a few days and the secondary server cannot use the default veloren port 2019-07-15 19:42:13 +02:00
Joshua Barretto
9da822efce Merge branch 'pfau-vechro/orc-heads' into 'master' 
New orc head models

See merge request veloren/veloren!336
 2019-07-14 14:34:47 +00:00
Monty Marz
ff6a72bc40 New orc head models 2019-07-14 14:34:47 +00:00
Forest Anderson
2bf2e7f958 Merge branch 'xacrimon/switch-threadpool-to-uvth' into 'master' 
Switch threadpool implementation to uvth.

See merge request veloren/veloren!328
 2019-07-12 18:29:50 +00:00
Acrimon
a36c049b06 Resolve Forests discussion. 2019-07-12 20:13:35 +02:00
Acrimon
b4f2cd1547 Resolve discussion from Timo. 2019-07-12 19:56:40 +02:00
Acrimon
a72722e5d1 Resolved discussion from imbris. 2019-07-12 19:35:11 +02:00
Acrimon
ccc7cb2976 Ran rustfmt 2019-07-12 21:29:16 +02:00
Acrimon
20ac81a986 Fixed some misses. 2019-07-12 20:51:22 +02:00
Acrimon
69537f7dd9 Switched threadpool impl for veloren/server. 2019-07-12 18:30:15 +02:00
Forest Anderson
1506898baa Merge branch 'zesterer/worldgen' into 'master' 
Worldgen overhaul

See merge request veloren/veloren!321
 2019-07-11 12:57:17 +00:00
Joshua Barretto
9d1575db3f Fixed pyramid biome bug 2019-07-10 12:57:29 +01:00
Joshua Barretto
09717f1c56 Added pyramids 2019-07-10 00:51:54 +01:00
Joshua Barretto
92d4b4dfbe Smoothed world borders 2019-07-09 21:42:27 +01:00
Joshua Barretto
9bc50ae547 Better acacia tree colours 2019-07-09 20:42:43 +01:00
Joshua Barretto
a6c9c10062 Better tree colours 2019-07-09 17:58:20 +01:00
Joshua Barretto
e7dd151833 Added fruit trees 2019-07-09 17:08:43 +01:00
Joshua Barretto
bbd7f579d2 Fix for clipping 2019-07-09 15:07:53 +01:00
Joshua Barretto
9f6f9cb25f Fixed block snapping at lower framerates 2019-07-09 14:04:30 +01:00
Joshua Barretto
0f0f28284c Added 'perfect' collisions 2019-07-09 13:37:51 +01:00
Joshua Barretto
6bb48760d7 Fixed jittering collision bug 2019-07-09 11:51:00 +01:00
Joshua Barretto
73e9dba153 Smoothed temperate/savannah border 2019-07-09 00:35:59 +01:00
Joshua Barretto
fa28c8a6c6 Made cliff detection more tolerant 2019-07-09 00:31:43 +01:00
Joshua Barretto
cfdb0209bd Better savannah colours 2019-07-09 00:09:04 +01:00
Joshua Barretto
bb50bb8c81 Improved sunset shaders 2019-07-08 22:38:31 +01:00
Joshua Barretto
d79f7d9714 Colour improvements 2019-07-08 22:10:48 +01:00
Joshua Barretto
879789ecc4 Fixed acacia colours 2019-07-08 20:28:48 +01:00
Joshua Barretto
8e8bad137a Re-added oceans 2019-07-08 20:08:08 +01:00
Joshua Barretto
6b415c1b87 Added large ribcages in deserts 2019-07-08 17:57:41 +01:00
Joshua Barretto
14ba09f96b Added acacia trees, desert bones, fixed minor worldgen issues 2019-07-08 17:41:20 +01:00
Forest Anderson
0d7b5eee82 Merge branch 'angelonfira/hotfix-discord-ci' into 'master' 
Removed Discord feature

See merge request veloren/veloren!320
 2019-07-08 16:17:50 +00:00
Forest Anderson
33cbb96a82 Removed Discord feature 2019-07-08 16:17:50 +00:00
Joshua Barretto
f823b0c992 Fixed tree clipping and several other minor issues 2019-07-08 17:00:50 +01:00
Joshua Barretto
c2a11ed6b2 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
Joshua Barretto
71f4704502 Restructured mountain profile 2019-07-08 01:49:54 +01:00
Joshua Barretto
c6e24b593e Rescaled mountains 2019-07-08 00:50:36 +01:00
Joshua Barretto
44b5473a82 Added rare structures, totally refactored structure spawning 2019-07-08 00:50:36 +01:00
Joshua Barretto
29803524fd Made temperature biomes larger, added savannah ground 2019-07-08 00:50:36 +01:00
Joshua Barretto
e1ede61c06 Merge branch 'slipped/substates' into 'master' 
substates

See merge request veloren/veloren!319
 2019-07-07 23:38:04 +00:00
jshipsey
529281e2c3 removed weapon_id attribs, replaced with matches 2019-07-07 19:24:20 -04:00
jshipsey
12667b9172 fmt 2019-07-07 18:06:29 -04:00
jshipsey
5cd1bfb3d2 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
Forest Anderson
d45acdc645 Merge branch 'inventory-items' into 'master' 
crosshair changes (WIP!), inventory visuals, camera changes, savannah trees

See merge request veloren/veloren!317
 2019-07-07 15:42:50 +00:00
Forest Anderson
faa67e81a6 Merge branch 'songtronix/veloren-discord-rich-presence' into 'master' 
Added discord presence

See merge request veloren/veloren!214
 2019-07-07 15:38:54 +00:00
Pfauenauge90
0cc3c76542 fmt 2019-07-07 17:31:34 +02:00
Pfauenauge90
7f45d274a8 clean up 2019-07-07 16:19:20 +02:00
Pfauenauge90
f3bda57e67 fmt 2019-07-07 16:19:20 +02:00