1059 Commits

Author SHA1 Message Date
Monty Marz
f5928dd7cc
Configurable max fps 2019-06-08 12:23:57 -04:00
Cody
ea544d4746
Changes setting type to u32, enforces live in-game updates to setting. 2019-06-08 12:23:57 -04:00
Cody
e7eb31908b
Adds mouse sensitivity sliders that update settings file. 2019-06-08 12:23:45 -04:00
Forest Anderson
e439c63138 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
f1b9b1215c
Ungrab mouse when closing settings with X 2019-06-07 22:23:06 +02:00
Joshua Barretto
3b8df32991 Merge branch 'midge/reduce-warnings' into 'master'
Reduce warnings

See merge request veloren/veloren!204
2019-06-06 14:48:41 +00:00
Cody
68d3642b3a Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Joshua Barretto
310e0559fd Merge branch 'chonk-fixes' into 'master'
Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base

See merge request veloren/veloren!211
2019-06-06 11:38:58 +00:00
Joshua Barretto
ff5a6b9bcb Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
1e0f90058b Smoothed fog VD opening 2019-06-06 11:09:25 +01:00
Joshua Barretto
1feff6c5aa Added frustum culling for chunks 2019-06-06 10:04:37 +01:00
Joshua Barretto
77a3b47bda Only draw chunks outside of fog boundary, reduce fog strength 2019-06-06 08:13:58 +01:00
Joshua Barretto
d7d51e1810 Made idx_for use idx_for_unchecked internally 2019-06-06 07:42:59 +01:00
Joshua Barretto
5a3a88553a Comment cleanup 2019-06-06 06:46:02 +01:00
Joshua Barretto
c991b840cc Fixed mountain generation limits chonk bug 2019-06-05 22:38:43 +01:00
Joshua Barretto
dcbb51ea9b Fewer caves on mountains 2019-06-05 21:40:47 +01:00
Joshua Barretto
888518bb5c Fixed caves again 2019-06-05 21:33:06 +01:00
Joshua Barretto
3eea6c420f Upped cave frequency 2019-06-05 21:07:36 +01:00
Joshua Barretto
851b60db25 Changed debug flag in client 2019-06-05 20:52:51 +01:00
Joshua Barretto
8602f2dd0b Made character the centre of the fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
5b55fe1be0 Reduced tree density, shortened chunk load timeout 2019-06-05 20:52:51 +01:00
Joshua Barretto
fa66095742 Added dynamic fog growth 2019-06-05 20:52:51 +01:00
Joshua Barretto
ca4a0e7bc1 Added proper VD fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
672275633c Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Joshua Barretto
bdc9a3c731 Tweaked mountain base scale 2019-06-05 20:52:51 +01:00
Joshua Barretto
a49e061c7b Added rocks 2019-06-05 20:52:51 +01:00
Joshua Barretto
db5524a21a Deferred normal unpacking to the terrain fragment shader 2019-06-05 20:52:51 +01:00
Joshua Barretto
130cbca49a fmt 2019-06-05 20:52:51 +01:00
Joshua Barretto
f3464b36b9 Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Joshua Barretto
9c1ac23095 Merge branch 'better-physics' into 'master'
FPS independent physics

See merge request veloren/veloren!168
2019-06-05 19:51:18 +00:00
Forest Anderson
18f3fa26e3 Merge branch 'midge/emergency-cherry-pick' into 'master'
Update cpal

See merge request veloren/veloren!213
2019-06-05 17:31:17 +00:00
Forest Anderson
3df8113a5b Merge branch 'update-cpal' into 'better-physics'
Update cpal

See merge request veloren/veloren!212
2019-06-05 17:17:58 +00:00
Louis Pearson
f06fd808ba Update cpal 2019-06-05 13:17:19 -04:00
Louis Pearson
a4dc7d8058 Update cpal 2019-06-04 13:18:59 -06:00
Louis Pearson
1a2de98ab6 Integrate forces *after* velocity is applied 2019-06-04 12:14:10 -06:00
Louis Pearson
b1e502cea4 Normalize move_dir only if the magnitude is greater than one 2019-06-04 10:13:40 -06:00
Louis Pearson
3038dff870 Use constants and normalized move direction 2019-06-04 10:09:34 -06:00
Louis Pearson
bca56fcd53 Add a function for integrating forces 2019-06-04 09:42:31 -06:00
Louis Pearson
409e79870c Adjust gliding speed
Former-commit-id: f2104422d1874e80f792bb97ded19ca976bbd4c1
2019-06-04 07:57:12 -06:00
Louis Pearson
e4ea30e158 Add CollisionShape, move friction calculations to phys
Former-commit-id: 3723a8f74bc2854aaa98357e2d0b51a1668d9030
2019-06-04 07:57:12 -06:00
Louis Pearson
002207001c Remove z < 0 hack
Former-commit-id: e0e4ad6e806189cd67ac626685ce9ed1456222f0
2019-06-04 07:55:49 -06:00
Joshua Barretto
dcf01eabb0 Merge branch 'assets-bug-fix' into 'master'
Fixed bug in loading JSON assets

See merge request veloren/veloren!210
2019-06-04 12:39:46 +00:00
Ahmed Ihsan Tawfeeq
5705c1572c Fixed bug in loading JSON assets 2019-06-04 12:39:46 +00:00
Forest Anderson
7235e5fe7c Merge branch 'randomized-npc-names' into 'master'
Added randomized NPC names veloren/veloren#133

Closes #133

See merge request veloren/veloren!207
2019-06-04 05:23:25 +00:00
Forest Anderson
c7186ab584 Merge branch 'randomized-npc-names' of gitlab.com:veloren/veloren into randomized-npc-names 2019-06-04 01:11:19 -04:00
scorpion9979
fe18b88cda Cleaned code 2019-06-04 01:10:59 -04:00
scorpion9979
d566fc4f1f Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
f6f915e441 Implemented asset system for caching json data 2019-06-04 01:10:59 -04:00
scorpion9979
d62f3a292b Cleaned code
Refactored code for readability
2019-06-04 01:10:59 -04:00
Ahmed Ihsan Tawfeeq
2ef2c22ad1 Added randomized NPC names veloren/veloren#133 2019-06-04 01:10:59 -04:00