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,057 Commits 151 Branches 18 Tags 2.1 GiB
2f1021f955
Commit Graph

1057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Songtronix
2f1021f955 Replace texture2D with texture to fix MacOS crash 2019-06-09 20:20:29 +02: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
Joshua Barretto
3347c54dbb Merge branch 'midge/reduce-warnings' into 'master' 
Reduce warnings

See merge request veloren/veloren!204
 2019-06-06 14:48:41 +00:00
Cody
14ac5babd4 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
5c812a73bc 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
afd983f6f8 Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
427339cc9a Smoothed fog VD opening 2019-06-06 11:09:25 +01:00
Joshua Barretto
8da46b48ac Added frustum culling for chunks 2019-06-06 10:04:37 +01:00
Joshua Barretto
66cd8de0e1 Only draw chunks outside of fog boundary, reduce fog strength 2019-06-06 08:13:58 +01:00
Joshua Barretto
1b5d2d468b Made idx_for use idx_for_unchecked internally 2019-06-06 07:42:59 +01:00
Joshua Barretto
eb2d1f3278 Comment cleanup 2019-06-06 06:46:02 +01:00
Joshua Barretto
9617f5f17e Fixed mountain generation limits chonk bug 2019-06-05 22:38:43 +01:00
Joshua Barretto
35f0bebcc3 Fewer caves on mountains 2019-06-05 21:40:47 +01:00
Joshua Barretto
9ddc569a75 Fixed caves again 2019-06-05 21:33:06 +01:00
Joshua Barretto
5cc4669bce Upped cave frequency 2019-06-05 21:07:36 +01:00
Joshua Barretto
4ada144164 Changed debug flag in client 2019-06-05 20:52:51 +01:00
Joshua Barretto
d663da27b5 Made character the centre of the fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
732ba9ac02 Reduced tree density, shortened chunk load timeout 2019-06-05 20:52:51 +01:00
Joshua Barretto
76dca0b0cf Added dynamic fog growth 2019-06-05 20:52:51 +01:00
Joshua Barretto
9da2d82197 Added proper VD fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
cd630b0816 Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Joshua Barretto
13197a741e Tweaked mountain base scale 2019-06-05 20:52:51 +01:00
Joshua Barretto
9a8552d5fb Added rocks 2019-06-05 20:52:51 +01:00
Joshua Barretto
478cc24c91 Deferred normal unpacking to the terrain fragment shader 2019-06-05 20:52:51 +01:00
Joshua Barretto
06201c7353 fmt 2019-06-05 20:52:51 +01:00
Joshua Barretto
92f2d36b0c Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Joshua Barretto
910eccee82 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
58c783ee2e 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
6fab77bf7e 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
3723649d39 Update cpal 2019-06-05 13:17:19 -04:00
Louis Pearson
1a81660915 Update cpal 2019-06-04 13:18:59 -06:00
Louis Pearson
4cf13cc588 Integrate forces *after* velocity is applied 2019-06-04 12:14:10 -06:00
Louis Pearson
84ac965240 Normalize move_dir only if the magnitude is greater than one 2019-06-04 10:13:40 -06:00
Louis Pearson
52764376ae Use constants and normalized move direction 2019-06-04 10:09:34 -06:00
Louis Pearson
82aabf242a Add a function for integrating forces 2019-06-04 09:42:31 -06:00
Louis Pearson
c7a2ecd1f2 Adjust gliding speed 
Former-commit-id: f2104422d1874e80f792bb97ded19ca976bbd4c1
 2019-06-04 07:57:12 -06:00
Louis Pearson
e2d96cc7e0 Add CollisionShape, move friction calculations to phys 
Former-commit-id: 3723a8f74bc2854aaa98357e2d0b51a1668d9030
 2019-06-04 07:57:12 -06:00
Louis Pearson
afc5199b63 Remove z < 0 hack 
Former-commit-id: e0e4ad6e806189cd67ac626685ce9ed1456222f0
 2019-06-04 07:55:49 -06:00
Joshua Barretto
c8c07d2783 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
e98eff613b Fixed bug in loading JSON assets 2019-06-04 12:39:46 +00:00
Forest Anderson
4548ec3bf9 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
9da46ba6c5 Merge branch 'randomized-npc-names' of gitlab.com:veloren/veloren into randomized-npc-names 2019-06-04 01:11:19 -04:00
scorpion9979
b66fbce99d Cleaned code 2019-06-04 01:10:59 -04:00
scorpion9979
7bfd9464c9 Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
7919442d3d Implemented asset system for caching json data 2019-06-04 01:10:59 -04:00
scorpion9979
29f230d23e Cleaned code 
Refactored code for readability
 2019-06-04 01:10:59 -04:00
Ahmed Ihsan Tawfeeq
eb80459872 Added randomized NPC names veloren/veloren#133 2019-06-04 01:10:59 -04:00
scorpion9979
681de8bb7a Cleaned code 2019-06-04 07:22:11 +03:00
scorpion9979
2070bcac84 Added humanoid NPC type w/ names 2019-06-04 01:38:44 +03:00