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

3649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
3d14f7054b Overhauled domestic economy simulation, better debug information 2020-04-23 18:19:40 +01:00
Joshua Barretto
3c9047fb51 Fixed cheap shader 2020-04-23 18:19:40 +01:00
Joshua Barretto
3c1c49901f Nicer water shaders 2020-04-23 18:19:40 +01:00
Joshua Barretto
cb12d8ba7a Added correctly allocated labours, fishing 2020-04-23 18:19:40 +01:00
Joshua Barretto
f62e6a4303 Basic trading simulation 2020-04-23 18:19:40 +01:00
Joshua Barretto
642a8f98f5 Began work on basic economic simulation 2020-04-23 18:19:40 +01:00
Joshua Barretto
85b75e016d Better track routing for civsim 2020-04-23 18:19:40 +01:00
Joshua Barretto
a072126ed3 Added store 2020-04-23 18:19:40 +01:00
Joshua Barretto
5c04e15e5f Added initial civ generation 2020-04-23 18:19:40 +01:00
Joshua Barretto
e58ec2655a Removed old settlement code, removed zcache from dependency of site generators for forward compatibility 2020-04-23 18:19:40 +01:00
Joshua Barretto
9ca7a77777 Moved settlement code to site directory, removed old town generation code 2020-04-23 18:19:40 +01:00
Joshua Barretto
09c2a3394e Cleaner clouds, better movement 2020-04-23 18:19:40 +01:00
Joshua Barretto
60244625b0 Better AO, fixed cloud pixelation 2020-04-23 18:19:40 +01:00
Joshua Barretto
7ae87d63e6 Fixed cloud bugs, made pets run into you less 2020-04-23 18:19:40 +01:00
Joshua Barretto
0885267ea3 Smoothed camera motion, gentler orientation lerping 2020-04-23 18:19:40 +01:00
Joshua Barretto
ca223112e6 Reversed water draw order 2020-04-23 18:19:40 +01:00
Joshua Barretto
1697c39adc Better town walls, made settlements avoid rivers 2020-04-23 18:19:40 +01:00
Joshua Barretto
e321bea637 Added basic wall and tower rendering 2020-04-23 18:19:40 +01:00
Joshua Barretto
a732b2f2f1 Began work on post-generation town rendering, fixed overflow bug on large maps 2020-04-23 18:19:40 +01:00
Joshua Barretto
0b6ffbea86 Added new settlement generation to world, basic rendering 2020-04-23 18:19:40 +01:00
Joshua Barretto
a088f2396c Town walls, wall towers 2020-04-23 18:19:40 +01:00
Joshua Barretto
3c074b4a71 Added river obstacle example 2020-04-23 18:19:40 +01:00
Joshua Barretto
08ad03ff0e Initial settlement generation work 2020-04-23 18:19:40 +01:00
Justin Shipsey
fb08a2c567 Merge branch 'music' into 'master' 
6 new music tracks

See merge request veloren/veloren!929
 2020-04-23 17:16:46 +00:00
Justin Shipsey
0335ab4cf9 6 new music tracks 2020-04-23 17:16:45 +00:00
Marcel
04c840c91b Merge branch 'songtronix/fix-ci' into 'master' 
allow coverage test to fail temporarily

See merge request veloren/veloren!934
 2020-04-23 13:18:27 +00:00
Songtronix
9595eca0be fix(ci): allow coverage test to fail temporarily 
#538
 2020-04-23 14:47:21 +02:00
Marcel
dc197ce0ab Merge branch 'songtronix/fix-toolchain' into 'master' 
fix toolchain

See merge request veloren/veloren!930
 2020-04-21 20:04:55 +00:00
Songtronix
4028231d3c fix toolchain 2020-04-21 20:04:55 +00:00
Marcel
62ef327a0b Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2020-04-17`

See merge request veloren/veloren!919
 2020-04-18 15:07:31 +00:00
Marcel
2849861b1c update toolchain to nightly-2020-04-17 2020-04-18 15:07:13 +00:00
Monty Marz
e41703149b Merge branch 'pfau/fix_palms' into 'master' 
Wrong model fix for fruit trees

See merge request veloren/veloren!915
 2020-04-16 13:55:15 +00:00
Pfauenauge90
e32b761a62 insert correct model, change offset accordingly 2020-04-16 15:04:02 +02:00
Songtronix
b7f52a0a3b Merge branch 'update-appdata-files' into 'master' 
Update AppData manifest to conform guidelines

See merge request veloren/veloren!907
 2020-04-16 05:25:04 +00:00
Artem
9451fbc6e4 Update AppData manifest to conform guidelines 
https://github.com/flathub/flathub/wiki/AppData-Guidelines

Fix desktop file
 2020-04-16 05:25:04 +00:00
Marcel
96b732adea Merge branch 'docker-compose-update' into 'master' 
Update docker-compose.yml with the same as in production by official server

See merge request veloren/veloren!914
 2020-04-15 12:50:13 +00:00
Marcel
496419fd98 Update docker-compose.yml with the same as in production by official server 2020-04-15 12:49:33 +00:00
Songtronix
0d9945437f Merge branch 'songtronix/fix-532' into 'master' 
rename server settings file to `server_settings.ron`

Closes #532

See merge request veloren/veloren!913
 2020-04-15 12:48:15 +00:00
Songtronix
42f3a18c9e change(server): rename settings file to server_settings.ron 2020-04-15 13:31:16 +02:00
Songtronix
c9c169e486 Merge branch 'ElXreno/proper-assets-path-finding' into 'master' 
Find assets by using other environment variables

See merge request veloren/veloren!912
 2020-04-15 10:38:00 +00:00
Imbris
aab06794c4 Merge branch 'olexorus/fix_serverlist_panic' into 'master' 
Fix panic if default server index is out of bounds

See merge request veloren/veloren!909
 2020-04-14 17:06:51 +00:00
Olexorus
8c54b07fc0 Fix panic if default server index is out of bounds 2020-04-14 18:32:01 +02:00
Monty Marz
c26fb1d5ee Merge branch 'imbris/slots' into 'master' 
Slots! Dragging, right-click to use, capes, lanterns, unequipping.

Closes #526

See merge request veloren/veloren!904
 2020-04-12 20:20:02 +00:00
Pfauenauge
51f5f9fee7 resolved comments 2020-04-12 21:45:19 +02:00
Imbris
75dc6bd455 Clarify todo comment 2020-04-12 15:35:43 -04:00
Imbris
2069c1aca4 fix example 2020-04-12 13:42:09 -04:00
ElXreno
af5476b672
Find assets by using other environment variables 
By using HOME, XDG_DATA_HOME and XDG_DATA_DIRS we can
build potentially proper paths for finding assets folder.
 2020-04-12 20:25:29 +03:00
Pfauenauge90
728158d27d cleanup, slot background, scaling 2020-04-12 18:41:10 +02:00
Imbris
9bf7d7b15c Changelog and small fix 2020-04-12 18:41:09 +02:00
Imbris
254ada45a0 Add backgound to hotbar slots 2020-04-12 18:41:09 +02:00