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
11,383 Commits 151 Branches 18 Tags 2.1 GiB
b3fd521d00
Commit Graph

2708 Commits

Author SHA1 Message Date
jshipsey
7827797106 weapon tweaks 2022-01-30 01:10:13 -05:00
Imbris
89edd18787 Dither in nonlinear srgb space and add a few dithering related things to the experimental shader options 2022-01-28 22:55:59 -05:00
Joshua Barretto
d8c4284a32 Merge branch 'zesterer/worldgen' into 'master' 
Improvements to site2

See merge request veloren/veloren!3159
 2022-01-28 17:14:07 +00:00
jshipsey
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
juliancoffee
e004fba9da Adress review 2022-01-28 00:02:34 +02:00
juliancoffee
9a2fde557c Fix rebase 2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7 Loadout Update: Use 
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
 2022-01-28 00:02:34 +02:00
juliancoffee
7585c8dcc1 Migrate EntityConfig for Loadout update 2022-01-28 00:02:34 +02:00
Joshua Barretto
56eff72670 Fixed blue snow 2022-01-27 11:04:05 +00:00
floppy
2fe8cb965d change SeaCrocodile spawn 2022-01-27 11:34:59 +01:00
Joshua Barretto
39863e8727 Remove colour banding 2022-01-27 00:29:03 +00:00
Marcel
0ebff57a59 Merge branch 'Martin/remove-server-from-list' into 'master' 
Feature: Delete button in the servers menu

See merge request veloren/veloren!3144
 2022-01-26 10:20:15 +00:00
Dominik Broński
ca7b048184 Merge branch 'SeaCrocodile' into 'master' 
Sea crocodile

See merge request veloren/veloren!3146
 2022-01-26 01:26:38 +00:00
Martin
700f709664 added delete button in the settings window which deletes a server from the list 2022-01-25 19:48:58 +02:00
floppy
ea6f09ec88 change SeaCrocodile spawn 2022-01-25 10:27:25 +01:00
DaforLynx
361fd72bd1 Added biomes to ron 2022-01-24 12:14:38 -08:00
InfRandomness
df6a0002e9 Move alpha values calculation to CPU 2022-01-24 19:24:51 +00:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Imbris
fc3da4bfce Merge branch 'imbris/sobel' into 'master' 
Add experimental sobel filter

See merge request veloren/veloren!3113
 2022-01-24 02:42:54 +00:00
Joshua Barretto
d18174e0d1 Revert "Merge branch 'infrandomness/remove_alpha' into 'master'" 
This reverts merge request !3128
 2022-01-24 00:52:03 +00:00
Imbris
6cfadc4f65 Add sobel filter as experimental shader option 2022-01-23 16:32:26 -05:00
Joshua Barretto
abda8058fe Fixed caustics 2022-01-23 16:32:26 -05:00
Joshua Barretto
a3fcd7f568 Unified and fixed attenuation 2022-01-23 16:32:26 -05:00
Joshua Barretto
b94d560a20 Fixed light extinction 2022-01-23 16:32:26 -05:00
Joshua Barretto
212392a062 Added proper refraction to water surface 2022-01-23 16:32:26 -05:00
Joshua Barretto
470353e08c Fix for translucency blocking clouds 2022-01-23 16:32:26 -05:00
Joshua Barretto
0bcc3fb135 Sprite and figure attenuation 2022-01-23 16:32:26 -05:00
Joshua Barretto
90f3f0fea0 Stopped caustics appearing in bad places 2022-01-23 16:32:26 -05:00
Joshua Barretto
38832fadd3 Improved underwater lighting on low shader settings 2022-01-23 16:32:26 -05:00
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
ubruntu
57d9283afb Show HUD for campfires 2022-01-23 16:32:25 -05:00
Joshua Barretto
bdb0fc9c16 Merge branch 'zesterer/underwater' into 'master' 
Underwater shaders

See merge request veloren/veloren!3127
 2022-01-23 20:36:47 +00:00
Joshua Barretto
a49c0f0cdf Fixed caustics 2022-01-23 20:06:44 +00:00
Joshua Barretto
8504a8ab21 Merge branch 'ubruntu/campfire-hud' into 'master' 
Show HUD for campfires

See merge request veloren/veloren!3097
 2022-01-23 19:25:11 +00:00
