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,454 Commits 151 Branches 18 Tags 2.1 GiB
29803524fd
Commit Graph

1454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liids
b733f9739d Merge branch 'master' of https://gitlab.com/liids/veloren 2019-06-15 11:15:10 +02:00
liids
2cc2a36be2 make amount optional 2019-06-15 10:22:36 +02:00
liids
c859371ddb Merge all spawn commands into one 2019-06-15 09:56:27 +02:00
Joshua Barretto
4179125133 Merge branch 'toolchain-file' into 'master' 
Automatic nightly toolchain selection

See merge request veloren/veloren!236
 2019-06-14 12:49:29 +00:00
Mckol
d9234fdb12 Added the rust-toolchain file which automatically sets the toolchain to nightly for cargo users 2019-06-14 14:38:43 +02:00
Joshua Barretto
30b668d0cc Added dynamic tree colours 2019-06-13 11:59:05 +01:00
Joshua Barretto
743855092a Fixed missing assets 2019-06-13 11:59:05 +01:00
Monty Marz
9f5fe0231f palette changes 2019-06-13 11:59:05 +01:00
Joshua Barretto
fd529b5462 Added grass blending 2019-06-13 11:59:05 +01:00
Joshua Barretto
29ecb14c45 Added dirt/stone gradient 2019-06-13 11:59:05 +01:00
Joshua Barretto
9fed2c1534 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Pfauenauge90
e7649e1db4 small fixes 2019-06-13 11:59:05 +01:00
Pfauenauge90
43ca660e63 tree stumps, shorter pines 2019-06-13 11:59:05 +01:00
Joshua Barretto
fa8f3a4b49 Tweaked lighting and AO 2019-06-13 11:59:05 +01:00
Joshua Barretto
e671d8473c Bluer snow, altered rock colour 2019-06-13 11:59:05 +01:00
Joshua Barretto
df2594cbb4 Added more terrain noise, better snow 2019-06-13 11:59:05 +01:00
Joshua Barretto
8071670a37 More trees, adjusted camera tilt 2019-06-13 11:59:05 +01:00
Joshua Barretto
38c836d6c5 Simpler cliffs, camera tilt 2019-06-13 11:59:05 +01:00
Monty Marz
bac7bad9f7 Tree fixes 2019-06-13 11:59:05 +01:00
Joshua Barretto
7f5a0970f1 Crazy cliffs 2019-06-13 11:59:05 +01:00
Joshua Barretto
414b730b59 Reduced peak scale 2019-06-13 11:59:05 +01:00
Joshua Barretto
264b1efdff Adjusted mountain steepness 2019-06-13 11:59:05 +01:00
Joshua Barretto
f62725135a Rescaled mountains 2019-06-13 11:59:05 +01:00
Joshua Barretto
581c4d0e3b Fixed frustum culling efficiency bug 2019-06-13 11:59:05 +01:00
Joshua Barretto
e4d5476d28 Major worldgen structural refactor 2019-06-13 11:59:05 +01:00
Joshua Barretto
c445e76afa Fixed usize size issue for 32-bit platforms 2019-06-13 11:59:05 +01:00
Joshua Barretto
3285fc9b88 Added sampler clearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
cf193a97c4 Set default case for block type opacity 2019-06-13 11:59:05 +01:00
Joshua Barretto
a34aff3a8b Prevented rock smearing 2019-06-13 11:59:05 +01:00
Joshua Barretto
61dda0ea8c Separated sampler code from simulation code 2019-06-13 11:59:05 +01:00
Imbris
d449972bc4 Merge branch 'slipped-animation-warnings' into 'master' 
cleared out unused animation variables

See merge request veloren/veloren!233
 2019-06-13 05:40:24 +00:00
jshipsey
99b4406d79 cleared out unused animation variables 2019-06-13 00:14:06 -04:00
Marcel
9783ff56e8 Merge branch 'midge/mouse-sensitivity' into 'master' 
Better Settings

Closes #142 and #132

See merge request veloren/veloren!216
 2019-06-12 13:12:46 +00:00
Timo Koesters
99a1f153fb Merge branch 'timo-cleanup' into 'master' 
Cleanup

See merge request veloren/veloren!226
 2019-06-11 07:00:46 +00:00
timokoesters
2ca0c62654
Cleanup 2019-06-10 22:44:03 +02:00
Cody
7b1258dc72 Merge branch 'imbris/clock_changes' into 'midge/mouse-sensitivity' 
Use Instant and running compensation in Clock

See merge request veloren/veloren!222
 2019-06-10 13:13:58 +00:00
Timo Koesters
608aedbadf Merge branch 'songtronix/fix-macos-crash' into 'master' 
Resolve "MacOS Crash: Invalid call of undeclared identifier texture2D"

Closes #151

See merge request veloren/veloren!221
 2019-06-09 19:41:44 +00:00
Songtronix
2f1021f955 Replace texture2D with texture to fix MacOS crash 2019-06-09 20:20:29 +02:00
Imbris
8dcf030bd8 Use Instant and running compensation in clock 2019-06-09 14:14:02 -04:00
Cody
ea207b911a
Amends a variable name. 2019-06-08 20:09:30 -04:00
Cody
b180f89104
Enhances deserialization so settings which are missing are added with default values. 2019-06-08 19:35:23 -04:00
Cody
026ac32972
Amends the suggested 1 FPS option to 15 to prevent accidental session crashes. 2019-06-08 12:23:58 -04:00
Cody
e18947eed1
Changes the fallback slider value to a safe one. 2019-06-08 12:23:58 -04:00
Cody
24f7323d04
Allows selection of an unstable 1 FPS option. 2019-06-08 12:23:58 -04:00
Cody
527f33a778
Adds an FPS setting and slider. 2019-06-08 12:23:58 -04:00
Monty Marz
8a19a6f2a3
Configurable max fps 2019-06-08 12:23:57 -04:00
Cody
41f3cd5803
Changes setting type to u32, enforces live in-game updates to setting. 2019-06-08 12:23:57 -04:00
Cody
a90d073c22
Adds mouse sensitivity sliders that update settings file. 2019-06-08 12:23:45 -04:00
Forest Anderson
eb83040af3 Merge branch 'timokoesters/fix-settings' into 'master' 
Ungrab mouse when closing settings with X

See merge request veloren/veloren!219
 2019-06-07 20:28:17 +00:00
timokoesters
037fcfe5da
Ungrab mouse when closing settings with X 2019-06-07 22:23:06 +02:00