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,105 Commits 151 Branches 18 Tags 2.1 GiB
edc10519c6
Commit Graph

12105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joshua Barretto
6796fe2745 Better lightning attenuation 2022-07-08 23:45:08 +01:00
Joshua Barretto
4531a4e3f9 Added lightning 2022-07-08 23:26:33 +01:00
Joshua Barretto
622b67d24e Relative offset fix 2022-07-08 20:49:51 +01:00
Joshua Barretto
90d2ceab2e Fixed rain clipping issue 2022-07-08 20:40:08 +01:00
Joshua Barretto
4b738c8b8f Balanced rain intensity 2022-07-08 20:22:09 +01:00
Joshua Barretto
6c4b10d881 Use existing humidity 2022-07-08 20:18:07 +01:00
Joshua Barretto
28bc9db198 Better cloud cover 2022-07-08 18:09:13 +01:00
Joshua Barretto
853d622e19 Better fall rate 2022-07-08 16:41:31 +01:00
Joshua Barretto
23aea72466 Fixed fall rate 2022-07-08 16:09:36 +01:00
Joshua Barretto
32fe997506 Use tilted origin for rain 2022-07-08 16:07:15 +01:00
Joshua Barretto
d5c0e878d7 Adjusted depths 2022-07-08 15:09:38 +01:00
Joshua Barretto
eae917ee8f Use DDA for rain rendering 2022-07-08 14:48:59 +01:00
Christof Petig
7bd4686187 Merge branch 'DaforLynx/ambience-loop-fix' into 'master' 
Fixing ambience looping issues

See merge request veloren/veloren!3463
 2022-07-08 08:03:02 +00:00
DaforLynx
0d1bf3efe6 fmt 2022-07-07 16:10:51 -07:00
DaforLynx
fc80a6278c Fixing looping issues 2022-07-07 16:09:13 -07:00
Isse
61788c2809 Merge branch 'DaforLynx/adventurous_soul' into 'master' 
"Adventurous Soul" plays in Snowland too

See merge request veloren/veloren!3462
 2022-07-07 21:26:13 +00:00
DaforLynx
bcaa026bff "Adventurous Soul" plays in Snowland too 2022-07-07 21:26:12 +00:00
Justin Shipsey
91348cb608 Merge branch 'DaforLynx/new-music-july-2022' into 'master' 
Music, reorganization, metadata, and fixes

See merge request veloren/veloren!3456
 2022-07-07 04:14:20 +00:00
DaforLynx
00f1e9c407 Music, reorganization, metadata, and fixes 2022-07-07 04:14:20 +00:00
Isse
c0f06dcb8a Merge branch 'socksonme/fix_crushing_damage_crit' into 'master' 
Group up extra damage from crushing attacks whenever they're crits

See merge request veloren/veloren!3461
 2022-07-06 21:38:41 +00:00
Marcel
7ae65f2c13 Merge branch 'windows-gnu-linking-fix' into 'master' 
Disable mimalloc for non msvc builds

See merge request veloren/veloren!3460
 2022-07-06 20:21:25 +00:00
Marcel
317000dc48 Merge branch 'xMAC94x/update_hashbrown' into 'master' 
update hashbrown, specs

See merge request veloren/veloren!3459
 2022-07-06 20:18:11 +00:00
Socksonme
e3b1d02fce Group up extra damage from crushing attacks whenever they're crits 2022-07-06 22:59:58 +03:00
Isse
7e18384e1c Disable mimalloc for non msvc builds 2022-07-06 19:08:19 +02:00
Marcel Märtens
e4909650e1 update hashbrown, specs, and tracy 2022-07-06 15:41:59 +02:00
Marcel
58679d9900 Merge branch 'angel/remove-codegen-unit-restriction-dev-compiles' into 'master' 
Removed codegen unit restriction for dev builds

See merge request veloren/veloren!3455
 2022-07-06 07:46:34 +00:00
Marcel
5987fc83be Merge branch 'portuguese' into 'master' 
Portuguese translations parity to global

See merge request veloren/veloren!3458
 2022-07-06 07:32:44 +00:00