ubruntu
ca2a81c20f Show HUD for campfires 2022-01-23 19:25:11 +00:00
InfRandomness
69c3480fce Move alpha values calculation 2022-01-23 17:16:22 +00:00
Joshua Barretto
fb2b9929a6 Unified and fixed attenuation 2022-01-23 16:25:15 +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
824ba2beff Fixed light extinction 2022-01-21 18:21:14 +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
ubruntu
1d0c861e19 Fix chest display names 2022-01-21 18:05:39 +00:00
Joshua Barretto
9a9c32d311 Added proper refraction to water surface 2022-01-21 17:45:50 +00:00
Joshua Barretto
31b9cd0565 Fix for translucency blocking clouds 2022-01-21 17:29:59 +00:00
Joshua Barretto
d2d4ca33c9 Sprite and figure attenuation 2022-01-21 14:04:24 +00:00
Joshua Barretto
b3bf06b07d Stopped caustics appearing in bad places 2022-01-21 13:43:36 +00:00
Joshua Barretto
3b347a2aa3 Improved underwater lighting on low shader settings 2022-01-21 13:35:40 +00:00
Joshua Barretto
2263bcbf7c Use correct ray direction underwater 2022-01-21 01:24:00 +00:00
Joshua Barretto
261fdf17a2 Handle underwater sunlight and moonlight 2022-01-21 01:18:43 +00:00
Joshua Barretto
51323cde38 Better caustic movement 2022-01-21 01:06:11 +00:00
Joshua Barretto
63f6af0621 Fixed caustics 2022-01-21 01:03:39 +00:00
Joshua Barretto
c17abb93f1 Fixed shader compilation error 2022-01-21 00:50:14 +00:00
Joshua Barretto
5b606f0d50 Significantly improved underwater shaders 2022-01-21 00:42:20 +00:00
Joshua Barretto
c2644d8e71 Fixed interaction between bloom and point glow 2022-01-20 22:30:05 +00: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
Joshua Barretto
5a7cd39625 Added point glow slider 2022-01-20 13:40:11 +00: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
7506dc2a41 Added procedural LoD detail shader 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
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
Snowram
1e6ead4005 Arthropod charge 2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60 More arthropod work 2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0 Adds poisoned debuff (energy change over time) 2022-01-19 19:01:13 +01:00
Snowram
fa549eece7 Adds new arthropod species 2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539 Adds arthropod skeleton 2022-01-19 19:01:11 +01:00
Samuel Keiffer
c3e92b6c7a Merge branch 'sam/melee-constructor' into 'master' 
Melee Constructor

See merge request veloren/veloren!3111
 2022-01-19 06:36:51 +00:00
Joshua Barretto
c4706078c4 Merge branch 'zesterer/experimental-shaders' into 'master' 
Fixed minor shader issues, added curved world effect

See merge request veloren/veloren!3112
 2022-01-18 17:30:49 +00:00
Joshua Barretto
2f3b14f2e1 Improved glow lighting 2022-01-18 16:52:35 +00:00
floppy
28a7b00445 tweak biome icon 2022-01-18 09:19:55 +01:00
floppy
dcf36df781 tweak biome icon 2022-01-18 09:17:51 +01:00
roidujeu
a6a825a97f gave speed more weight, reduced equip_time_weight, etc 2022-01-18 10:48:53 +05:30
Joshua Barretto
b85aac6e23 Fixed minor shader issues, added curved world effect 2022-01-18 01:47:06 +00:00
Sam
b0644ca767 Melee attacks are now created through a melee constructor. 2022-01-17 20:41:24 -05:00
floppy
a836b61190 allow enabling/disabling biome names on map 2022-01-17 23:45:51 +01:00
Joshua Barretto
cd428d9267 Added support for experimental shaders 2022-01-17 22:20:33 +00:00
Imbris
9b85a01df6 Merge branch 'inputmeta' into 'master' 
Add Input methods to metainfo.xml

See merge request veloren/veloren!3093
 2022-01-17 18:30:28 +00:00
JakobDev
860f802afa Add Gamepad to supported controls 2022-01-17 15:09:03 +00:00
Joshua Barretto
9c565dadc5 Merge branch 'zesterer/mount-everest' into 'master' 
Mount Everest

See merge request veloren/veloren!3101
 2022-01-17 13:21:38 +00:00
Sam
31a894601f Removed health sclaing from summon character state. 2022-01-16 18:18:23 -05:00
Joshua Barretto
bde3aade2b Updated changelog, fixed incorrect hint for mineable blocks 2022-01-16 17:53:51 +00:00
Joshua Barretto
504e2a38d5 Added overhead hints, smoother mount movement 2022-01-16 17:53:14 +00:00
Sam
e662946130 Removed placeholder abilities, tweaked migration. 2022-01-15 21:49:29 -05:00
Monty Marz
6d0913bb5e visuals 2022-01-15 21:46:57 -05:00
Sam
70d6f3a854 Scroll through all aiblities in the same pages. 2022-01-15 21:46:56 -05:00
Sam
3870688717 Pages to swap between weapon abilities. 2022-01-15 21:46:55 -05:00
Monty Marz
eb0bed39e8 stats window WIP 2022-01-15 21:46:54 -05:00
Monty Marz
7515c26d68 progress 2022-01-15 21:46:54 -05:00
Sam
d86692c4fe Added in-memory persistence of ability sets per weapon kind pair. 2022-01-15 21:42:34 -05:00
Monty Marz
89bf41574c diary section buttons 2022-01-15 21:42:33 -05:00
Sam
ee5293c64e Abilities scrollable now. 2022-01-15 21:42:33 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
jshipsey
0e9d50162b last fixes 2022-01-14 00:19:32 -05:00
jshipsey
475fc1631f akhlut 2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Sam
c8f8ccdc55 Buffed spin for whatever strange reason 2022-01-12 22:18:59 -05:00
Sam
e98edbcc7a Conversion of poise damage to health damage now scales depending on the poise state the target is in. 
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
 2022-01-12 22:18:59 -05:00
