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

1059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
scorpion9979
a2fee9d68b Cleaned code 2019-06-04 07:22:11 +03:00
scorpion9979
7be0d0a09c Added humanoid NPC type w/ names 2019-06-04 01:38:44 +03:00
Joshua Barretto
f473c13d03 Merge branch 'voxel-shadows' into 'master' 
Shadows, deserts, snow, caves

See merge request veloren/veloren!198
 2019-06-03 22:13:10 +00:00
scorpion9979
45eb6327cb Implemented asset system for caching json data 2019-06-04 01:11:27 +03:00
Joshua Barretto
e0cf6b5e37 Compressed vertex data even more 2019-06-04 00:09:49 +02:00
Joshua Barretto
76965c7e99 disabled temporarily point light 2019-06-04 00:08:58 +02:00
Joshua Barretto
e62179f512 Fixed hard cave walls 2019-06-04 00:08:23 +02:00
Joshua Barretto
4f55a9dd12 Removed second cave layer 2019-06-04 00:08:22 +02:00
Joshua Barretto
71e123fde1 Upped cave spawn rate 2019-06-04 00:08:22 +02:00
Joshua Barretto
c2588fcaa3 Made extreme biomes more common 2019-06-03 22:50:47 +01:00
Joshua Barretto
6067c9a1f5 Made caves wider 2019-06-03 22:50:47 +01:00
Joshua Barretto
3c16c5a3ec Added basic light 2019-06-03 22:50:47 +01:00
Joshua Barretto
ee90661f03 Improved cave proportions 2019-06-03 22:50:47 +01:00
Joshua Barretto
375c9914f9 Improved cave noise 2019-06-03 22:50:47 +01:00
Pfauenauge90
765d8975a8 human house assets 2019-06-03 22:50:47 +01:00
Pfauenauge90
b1a6219e31 Roots added 
fmt

asset fix
 2019-06-03 22:50:27 +01:00
Joshua Barretto
6df4ef7a8e Merge branch 'midge/pet-jump-fix' into 'master' 
Fixes pet jumping bug.

See merge request veloren/veloren!206
 2019-06-03 20:09:18 +00:00
Cody
0f1d37405a Fixes a bug where animals continually jumped after their target was any height above them, even once the target was no longer above them. 2019-06-03 20:09:18 +00:00
scorpion9979
a993fe9746 Refactored code for readability 2019-06-03 12:21:38 +03:00
Timo Koesters
d1b0af51cd Merge branch 'fix-server-info' into 'master' 
Add server info and player list to client

See merge request veloren/veloren!197
 2019-06-02 14:45:41 +00:00
timokoesters
5cc2f11e58
Add TODO 2019-06-02 16:35:21 +02:00
Forest Anderson
8d0c77bfe4 Merge branch 'esc-menu-fix' into 'master' 
esc menu rework

See merge request veloren/veloren!160
 2019-06-02 02:17:36 +00:00
Monty Marz
815e1ccf9c Button added 
Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f
 2019-06-02 02:17:36 +00:00
scorpion9979
e6481c0296 Cleaned code 2019-06-01 22:49:34 +03:00
Ahmed Ihsan Tawfeeq
4f494f8990 Merge branch 'randomized-npc-names' into 'randomized-npc-names' 
Added randomized NPC names veloren/veloren#133

See merge request veloren/veloren!205
 2019-06-01 19:24:17 +00:00
Ahmed Ihsan Tawfeeq
384fbdc2a6 Added randomized NPC names veloren/veloren#133 2019-06-01 19:24:17 +00:00
Imbris
2534e79df7 Merge branch 'misc_fixes' into 'master' 
Miscellaneous language and name fixes

See merge request veloren/veloren!201
 2019-06-01 05:05:40 +00:00
Cody
02da1bd4e5
Reverts one erroneous change, further corrects another comment. 2019-06-01 00:52:20 -04:00
Cody
cfc68deafe
Makes some quick in-game menu fixes. 2019-05-31 16:36:25 -04:00
Cody
763a84ad94
cargo fmt 2019-05-31 16:36:24 -04:00
Cody
0ec9fafec0
Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names. 2019-05-31 16:36:24 -04:00
Cody
3c3fa995ba
Changes asset filenames for consistencies. 2019-05-31 16:36:24 -04:00
Cody
a229d08c2b
Addresses more naming schemes and typos. 2019-05-31 16:36:24 -04:00
Cody
a7fc0966b4
cargo fmt 2019-05-31 16:36:23 -04:00
Cody
de7f18d90d
Fixes some typos, comment inconsistencies, and incorrect naming conventions. 2019-05-31 16:36:16 -04:00
Forest Anderson
f13f9e625b Merge branch 'desttinghim/update-cpal' into 'master' 
Add fix for headphone and invalid device params

Closes #139

See merge request veloren/veloren!203
 2019-05-31 20:30:58 +00:00
Louis Pearson
7edc53049a Add fix for headphone and invalid device params 2019-05-31 14:24:33 -06:00
Forest Anderson
cafb395eec Merge branch 'desttinghim/update-cpal' into 'master' 
Move to latest version of cpal

See merge request veloren/veloren!202
 2019-05-31 19:47:08 +00:00
Louis Pearson
be5261475c Move to latest version of cpal 2019-05-31 13:19:32 -06:00
Pfauenauge90
a01ae4d603 third pine variation 2019-05-31 18:05:56 +02:00
Pfauenauge90
2d253ac2e6 Even more assets with offsets 2019-05-31 18:05:56 +02:00
Pfauenauge90
c516a2b6b8 changed chest and pants colours 2019-05-31 18:05:55 +02:00
Pfauenauge90
492dbc4af3 more assets, offsets for temperate trees 2019-05-31 18:05:55 +02:00
Pfauenauge90
8dd3752d8a Asset path change 2019-05-31 18:05:55 +02:00
Joshua Barretto
ccc21ba4df Switched to squircle caves 2019-05-31 17:00:51 +01:00
Joshua Barretto
cac8fd565a Reduced cave winding, increased cave size 2019-05-31 16:28:01 +01:00
Joshua Barretto
a5268ba586 Much better caves 2019-05-31 16:16:26 +01:00
Joshua Barretto
1fcf6aebcb Added desert and snowy areas 
Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802
 2019-05-29 22:24:47 +01:00
Joshua Barretto
69a158a83c Basic cave test 
Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e
 2019-05-29 14:49:27 +01:00
Joshua Barretto
4477e8ca6e Added voxel shadows 
Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c
 2019-05-29 12:01:02 +01:00