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

1492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
75f6b9c1b2 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
6876a8bec1 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
e840949fa1 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
d7f94f9e25 New orc head models 2019-07-14 14:34:47 +00:00
Forest Anderson
ea4ddd7acf 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
5e37f07a1f Resolve Forests discussion. 2019-07-12 20:13:35 +02:00
Acrimon
c3be2f6e62 Resolve discussion from Timo. 2019-07-12 19:56:40 +02:00
Acrimon
36e8bb67db Resolved discussion from imbris. 2019-07-12 19:35:11 +02:00
Acrimon
7df823c40d Ran rustfmt 2019-07-12 21:29:16 +02:00
Acrimon
9ddacc5b82 Fixed some misses. 2019-07-12 20:51:22 +02:00
Acrimon
c48d252e4f Switched threadpool impl for veloren/server. 2019-07-12 18:30:15 +02:00
Forest Anderson
ed021fa132 Merge branch 'zesterer/worldgen' into 'master' 
Worldgen overhaul

See merge request veloren/veloren!321
 2019-07-11 12:57:17 +00:00
Joshua Barretto
9d3cb2f758 Fixed pyramid biome bug 2019-07-10 12:57:29 +01:00
Joshua Barretto
c2af5a17ba Added pyramids 2019-07-10 00:51:54 +01:00
Joshua Barretto
488a7d4f3c Smoothed world borders 2019-07-09 21:42:27 +01:00
Joshua Barretto
d5d34af9ea Better acacia tree colours 2019-07-09 20:42:43 +01:00
Joshua Barretto
978064f648 Better tree colours 2019-07-09 17:58:20 +01:00
Joshua Barretto
cba9b9151b Added fruit trees 2019-07-09 17:08:43 +01:00
Joshua Barretto
c818afb9dc Fix for clipping 2019-07-09 15:07:53 +01:00
Joshua Barretto
5163f45e8a Fixed block snapping at lower framerates 2019-07-09 14:04:30 +01:00
Joshua Barretto
ebb2fc2f17 Added 'perfect' collisions 2019-07-09 13:37:51 +01:00
Joshua Barretto
a3d2b8a65f Fixed jittering collision bug 2019-07-09 11:51:00 +01:00
Joshua Barretto
56b8201a37 Smoothed temperate/savannah border 2019-07-09 00:35:59 +01:00
Joshua Barretto
79d968fb01 Made cliff detection more tolerant 2019-07-09 00:31:43 +01:00
Joshua Barretto
facb3a71f5 Better savannah colours 2019-07-09 00:09:04 +01:00
Joshua Barretto
cef921ff4a Improved sunset shaders 2019-07-08 22:38:31 +01:00
Joshua Barretto
fddb22223b Colour improvements 2019-07-08 22:10:48 +01:00
Joshua Barretto
8b3e92576f Fixed acacia colours 2019-07-08 20:28:48 +01:00
Joshua Barretto
03bc18503b Re-added oceans 2019-07-08 20:08:08 +01:00
Joshua Barretto
fc820cd73c Added large ribcages in deserts 2019-07-08 17:57:41 +01:00
Joshua Barretto
ddeead6770 Added acacia trees, desert bones, fixed minor worldgen issues 2019-07-08 17:41:20 +01:00
Forest Anderson
793afd3471 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
cb130717ea Removed Discord feature 2019-07-08 16:17:50 +00:00
Joshua Barretto
579130297c Fixed tree clipping and several other minor issues 2019-07-08 17:00:50 +01:00
Joshua Barretto
5b4e95bb86 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
Joshua Barretto
2d3d3cb09a Restructured mountain profile 2019-07-08 01:49:54 +01:00
Joshua Barretto
a1d8c9794b Rescaled mountains 2019-07-08 00:50:36 +01:00
Joshua Barretto
0d81243227 Added rare structures, totally refactored structure spawning 2019-07-08 00:50:36 +01:00
Joshua Barretto
4db088ab57 Made temperature biomes larger, added savannah ground 2019-07-08 00:50:36 +01:00
Joshua Barretto
c651807b70 Merge branch 'slipped/substates' into 'master' 
substates

See merge request veloren/veloren!319
 2019-07-07 23:38:04 +00:00
jshipsey
85b9cefda1 removed weapon_id attribs, replaced with matches 2019-07-07 19:24:20 -04:00
jshipsey
28731d62ca fmt 2019-07-07 18:06:29 -04:00
jshipsey
b4656a60a5 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
Forest Anderson
4459d4674d 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
c4d6d94f29 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
0843c48e18 fmt 2019-07-07 17:31:34 +02:00
Pfauenauge90
b83a89eb63 clean up 2019-07-07 16:19:20 +02:00
Pfauenauge90
6b9af80d54 fmt 2019-07-07 16:19:20 +02:00
Pfauenauge90
3c60d7f682 acacia trees 2019-07-07 16:19:20 +02:00
Pfauenauge90
f164679649 ui scaling relative to window size 2019-07-07 16:19:20 +02:00