Sam
d1e1de3b14 Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage. 
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
 2022-01-12 22:18:58 -05:00
Jonathan Berglin
5fcbd1e743 Update swedish translations 2022-01-10 08:45:47 +00:00
Jonathan Berglin
d3f0fa810e Update swedish translations 2022-01-09 16:37:53 +00:00
JakobDev
9909fe11a1
Add Input methods to metainfo.xml 2022-01-09 12:29:22 +01:00
Samuel Keiffer
a600d4ca94 Merge branch 'FreeFull/intel_uvec3_fix' into 'master' 
Avoid Intel graphics ivec3/uvec3 bug.

See merge request veloren/veloren!3091
 2022-01-09 01:14:48 +00:00
Dominik Broński
cc36a14407 Fixes NaN in shader code which produced black sprites visible through blocks 2022-01-09 01:03:05 +00:00
Filip Szczepański
053e28a33a Avoid Intel graphics ivec3/uvec3 bug. 2022-01-09 00:04:35 +01:00
Monty Marz
d72d926341 change merchant backpack visuals and add mining skill icons 2022-01-08 01:57:52 +01:00
unvariant
71d2be5f76 support removing key bindings 2022-01-07 20:30:30 +00:00
voxal
e546a1d1a9 Allow players to see own speech bubbles. 2022-01-05 20:06:43 -08:00
Sam
8221336587 Addressed some review. 2022-01-03 19:55:04 -05:00
DaforLynx
13e87375d6 River sounds and more 2022-01-03 22:40:31 +00:00
Dr. Dystopia
38246eefd3 Add missing 'new line' character 2022-01-01 17:56:42 +01:00
Dr. Dystopia
039f73be8f Update swedish translations 2022-01-01 15:03:58 +01:00
Dr. Dystopia
fae2fcd3f1 More swedish translations 2022-01-01 10:33:10 +01:00
Dr. Dystopia
9ea6cea7cd Update swedish translations and fix typo 2022-01-01 00:40:50 +01:00
Youssef Fahmy
9cd87b1af7 Christmas Cleanup 2021-12-30 18:58:15 +00:00
Samuel Keiffer
4d85ae4f60 Merge branch 'ubruntu/dagger-ux' into 'master' 
Dagger UX

See merge request veloren/veloren!3072
 2021-12-28 22:09:34 +00:00
ubruntu
65f9d18fb7 Dagger UX 2021-12-28 22:09:34 +00:00
flo
4e843cb0ff update german translation by dd65 2021-12-28 18:14:29 +00:00
DoctorKompot
cc6058889a deleted unused PNG files 2021-12-27 03:01:29 +02:00
DoctorKompot
22b19e40e9 updated changelog, fixed lantern colors 2021-12-27 03:01:28 +02:00
DoctorKompot
0dba858ca9 fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files 2021-12-27 03:01:26 +02:00
DoctorKompot
5a196f1684 another shot at fixing turbans 2021-12-27 03:01:25 +02:00
DoctorKompot
d312452941 changed Magic Lantern kind: to "Magic" 2021-12-27 03:01:24 +02:00
DoctorKompot
439c6a9a3e fixed cheese 2021-12-27 03:01:22 +02:00
DoctorKompot
44f6e3888b updated mortar and pestle, fixed GR and cheese rotation, fixed offsets of Pfau's turbans 2021-12-27 03:01:21 +02:00
DoctorKompot
1cc69bbca1 fixed Pfau's turbans and manually added back mod.rs files that got deleted previously 2021-12-27 03:01:19 +02:00
DoctorKompot
9eedb024fe added new cheese, glowing remains and mortar and pestle files, updated collar and mushroom curry 2021-12-27 03:01:18 +02:00
DoctorKompot
e83446811a fixed apple offset 2021-12-27 03:01:16 +02:00
DoctorKompot
bc07474f31 fixed grey and purple slots 2021-12-27 03:01:15 +02:00
DoctorKompot
ff71891821 brightened item backgrounds 2021-12-27 03:01:14 +02:00
DoctorKompot
ca93284294 updated sewing set, ice shard and sunflower tea models with the ones provided by Gemu 2021-12-27 03:01:13 +02:00
DoctorKompot
46fe40d5fc fixed ice shard, sunflower tea and sewing kit 2021-12-27 03:01:11 +02:00
DoctorKompot
1060693d16 changed the scaling and offset of some items, replaced Raptor feather, sunflower tea, ice shard and sewing set PNGs with .vox files, updated the image manifest 2021-12-27 03:01:10 +02:00
DoctorKompot
7fb9ac121e updated item models with the ones provided by Gemu, (bags and food), some leather items, and honey, then updated item_image_manifest and sprite_manifest accordingly 2021-12-27 03:01:09 +02:00
DoctorKompot
0242552492 added mushroom stick, changed apple and apple stick models, made phoenix feather legendary rarity 2021-12-27 03:01:07 +02:00