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
10,767 Commits 151 Branches 18 Tags 2.1 GiB
bf214f4de4
Commit Graph

10767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
bf214f4de4 Use correct ray direction underwater 2022-01-23 16:32:26 -05:00
Joshua Barretto
5cf5693468 Handle underwater sunlight and moonlight 2022-01-23 16:32:26 -05:00
Joshua Barretto
067e98139f Better caustic movement 2022-01-23 16:32:26 -05:00
Joshua Barretto
c6a9565c0f Fixed caustics 2022-01-23 16:32:26 -05:00
Joshua Barretto
a316a780fc Fixed shader compilation error 2022-01-23 16:32:26 -05:00
Joshua Barretto
e6332c1cb5 Significantly improved underwater shaders 2022-01-23 16:32:25 -05:00
Dr. Dystopia
706a939f39 Revert parameter removal 2022-01-23 16:32:25 -05:00
Dr. Dystopia
9306dc816f Fix warnings 2022-01-23 16:32:25 -05:00
ubruntu
57d9283afb Show HUD for campfires 2022-01-23 16:32:25 -05:00
Forest Anderson
7c99f6eb5e Merge branch 'unvariant/affix_remap_button' into 'master' 
Affixed remap/clear button to top of control settings window

See merge request veloren/veloren!3119
 2022-01-23 18:40:43 +00:00
Forest Anderson
1bcda9da7b Merge branch 'maveth/skill-improvements' into 'master' 
Test for cyclic skill dependencies

See merge request veloren/veloren!3098
 2022-01-23 18:35:58 +00:00
Joshua Barretto
2644c51b39 Merge branch 'infrandomness/remove_alpha' into 'master' 
Move alpha values calculation

See merge request veloren/veloren!3128
 2022-01-23 17:16:22 +00:00
InfRandomness
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +00:00
Joshua Barretto
8a684973b4 Merge branch 'zesterer/tiny-fixes' into 'master' 
Addressing criticisms

See merge request veloren/veloren!3121
 2022-01-22 16:44:01 +00:00
Joshua Barretto
b8df17080d Merge branch 'infrandomness/waypoint_binding_customization' into 'master' 
Add waypoint binding customization code

See merge request veloren/veloren!3122
 2022-01-21 18:05:41 +00:00
InfRandomness
b33fda1e0c Add waypoint binding customization code 2022-01-21 18:05:41 +00:00
Joshua Barretto
c0e3f0abef Merge branch 'ubruntu/chest-sprite-names' into 'master' 
Fix chest display names

See merge request veloren/veloren!3125
 2022-01-21 18:05:39 +00:00
ubruntu
1d0c861e19 Fix chest display names 2022-01-21 18:05:39 +00:00
Samuel Keiffer
a00ac11e25 Merge branch 'sam/fix-possess' into 'master' 
Fix possession bug

See merge request veloren/veloren!3123
 2022-01-21 07:40:23 +00:00
Joshua Barretto
c2644d8e71 Fixed interaction between bloom and point glow 2022-01-20 22:30:05 +00:00
Joshua Barretto
9601462f6c Merge branch 'name_areas_based_on_biome' into 'master' 
fix Swamp-naming

See merge request veloren/veloren!3124
 2022-01-20 21:17:13 +00:00
floppy
d47e06baac - fix Swamp-naming 2022-01-20 21:46:51 +01:00
Sam
fe1db1e9e0 Can move around, so character state system runs 
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
 2022-01-20 15:26:35 -05:00
Joshua Barretto
4f181c936d Merge branch 'name_areas_based_on_biome' into 'master' 
name_areas_based_on_biome

See merge request veloren/veloren!3115
 2022-01-20 19:50:57 +00:00
floppy
8f0ad56d25 change algorithm for biome-naming to weigh chunks evenly 2022-01-20 20:08:59 +01:00
floppy
9f0664c73b civ/mod.rs - replace duplicate code 2022-01-20 16:17:40 +01:00
Joshua Barretto
5a7cd39625 Added point glow slider 2022-01-20 13:40:11 +00:00
Joshua Barretto
f8783487a8 Preventing gliding when mounted, allowed dancing 2022-01-20 12:53:08 +00:00
Joshua Barretto
89cd58b1ac Don't allow interaction with mounted entity 2022-01-20 11:25:53 +00:00
Justin Shipsey
edb0c87c29 Merge branch 'fix' into 'master' 
fix arthropod crash

See merge request veloren/veloren!3120
 2022-01-20 07:48:46 +00:00
jshipsey
136555dbbe fix crash 2022-01-20 02:14:49 -05:00
Imbris
2f45f08ef4 Merge branch 'zesterer/experimental-shaders' into 'master' 
Added point glow, more experimental shaders

See merge request veloren/veloren!3118
 2022-01-20 01:52:11 +00:00
ninefox
3e198c5195 Affixed remap/clear button 2022-01-19 17:43:08 -08:00
Joshua Barretto
1ccbaac314 Addressed review comments, fixed perf issue 2022-01-19 20:08:13 -05:00
Joshua Barretto
53574bb6ec Tweaked lantern offsets 2022-01-19 20:08:13 -05:00
Joshua Barretto
fcd25648fe Fixed point glow with no clouds 2022-01-19 20:08:13 -05:00
Joshua Barretto
fd4c4adae9 Fixed moving procgen LoD shader 2022-01-19 20:08:13 -05:00
Joshua Barretto
c7717c165e Updated changelog 2022-01-19 20:08:11 -05:00
Joshua Barretto
7506dc2a41 Added procedural LoD detail shader 2022-01-19 19:59:14 -05:00
Joshua Barretto
dea540222f Upped bloom default 2022-01-19 19:59:14 -05:00
Joshua Barretto
391d1f6bf4 Added point glow 2022-01-19 19:59:13 -05:00
Samuel Keiffer
7052aad11b Merge branch 'snowram/arthropods' into 'master' 
Snowram/arthropods

See merge request veloren/veloren!3071
 2022-01-20 00:20:24 +00:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
Imbris
907b1576ca Merge branch 'infrandomness/remove_utility/bomb_pile' into 'master' 
Remove bomb pile item

Closes #1184

See merge request veloren/veloren!3114
 2022-01-19 19:31:43 +00:00
InfRandomness
dabae7ece8 Remove bomb pile item 2022-01-19 19:31:43 +00:00
Snowram
f6d7ba33ef Arthropods spawns and loots 2022-01-19 19:01:16 +01:00
jshipsey
82df5f23c3 spit anim 2022-01-19 19:01:16 +01:00
jshipsey
269b1fcd00 summon an 2022-01-19 19:01:15 +01:00
Snowram
fd3ed89899 More arthropod animations 2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2 Arthropod basic attack 2022-01-19 19:01:14 +01:00