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
12,232 Commits 151 Branches 18 Tags 2.1 GiB
71941132ce
Commit Graph

12232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
62d2982990 Made rainbows ultra only 2022-07-15 07:08:30 +00:00
Joshua Barretto
e34f080c91 Fixed unrolling issue in rain shader 2022-07-15 07:06:11 +00:00
Marcel
dc082f64de Merge branch 'zesterer-master-patch-44077' into 'master' 
Fixed lightning point glow

See merge request veloren/veloren!3477
 2022-07-14 22:41:25 +00:00
Joshua Barretto
964b315fc5 Fixed lightning point glow 2022-07-14 22:12:34 +00:00
Marcel
0ed066bd1d Merge branch 'xMAC94x/update_cache_image' into 'master' 
update docker-ci-image to a newer version

See merge request veloren/veloren!3476
 2022-07-14 20:39:21 +00:00
Marcel Märtens
3ac8c1c833 update docker-ci-image to a newer version 2022-07-14 22:23:24 +02:00
Christof Petig
2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master' 
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list

See merge request veloren/veloren!3469
 2022-07-14 18:24:21 +00:00
Isse
5c7ed1e712 Merge branch 'vfoulon80/boat-loading-animation' into 'master' 
Add a boat loading animation

See merge request veloren/veloren!3474
 2022-07-14 07:17:30 +00:00
Treeco
68dd128b07 Merge branch 'DaforLynx/extra-stuff' into 'master' 
Music, ambience tweaks, and more

See merge request veloren/veloren!3471
 2022-07-14 00:55:35 +00:00
DaforLynx
194b1866c6 Music, ambience tweaks, and more 2022-07-14 00:55:35 +00:00
Isse
1e3b5383cf Merge branch 'zesterer/better-rain' into 'master' 
Better rain

See merge request veloren/veloren!3464
 2022-07-13 23:25:33 +00:00
Christof Petig
bb952fe755 rustfmt the last cleanup 2022-07-13 23:38:11 +02:00
Christof Petig
edfe6d887e final polish 2022-07-13 23:32:20 +02:00
Christof Petig
eab062450a clippy helped to get rid of one level of indirection 2022-07-13 23:27:17 +02:00
Christof Petig
d2aa9028ec clippy is right about this flat_map 2022-07-13 23:17:22 +02:00
Christof Petig
197f84a360 returning a vec creates much more readable code 2022-07-13 23:03:58 +02:00
Isse
4bcf7c7010 Merge branch 'isse/agent-aggro-fix' into 'master' 
Fix agent aggression when not recieving damage from attack

Closes #1597

See merge request veloren/veloren!3473
 2022-07-13 21:01:26 +00:00
Christof Petig
3bdeb77268 Full support for modular weapon in loot table read 2022-07-13 22:56:52 +02:00
Joshua Barretto
dbff8102de Updated changelog 2022-07-13 21:46:15 +01:00
Joshua Barretto
f48665366b More lightning position variety 2022-07-13 21:45:37 +01:00
Vincent Foulon
2240fa4a23
Add a boat loading animation 2022-07-13 22:41:34 +02:00
Christof Petig
a0749ac9bc test passes, not happy with implementation yet 2022-07-13 20:15:28 +02:00
Christof Petig
5bbb73bc17 changelog + remove dead code, but the test still fails 2022-07-13 20:15:28 +02:00
Christof Petig
5ee72f8a5e fix test; add tusk, crest, pincer 2022-07-13 20:15:28 +02:00
Christof Petig
8c5901516e clean up 2022-07-13 20:15:28 +02:00
Christof Petig
7a1218cf2f make a recipe of all modular weapons 2022-07-13 20:15:28 +02:00
Christof Petig
3a7835c6d0 replace one Owned reference by the normal Reference type 2022-07-13 20:15:28 +02:00
Avi Weinstock
cea2550dde Add Item::new_from_item_definition_id. 2022-07-13 20:15:28 +02:00
Christof Petig
7e5ebada2d still incomplete but looks surprisingly usable 2022-07-13 20:15:28 +02:00
Christof Petig
33a01a0dab fix compilation of example 2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403 use ItemDefintionId across trade_pricing 2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79 WIP modular weapon pricing. 2022-07-13 20:15:27 +02:00
Isse
9edfbaa29d fix agent aggression when not recieving damage from attack 2022-07-13 19:46:48 +02:00
Joshua Barretto
25c55b6a25 Better rain performance, wetness 2022-07-13 18:34:34 +01:00
Marcel
80d491f003 Merge branch 'socksonme/small_fixes' into 'master' 
Small fixes

See merge request veloren/veloren!3465
 2022-07-12 21:01:47 +00:00
Socksonme
3f0f1c423c Small fixes 2022-07-12 21:01:47 +00:00
Marcel
a0a00c70db Merge branch 'shaderc-rs-version-bump' into 'master' 
Bump shaderc version to 0.8.0

Closes #1532, #1591, and #1596

See merge request veloren/veloren!3470
 2022-07-11 10:30:15 +00:00
Awkor
6233db8682 Bump shaderc version to 0.8.0 2022-07-10 21:46:30 +02:00
Joshua Barretto
4e854a28ff Fixed occlusion bias 2022-07-10 16:56:45 +01:00
Joshua Barretto
d4906f55bc Fixed rain occlusion issues 2022-07-10 16:40:49 +01:00
Ben Wallis
e6a187ff08 Merge branch 'xvar/fix-mimalloc-windows' into 'master' 
Re-enabled mimalloc for non msvc builds

See merge request veloren/veloren!3468
 2022-07-10 15:01:58 +00:00
Ben Wallis
af04843a20 Re-enabled mimalloc for non msvc builds 2022-07-10 14:50:35 +01:00
Joshua Barretto
fc21b54f02 Better rain performance 2022-07-10 13:53:31 +01:00
Joshua Barretto
47b236b1f0 Better lightning rates, fixed shaders 2022-07-10 13:44:11 +01:00
Joshua Barretto
3b758cc7b0 Minor colour tweak 2022-07-09 02:25:24 +01:00
Joshua Barretto
85a292a854 Always take origin as lightning end point 2022-07-09 02:16:13 +01:00
Joshua Barretto
6fea7205fa Better lightning at distance 2022-07-09 02:08:55 +01:00
Joshua Barretto
836fe2b1c6 Proper lightning 2022-07-09 01:59:18 +01:00
Joshua Barretto
edc2720416 Better lightning effect 2022-07-09 00:39:18 +01:00
Joshua Barretto
6d1b46956d Better storms 2022-07-09 00:14:59 +01:00