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

2015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
d9854ad682 Merge branch 'zesterer/instancing' into 'master' 
Instancing (block sprites)

See merge request veloren/veloren!450
 2019-08-22 11:10:57 +00:00
Joshua Yanovski
aa4464d8f4 Adding more jungle trees. 2019-08-22 01:33:47 +02:00
Joshua Yanovski
139933194c Restore old chaos. 2019-08-22 01:01:13 +02:00
Joshua Yanovski
16ad7ba042 Fixing colors. 2019-08-22 00:15:24 +02:00
Joshua Yanovski
d174dd99b4 Fixing a few visual issues. 2019-08-21 23:36:43 +02:00
Joshua Yanovski
bd8a0be0fb Putting back splotchy mud. 2019-08-21 20:59:26 +02:00
Joshua Yanovski
91ea62a5c9 Get rid of extraneous things. 2019-08-21 20:48:51 +02:00
Pfauenauge90
8654622bfa colour tweaks 2019-08-21 20:43:38 +02:00
Joshua Yanovski
cc269afa38 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-21 20:41:54 +02:00
Joshua Yanovski
05d501632e Fixing jungle. 2019-08-21 20:41:32 +02:00
Joshua Barretto
7ceccfecc3 Added cacti 2019-08-21 19:18:16 +01:00
Joshua Barretto
6ff264d982 Better plant grouping distribution 2019-08-21 18:56:46 +01:00
Timo Koesters
1bb969ef36 Merge branch 'velocity-fix' into 'master' 
Fix velocity when stuck

See merge request veloren/veloren!453
 2019-08-21 17:42:02 +00:00
Vechro
c6b2303890 Fix wielding jump issue 2019-08-21 20:34:21 +03:00
Joshua Barretto
75107e55b5 Merge branch 'pfauenauge/plants_grass' into 'zesterer/instancing' 
Pfauenauge/plants grass

See merge request veloren/veloren!452
 2019-08-21 17:22:05 +00:00
Monty Marz
fade04d44e Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Vechro
c40e15f070 Fix velocity when stuck 2019-08-21 20:17:19 +03:00
Joshua Barretto
55350d8f5f Better wind waving, improved sun ambiance 2019-08-21 17:03:03 +01:00
Joshua Barretto
0fcb3a174d Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
Joshua Barretto
75e1ee3cd7 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
Joshua Yanovski
8c644e2bb1 Distribution "fun." 2019-08-20 22:48:22 +02:00
Joshua Barretto
590ce1a987 Fixed sprite mesh offsets 2019-08-20 16:54:12 +01:00
Joshua Barretto
6a0be5dc35 Better sunset colours, stars no longer reflect in water 2019-08-20 16:26:12 +01:00
Joshua Barretto
60544531dd More grass 2019-08-20 12:06:41 +01:00
Joshua Barretto
4ed21a2e59 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00
Joshua Barretto
245c9af2e8 Patchier plants, wind swaying 2019-08-20 11:05:01 +01:00
Demonic
74c3eef352 Update flowers.vox 
made sunflowers smaller
 2019-08-19 20:09:48 -04:00
Joshua Barretto
29ea5ba20b Switched to singular flower 2019-08-20 00:53:22 +01:00
Demonic
886a289ab3 Seperated Flowers 2019-08-19 19:44:44 -04:00
Joshua Barretto
5f09ab3a4f Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7960e6ea6d Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
b31cca4bb3 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Joshua Yanovski
405f55d725 Smoother blending into sand. 2019-08-19 19:46:47 +02:00
Joshua Barretto
6f35786b84 Added Instances construct 2019-08-19 18:23:47 +01:00
Joshua Yanovski
97eaeddd78 t merge Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 19:21:05 +02:00
Joshua Yanovski
5919f63516 Fixing visual issues. 2019-08-19 19:20:54 +02:00
Joshua Barretto
e2082088c8 Added sprite pipeline 2019-08-19 18:01:23 +01:00
Joshua Barretto
08e982fa7c Merge branch 'xacrimon/lotsafixes' into 'master' 
Eliminated unsafe and disabled it with lint levels.

See merge request veloren/veloren!449
 2019-08-19 13:25:55 +00:00
Acrimon
a41cf1a83d Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
Acrimon
d0f10115f4 Eliminated unsafe. 2019-08-19 14:33:31 +02:00
Joshua Yanovski
50c90e1cde Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 11:04:09 +02:00
Marcel
9c3bc88598 Merge branch 'console-spam-hot-fix' into 'master' 
Fix low fps

See merge request veloren/veloren!448
 2019-08-19 08:03:20 +00:00
Monty Marz
7168850f05 Fix low fps 2019-08-19 08:03:19 +00:00
Joshua Yanovski
fa35f9932e Smoothed some things out. 2019-08-19 05:22:39 +02:00
Joshua Yanovski
1c9be67516 Billow tweaks. 2019-08-19 03:41:32 +02:00
Joshua Yanovski
c5ffb232d4 Fixing some colors. 2019-08-19 03:01:11 +02:00
Joshua Yanovski
d8c864cf3a Making jungles work. 2019-08-19 01:52:26 +02:00
Joshua Barretto
61d6113822 Merge branch 'pfauenauge/ui-additions' into 'master' 
Hotbar rework

See merge request veloren/veloren!438
 2019-08-18 18:07:21 +00:00
Monty Marz
29f6186139 hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
Joshua Yanovski
680b81a5e6 WIP for humidity. 2019-08-18 18:35:27 +02:00