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,876 Commits 151 Branches 18 Tags 2.1 GiB
746a10e8d0
Commit Graph

3876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Yanovski
746a10e8d0 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-02 04:02:09 +02:00
Monty Marz
40ab94673e Merge branch 'cultists-hotfix' into 'master' 
Shoulder offsets, meta.ron versioning

See merge request veloren/veloren!959
 2020-05-01 21:27:12 +00:00
Monty Marz
f5c2341167 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Joshua Yanovski
0f4a0e763d Switch back to pop-in terrain. 2020-05-01 23:03:24 +02:00
Joshua Yanovski
dd74fa7e4a LOD shading closer to voxel shading. 2020-05-01 22:58:55 +02:00
Monty Marz
250e4b3043 Merge branch 'pfau/assets' into 'master' 
Villagers and Cultists

See merge request veloren/veloren!957
 2020-04-30 20:43:24 +00:00
Monty Marz
c792cc05a9 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Monty Marz
dc95efa95b Merge branch 'zesterer/world-changes' into 'master' 
Dungeon entrances

See merge request veloren/veloren!955
 2020-04-29 15:36:57 +00:00
Pfauenauge90
1211a59f91 cleanup, more dungeon entrances 2020-04-29 17:01:35 +02:00
Joshua Barretto
2eac00405d Updated changelog 2020-04-29 17:01:35 +02:00
Joshua Barretto
44fc88b4d1 Better dungeon waypoint placement 2020-04-29 17:01:35 +02:00
Joshua Barretto
3e86b20c2c Fixed dungeon offsets 2020-04-29 17:01:34 +02:00
Joshua Barretto
d0b1c9eb6f Added dungeon entrances 2020-04-29 17:01:34 +02:00
Joshua Barretto
00f0a011de Merge branch 'non-integer-offsets' into 'master' 
Non integer offsets

See merge request veloren/veloren!956
 2020-04-29 14:45:21 +00:00
Joshua Barretto
1e91f7a0ab Added 1 extra bit per figure vertex position component, resolved char screen bug 2020-04-29 15:22:08 +01:00
Marcel Märtens
83af40a460 Allow for 0.5 offsets in figures 2020-04-29 14:10:46 +02:00
Joshua Yanovski
ef67bd58ba Experimental underwater lighting. 2020-04-28 20:49:03 +02:00
Justin Shipsey
19ce03d9ed Merge branch 'snowram/animals' into 'master' 
new animals

See merge request veloren/veloren!954
 2020-04-28 03:13:23 +00:00
Justin Shipsey
171e865f57 new animals 2020-04-28 03:13:23 +00:00
Joshua Yanovski
2c5ad9d076 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-04-27 22:35:24 +02:00
Joshua Yanovski
7482798354 Replace discard in figure-frag. 2020-04-27 21:59:55 +02:00
Joshua Yanovski
d83b4ae69b Fix sprite lighting, HDR from focus_pos. 2020-04-27 18:45:57 +02:00
Joshua Yanovski
0594238004 Proper HDR from point lights. 2020-04-27 18:14:10 +02:00
Joshua Yanovski
48c93d2b41 Brighter ambiance, darker LOD shadows. 2020-04-27 14:01:43 +02:00
Joshua Yanovski
e0452e895c More proper HDR. 2020-04-27 13:13:23 +02:00
Justin Shipsey
303967a6f7 Merge branch 'slipped/attributes' into 'master' 
skel attribute transfer

See merge request veloren/veloren!949
 2020-04-27 05:11:34 +00:00
Justin Shipsey
b4af588a00 skel attribute transfer 2020-04-27 05:11:34 +00:00
Joshua Yanovski
4c6da3ed16 Trying LOD noise. 2020-04-27 00:13:10 +02:00
Joshua Yanovski
682a3d74c8 Fix LOD heights in towns. 2020-04-26 23:11:08 +02:00
Joshua Yanovski
cc39e5734e More LOD fixes. 2020-04-26 21:01:23 +02:00
Joshua Barretto
dcc20590bf Merge branch 'zesterer/phys-fixes' into 'master' 
Added Colliders, made projectiles point particles

See merge request veloren/veloren!947
 2020-04-26 18:24:33 +00:00
Joshua Barretto
390e46b752 Fixed unit tests 2020-04-26 18:50:21 +01:00
Joshua Barretto
bd58be9f58 fmt 2020-04-26 17:56:09 +01:00
Joshua Barretto
bd2093c819 Fixed projectile solid collisions 2020-04-26 17:56:09 +01:00
Joshua Barretto
58b30c4518 Stopped velocity when point particles hit walls 2020-04-26 17:56:09 +01:00
Joshua Barretto
b750b2b00c Fixed logic issue with sticky objects 2020-04-26 17:56:09 +01:00
Joshua Barretto
8e0f40c71e Added on_ceiling check for sticky entities 2020-04-26 17:56:09 +01:00
Joshua Barretto
eb23b0b2bd Added Colliders, made projectiles point particles 2020-04-26 17:56:09 +01:00
Monty Marz
6d7cb8654d Merge branch 'pfau/ui-fixes' into 'master' 
UI Fixes

See merge request veloren/veloren!946
 2020-04-26 01:44:56 +00:00
Monty Marz
4521791591 UI Fixes 2020-04-26 01:44:56 +00:00
Justin Shipsey
1e64b1be5b Merge branch 'slipped/golem' into 'master' 
body/anim tweaks

See merge request veloren/veloren!945
 2020-04-26 01:09:04 +00:00
Justin Shipsey
6fa13bcb7e body/anim tweaks 2020-04-26 01:09:03 +00:00
Joshua Yanovski
8116b21c2e I like this coloring. 2020-04-25 23:54:43 +02:00
Joshua Yanovski
bc2560ea90 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-04-25 23:48:33 +02:00
Joshua Barretto
e690efe717 Merge branch 'zesterer/perf' into 'master' 
Performance improvements, LoD system for terrain sprites and figures

See merge request veloren/veloren!944
 2020-04-25 21:15:32 +00:00
Joshua Barretto
237da2134d Updated changelog 2020-04-25 21:44:43 +01:00
Joshua Barretto
d2ab29b8bd Clean up reexport 2020-04-25 21:44:23 +01:00
Joshua Barretto
a1983712d3 Prevented windows spawning inside houses 2020-04-25 21:44:23 +01:00
Joshua Barretto
90de779559 Better LoD variable names 2020-04-25 21:44:23 +01:00
Joshua Barretto
8871cb2d29 Better scaled rounding 2020-04-25 21:44:23 +01:00