Commit Graph

2138 Commits

Author SHA1 Message Date
Joshua Barretto
7cce892cff Varying normals 2022-05-10 12:38:36 +01:00
Joshua Barretto
ac0e7a7724 Use dedicated fragment shader 2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687 Initial implementation of LoD trees 2022-05-10 12:38:36 +01:00
markobekko
8011866012 updated the italian translation 2022-05-08 21:34:10 +02:00
Joshua Barretto
30e73735de Added SpawnMode to allow for ice and water column spawning of wildlife 2022-05-08 12:37:29 +01:00
Marcel
5f149af1ee Merge branch 'aerialfiddle/be_BY' into 'master'
Belarusian translation: minor fixes

See merge request veloren/veloren!3350
2022-05-05 07:12:15 +00:00
Anton Katsuba
cca14ff4a3 Minor orthography fixes 2022-05-04 16:54:21 +03:00
Enrique AM
132fda804e Catalan language improvements 2022-05-01 23:14:25 +00:00
Clary Chevry
f78245615e FR Translation up to date 2022-04-26 17:29:09 +00:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
Marcel
ce87cdfd7e Merge branch 'aerialfiddle/be_BY' into 'master'
Added Belarusian translation, 100% complete

See merge request veloren/veloren!3330
2022-04-19 10:16:08 +00:00
Anton Katsuba
c3d4f9972d be_BY minor orthography correction 2022-04-18 22:51:33 +03:00
Anton Katsuba
9a8f405ca8 Added Belarusian translation, 100% complete 2022-04-18 00:04:54 +03:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
Vlad
f91cdfbf9f ru_RU update 2022-04-14 06:26:32 +00:00
Влад Куцепалов
51e50abb4c Update ru_RU 2022-04-10 21:05:23 +00:00
JakobDev
fbabbbb959 Add German translation to .desktop and metainfo 2022-04-05 08:11:09 +00:00
Tormod G. Hellen
cb88648cca Give NPCs random Big Five personalities. 2022-04-04 20:17:50 +02:00
flo
3d24b1d635 CliffTowns 2022-03-29 12:52:08 +00:00
jh0l
991cfcaa47 feat: 🌐 add i18n for trade amount input placeholder 2022-03-27 20:24:20 +02:00
DaforLynx
e936a27d40 Small sound fixes 2022-03-15 16:23:10 +00:00
Imbris
bcd4a81174 Merge branch 'galaipa/add-basque' into 'master'
Add initial Basque language translation

See merge request veloren/veloren!3220
2022-03-13 18:37:50 +00:00
DaforLynx
7b6f424bb0 Loud rivers 2022-03-13 07:47:23 +00:00
DaforLynx
123fee2707 Fix swim sfx, fix glider sfx, add glide sfx 2022-03-13 05:44:07 +00:00
Isidor Nielsen
a5ab36e6b5 Map marker fixes 2022-03-07 12:16:04 +00:00
DaforLynx
32434ec840 Sorry Rarnage 2022-03-04 10:36:03 -08:00
Sam
89bf529a5e Addressed review comments 2022-03-03 01:12:40 -05:00
Sam
f5e0cb0045 Addressed review comments 2022-03-03 01:11:18 -05:00
Sam
5a60562eee Addressed review comments 2022-03-03 01:11:16 -05:00
Monty Marz
855733bdcb tiny tweak 2022-03-03 01:11:09 -05:00
Sam
0542e46e7d Lighting works now hackily 2022-03-03 01:11:01 -05:00
Monty Marz
82def16969 visuals 2022-03-03 01:11:00 -05:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
Sam
f4abe4f275 More tweaks 2022-03-03 01:10:58 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Sam
5018a9f476 Game now runs, still doesn't work 2022-03-03 01:10:53 -05:00
Sam
0794f980fe Mostly snaked through another rendering pipeline 2022-03-03 01:10:47 -05:00
Imbris
4aa89fd6cc Merge branch 'unvariant/center_item_drops' into 'master'
Center item drops

See merge request veloren/veloren!3232
2022-02-27 02:07:30 +00:00
ninefox
329051c6df removed extra fields from item_drop_manifest.ron
added TODO about applying non-random rotations in load.rs
2022-02-26 10:13:04 -08:00
Imbris
08f67a335f Add experimental shader option that lowers glow strength for lights near the camera 2022-02-26 00:26:42 -05:00
Marcel
2a9f75340a Merge branch 'spanish_translation' into 'master'
apply changes from MR!2904

See merge request veloren/veloren!3224
2022-02-20 16:26:24 +00:00
Marcel
6506a97dcd Merge branch 'zesterer/enable-site2-towns' into 'master'
Enabled site2 towns by default

See merge request veloren/veloren!3206
2022-02-20 14:02:53 +00:00
Marcel
df7cd2da1a Merge branch 'isse/shared-waypoints' into 'master'
Shared and persistent waypoints

