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,839 Commits 151 Branches 18 Tags 2.1 GiB
48c93d2b41
Commit Graph

3839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
16a175abe0 Nicer water shaders 2020-04-23 18:19:40 +01:00
Joshua Barretto
a0dae82a2b Added correctly allocated labours, fishing 2020-04-23 18:19:40 +01:00
Joshua Barretto
cee1b1f962 Basic trading simulation 2020-04-23 18:19:40 +01:00
Joshua Barretto
46190aa634 Began work on basic economic simulation 2020-04-23 18:19:40 +01:00
Joshua Barretto
348003fc1a Better track routing for civsim 2020-04-23 18:19:40 +01:00
Joshua Barretto
fe4418bc0d Added store 2020-04-23 18:19:40 +01:00
Joshua Barretto
c1514fc37b Added initial civ generation 2020-04-23 18:19:40 +01:00
Joshua Barretto
41b77a9b10 Removed old settlement code, removed zcache from dependency of site generators for forward compatibility 2020-04-23 18:19:40 +01:00
Joshua Barretto
1c6a6cd6cf Moved settlement code to site directory, removed old town generation code 2020-04-23 18:19:40 +01:00
Joshua Barretto
b9cc0f387b Cleaner clouds, better movement 2020-04-23 18:19:40 +01:00
Joshua Barretto
df5aa93fd7 Better AO, fixed cloud pixelation 2020-04-23 18:19:40 +01:00
Joshua Barretto
d91d66027a Fixed cloud bugs, made pets run into you less 2020-04-23 18:19:40 +01:00
Joshua Barretto
3d4a294b83 Smoothed camera motion, gentler orientation lerping 2020-04-23 18:19:40 +01:00
Joshua Barretto
5f2d0021a3 Reversed water draw order 2020-04-23 18:19:40 +01:00
Joshua Barretto
9dc46c490e Better town walls, made settlements avoid rivers 2020-04-23 18:19:40 +01:00
Joshua Barretto
5d5e8e3238 Added basic wall and tower rendering 2020-04-23 18:19:40 +01:00
Joshua Barretto
085a115e2b Began work on post-generation town rendering, fixed overflow bug on large maps 2020-04-23 18:19:40 +01:00
Joshua Barretto
0021bd6452 Added new settlement generation to world, basic rendering 2020-04-23 18:19:40 +01:00
Joshua Barretto
48fb14116a Town walls, wall towers 2020-04-23 18:19:40 +01:00
Joshua Barretto
20b16d229c Added river obstacle example 2020-04-23 18:19:40 +01:00
Joshua Barretto
944a37b848 Initial settlement generation work 2020-04-23 18:19:40 +01:00
Justin Shipsey
ecf0b90da2 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
7519e842e9 6 new music tracks 2020-04-23 17:16:45 +00:00
Marcel
e549910bd1 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
465d4d44ee fix(ci): allow coverage test to fail temporarily 
#538
 2020-04-23 14:47:21 +02:00
Joshua Yanovski
f2953087f6 Fix shadowing for specular reflections. 2020-04-23 00:01:20 +02:00
Joshua Yanovski
ddd4a67a97 HDR fixes. 2020-04-22 22:56:12 +02:00
Marcel
1ad3fb4e64 Merge branch 'songtronix/fix-toolchain' into 'master' 
fix toolchain

See merge request veloren/veloren!930
 2020-04-21 20:04:55 +00:00
Songtronix
26e27f4198 fix toolchain 2020-04-21 20:04:55 +00:00
Joshua Yanovski
1015e60dee More lighting changes. 2020-04-21 18:25:19 +02:00
Marcel
00f48a12c5 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
bf43770993 update toolchain to nightly-2020-04-17 2020-04-18 15:07:13 +00:00
Monty Marz
b4345c3246 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
5daa7d7b02 insert correct model, change offset accordingly 2020-04-16 15:04:02 +02:00
Songtronix
51126da127 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
4aa176daec 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
ce53be415e 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
32a8e6d304 Update docker-compose.yml with the same as in production by official server 2020-04-15 12:49:33 +00:00
Songtronix
d9220261ff 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
996eee0b42 change(server): rename settings file to server_settings.ron 2020-04-15 13:31:16 +02:00
Songtronix
866cfa3a8f 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
b3c54a9bbb 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
027d0f11da Fix panic if default server index is out of bounds 2020-04-14 18:32:01 +02:00
Joshua Yanovski
80c264abd1 Lighting experiments. 2020-04-13 00:29:59 +02:00
Monty Marz
1dd1318ae0 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
25a9d5bf2f resolved comments 2020-04-12 21:45:19 +02:00
Imbris
9ff816f006 Clarify todo comment 2020-04-12 15:35:43 -04:00
Imbris
b98680b9cb fix example 2020-04-12 13:42:09 -04:00
ElXreno
4cdc1300a1
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
cee1c2f85b cleanup, slot background, scaling 2020-04-12 18:41:10 +02:00