See merge request veloren/veloren!3162
2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
Marcel Märtens
e2648f6733 apply changes from MR!2904 2022-02-20 10:18:24 +01:00
Monty Marz
9ca1693ef8 New login-screen bg image 2022-02-17 16:08:37 +00:00
Treeco
90fbadbd03 Fix ember z fighting, remove ember sway 2022-02-15 23:05:20 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master'
Gnarlings

See merge request veloren/veloren!3194
2022-02-15 00:22:37 +00:00
Sam
f30e879cf5 Clippy fixes 2022-02-14 17:23:15 -05:00
Monty Marz
900fff7ba9 small UI fixes, new haste buff icon 2022-02-14 19:24:59 +01:00
Imbris
46c35f3376 Merge branch 'unvariant/render_item_drops' into 'master'
Render item drops instead of placeholder textures

See merge request veloren/veloren!3175
2022-02-14 02:09:45 +00:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
Ibrahim Beladi
17d8baa3d9 kick start Arabic language (i18n) 2022-02-13 23:44:52 +00:00
Bingen Galartza Iparragirre
d2da5c18be Add initial Basque language translation 2022-02-13 22:00:53 +01:00
Jonathan Berglin
dfb8d37a38 Update swedish translations 2022-02-13 20:39:54 +00:00
Monty Marz
c7ce2b773c new icons 2022-02-12 22:46:34 +01:00
Crow (Austin Bowers)
78ec15981d Added Dungeon Song 2022-02-12 12:38:10 +00:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
bf7e84c6ae Initial particle work 2022-02-10 14:58:37 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
jshipsey
0c788997a4 anims 2022-02-10 14:58:34 -05:00
Sam
e044bf5091 Mandragora attacks and ai 2022-02-10 14:58:32 -05:00
Sam
f1801560fa Deadwood ai 2022-02-10 14:58:31 -05:00
Sam
82c976919e Darts are now darts. 2022-02-10 14:58:29 -05:00
Joshua Barretto
6263942041 Merge branch 'slipped/site2' into 'master'
new entities, frostpines

See merge request veloren/veloren!3193
2022-02-10 01:59:20 +00:00
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -05:00
jshipsey
6f8cadc847 wall contact, run anim tweaks 2022-02-09 19:34:22 -05:00
Joshua Barretto
b2d6b06e2e Merge branch 'zesterer/bare-minimum' into 'master'
Added BareMinimum shader effect

See merge request veloren/veloren!3188
2022-02-09 23:29:17 +00:00
Joshua Barretto
e98f9aab63 Slight ambience at night 2022-02-09 22:47:58 +00:00
Joshua Barretto
17d5a9e222 Bare minimum water shaders 2022-02-09 14:41:44 +00:00
Joshua Barretto
0facac68b4 Bad fake lighting in caves 2022-02-09 13:28:07 +00:00
Joshua Barretto
8888190eb4 Added BareMinimum shader effect 2022-02-09 12:56:21 +00:00
phoenix13032005
7a1f0d9fa1 Balance update
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
2022-02-09 12:13:42 +02:00
Youssef Fahmy
4213585058 Fiesta Del Pueblo relocation 2022-02-08 07:51:31 +00:00
Crow
969f744223 added night town song 2022-02-06 18:48:12 -06:00
Zughy
d26906724c New icons in diary general combat section 2022-02-04 20:37:41 +00:00
Imbris
18f6077321 Merge branch 'imbris/srgb-dither' into 'master'
Dither in nonlinear srgb space and dithering related experimental shader options

See merge request veloren/veloren!3160
2022-02-01 21:24:50 +00:00
Justin Shipsey
612f084831 Merge branch 'slipped/bipeds' into 'master'
Slipped/bipeds

See merge request veloren/veloren!3163
2022-01-31 17:08:01 +00:00
Sam
097d6cf07c Extend green 2022-01-30 18:50:18 -05:00
Sam
0c44a7d1ab More tweaking 2022-01-30 18:37:11 -05:00
Sam
bfa9c1ce3a Fixed lifesteal particles 2022-01-30 18:11:41 -05:00
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
Joshua Barretto
56eff72670 Fixed blue snow 2022-01-27 11:04:05 +00: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
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
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
Snowram
f6d7ba33ef Arthropods spawns and loots 2022-01-19 19:01:16 +01:00
Snowram
fd3ed89899 More arthropod animations 2022-01-19 19:01:15 +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
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
Joshua Barretto
b85aac6e23 Fixed minor shader issues, added curved world effect 2022-01-18 01:47:06 +00: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
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
Monty Marz
6d0913bb5e visuals 2022-01-15 21:46:57 -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
Monty Marz
89bf41574c diary section buttons 2022-01-15 21:42:33 -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
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
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
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
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
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
DoctorKompot
84b85d6ae5 fixed coconut, added apple stick 2021-12-27 03:01:06 +02:00