ubruntu
bbc366e1b3
NPCs can drop nothing
2021-09-01 23:17:36 +00:00
Marcel
ad5cb064e2
Merge branch 'juliancoffee/i18n_formatting' into 'master'
...
(en) i18n cleaning
See merge request veloren/veloren!2798
2021-09-01 22:47:36 +00:00
juliancoffee
f157f8efca
(en) i18n cleaning
2021-09-01 19:38:59 +03:00
Imbris
16e2550e46
Merge branch 'capucho/naga' into 'master'
...
Replace shaderc with naga
See merge request veloren/veloren!2749
2021-08-31 22:38:17 +00:00
João Capucho
446d93dda0
Replace shaderc with naga
2021-08-31 22:53:10 +01:00
Joshua Barretto
b646aae2a4
Removed unused tree assets
2021-08-31 10:15:52 +01:00
Monty Marz
13c15b3840
fix witch hut smoke
2021-08-30 12:03:13 +02:00
Joshua Barretto
9ac5e555e6
Improved giant trees
2021-08-30 00:03:16 +01:00
Joshua Barretto
92c463b315
Smaller acacia
2021-08-29 20:38:40 +01:00
Joshua Barretto
0011e75526
More tree variety
2021-08-29 18:38:34 +01:00
Joshua Barretto
4a9641cf44
More spot detailing
2021-08-29 14:54:01 +01:00
Joshua Barretto
98f4e95111
Improved giant trees
2021-08-29 14:37:11 +01:00
Joshua Barretto
643807e5ff
Multiple color gradient options
2021-08-29 13:57:36 +01:00
Joshua Barretto
3592b5e7bb
Better spot density
2021-08-29 13:08:13 +01:00
Joshua Barretto
87f4efd65b
Added spot loot
2021-08-29 12:50:35 +01:00
Joshua Barretto
e05ca1f308
More spots
2021-08-28 16:48:34 +01:00
Monty Marz
7ced7e184e
witch lantern
2021-08-28 14:53:31 +01:00
Monty Marz
dff5bbe1ec
witch kit
2021-08-28 14:53:31 +01:00
Monty Marz
a8aaeaebec
emergency single voxel window fix
2021-08-28 14:53:30 +01:00
Monty Marz
ae6d1b7924
fixes
2021-08-28 14:53:30 +01:00
Monty Marz
b085b02ff9
fixes
2021-08-28 14:53:30 +01:00
Monty Marz
771a380e6c
witch stuff
2021-08-28 14:53:30 +01:00
Monty Marz
a22c0ab48f
lion rock
...
fixes
2021-08-28 14:53:30 +01:00
Monty Marz
c22eb19f55
More spots
2021-08-28 14:53:30 +01:00
Gemu Peachems
b0a067fc8d
Gnarling Totem
2021-08-28 14:53:30 +01:00
Monty Marz
1278020c88
dwarf grave
2021-08-28 14:53:30 +01:00
Joshua Barretto
76ba3496a1
sync
2021-08-28 14:53:30 +01:00
Joshua Barretto
8b8adcc1b8
More block particles, changes ore vein colour
2021-08-28 14:53:30 +01:00
Joshua Barretto
bbcd842208
Test spot entity spawning
2021-08-28 14:53:30 +01:00
Sam
790c3669a0
Fix mindflayer summoning minions inside pillars.
2021-08-22 12:21:24 -04:00
Marcel
738136e70f
Merge branch 'alxly/update-ru_RU' into 'master'
...
alxly/update-ru_RU: add ru_RU missed translations
See merge request veloren/veloren!2757
2021-08-17 12:18:33 +00:00
AlxlY
4b62797f03
alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity
2021-08-16 22:04:17 +02:00
juliancoffee
130ae1f429
Add ori_modifier for DashMelee and nerf it
...
* 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-16 17:27:59 +03:00
juliancoffee
e3798e5d2a
Abilitiy tweaks
...
Buff axe double_strike damage (90 -> 110 for first stage)
Decrease initial poise damage for hammer charged (20 -> 5)
2021-08-15 23:20:21 +03:00
Marcel
7158ae1936
Merge branch 'update_pt_BR_20210810' into 'master'
...
update pt_br translation 2021_08_10
See merge request veloren/veloren!2753
2021-08-13 07:17:01 +00:00
Nícolas Wildner
dc4574aa49
update pt_br translation 2021_08_10
2021-08-13 07:17:01 +00:00
AlxlY
bd26d2ad2a
alxly/update-ru_RU: updated transation after review.
2021-08-12 00:16:45 +02:00
AlxlY
b8f37f474b
alxly/update-ru_RU: fix translation based on @CodeReview comments.
2021-08-11 13:37:05 +02:00
Marcel
0bedfde53e
Merge branch 'trade-window-improvements' into 'master'
...
UI: Fixes and enhancements to the trading window
See merge request veloren/veloren!2738
2021-08-11 09:25:17 +00:00
AlxlY
d47620959b
alxly/update-ru_RU: added proper translations after review. changed indentation to spaces
2021-08-11 00:48:48 +02:00
AlxlY
18a6ff3f31
alxl/update-ru_RU: add ru_RU missed translations
2021-08-10 23:36:02 +02:00
juliancoffee
3ac74a8259
Implement /kit all and a bit of refactoring
...
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
2021-08-10 13:28:38 +03:00
Samuel Keiffer
d5feca45c5
Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master'
...
Consolidate redundant stage sections
See merge request veloren/veloren!2748
2021-08-10 01:23:26 +00:00
Sam
2103abbb76
Fixed sfx file after consolidation.
2021-08-09 20:24:04 -04:00
Snowram
dddb47a385
Makes dungeons start at level 1 visually
2021-08-09 16:36:37 +02:00
juliancoffee
172f19376a
Tweak boss knockback abilities
...
Tweak Mindflayer vortex knockback (make it rarer)
Tweak Tidal Warrior pincer and wave knockback
Tweak claygolem rocket and shockwave knockback
Tweak Yeti shockwave and strike knockback
2021-08-09 13:05:01 +03:00
juliancoffee
58cfd690c3
Complete skill preset "max" with sceptre HDuration
2021-08-09 10:09:12 +01:00
Xeriab Nabil
8e7939a921
UI: Fixes and enhancements to trading window
2021-08-08 20:11:54 +03:00
Samuel Keiffer
2b10f818f5
Merge branch 'juliancoffee/pillar_fix' into 'master'
...
Nerf pillars + Fix Beam ori
See merge request veloren/veloren!2732
2021-08-07 16:35:24 +00:00
juliancoffee
16c72b8667
Add hotkey to toggle Egui Debug
2021-08-06 22:58:36 +03:00
Xeriab Nabil
ea5de81f9b
UI: Fixes and enhancements to trading window
2021-08-06 17:11:54 +03:00
juliancoffee
8a83ecf57f
Fix Beam orientation, remove orientation_behavior
...
* make old OrientationBehavior::FromOri default behaviour
* use rotation formed from look_dir instead of constructing
ori on the fly (which is altered after normalization).
2021-08-05 21:07:46 +03:00
João Capucho
c4214fedbe
Don't use derivatives in vertex shader
2021-08-04 23:14:08 +01:00
Knightress Paladin
998c56c524
Removed extra Warlock skills and made sceptre cultists rarer
2021-08-02 16:22:40 -07:00
Knightress Paladin
38432cc880
Restructured logic for staff AI
2021-08-02 16:22:40 -07:00
Monty Marz
a1e22df944
Merge branch 'transp---opacity-in-UI' into 'master'
...
transparency -> opacity
See merge request veloren/veloren!2714
2021-08-02 21:30:37 +00:00
Monty Marz
bceed44614
transp -> opacity
2021-08-02 22:49:10 +02:00
Imbris
a1026c36f5
Make bloom intensity configurable, make whether less blurred layers are added in toggleable, hold onto copy of pipeline modes instead of returning it from pipeline creation
2021-08-01 18:50:39 -04:00
Imbris
6cabd74871
Make bloom optional with a config option that is not exposed in the UI (to give artists time to refine bloom before exposing the option)
2021-08-01 18:50:38 -04:00
Imbris
bfdee903dd
Add some of the changes from zesterer's patch including decreasing figure glow power, increasing glow of some particles, and fixing water normal normalization
2021-08-01 18:50:38 -04:00
Imbris
7da064fb23
Add ability to edit shader to enable filtering dim values for experimentation
2021-08-01 18:50:38 -04:00
Imbris
29bfee26c0
Add bloom passes in character select screen, use proper source image for bloom after clouds are applied, add blurred and less blurred stages of bloom together (experimental could remove), add filtering downsample pass that is not yet used
2021-08-01 18:50:37 -04:00
Imbris
74e01f10e3
Fixes and extra bloom
2021-08-01 18:50:37 -04:00
Imbris
2d83ef1c0e
Initial bloom impl
2021-08-01 18:50:37 -04:00
Marcel Märtens
5012e2ba8b
rename hud_settings to settings
2021-08-01 13:47:03 +02:00
Marcel Märtens
bb026ca21b
move vector map out of manifest and switch to new manifest format
2021-08-01 13:12:01 +02:00
Marcel Märtens
49072702bc
fix #1258
2021-08-01 11:20:51 +02:00
Marcel Märtens
2fd26bf41c
make folders POSIX style and move skills to hud
2021-08-01 10:56:10 +02:00
Joshua Barretto
f51c4ed860
Merge branch 'zesterer/menacing' into 'master'
...
Added menacing, made agent code less hacky
See merge request veloren/veloren!2707
2021-08-01 00:27:02 +00:00
Imbris
97e5ad02ff
Merge branch 'imbris/stamina-energy' into 'master'
...
Replace stamina with energy
Closes #1214
See merge request veloren/veloren!2704
2021-08-01 00:26:59 +00:00
João Capucho
82489782b4
Fix uniformity bug in ui shader
2021-07-31 21:34:29 +01:00
Joshua Barretto
422e1c30f4
Added menacing, made agent code less hacky
2021-07-31 20:33:28 +01:00
Monty Marz
f3d0d3f46a
fix i18n
2021-07-31 18:17:34 +02:00
Imbris
c5c8ae4d30
Replace stamina -> energy in english localization strings
2021-07-31 01:35:28 -04:00
Imbris
89eee332c9
Replace stamina -> energy in code, i18n keys, and asset names
2021-07-31 01:34:40 -04:00
Monty Marz
14eb0f9aa2
Remove sceptre, add swords
2021-07-29 22:38:35 +00:00
João Capucho
c56ecee988
Fix non uniform control flow in shader
2021-07-29 18:05:27 +01:00
Marcel
680492cea6
Merge branch 'juliancoffee/entity_refactor' into 'master'
...
Improve terms of EntityConfig and LoadoutBuilder
See merge request veloren/veloren!2688
2021-07-28 23:19:04 +00:00
juliancoffee
14ac9a8b4e
Improve terms of EntityConfig and LoadoutBuilder
...
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
2021-07-28 19:19:10 +03:00
Marcel
7ef11a41ef
Merge branch 'fungoid/add_fr_translation_for_gameinput.greet' into 'master'
...
Added fr translation for gameinput.greet
See merge request veloren/veloren!2685
2021-07-28 15:52:16 +00:00
Marcel
7a3755b7b0
Merge branch 'tygyh/Update-missing-swedish-translations' into 'master'
...
Tygyh/update missing swedish translations
See merge request veloren/veloren!2667
2021-07-27 11:14:52 +00:00
Jonathan Berglin
a564602495
Tygyh/update missing swedish translations
2021-07-27 11:14:52 +00:00
Nico Janzen
84b010f16f
Fix spelling errors in German translations
2021-07-27 11:06:22 +00:00
Alexis Maheu
9ed6abd3d7
Added fr translation for gameinput.greet
2021-07-26 20:29:30 -04:00
DanTheOne
18b5c1c35a
Add shortcut to toggle chat
2021-07-26 02:42:35 +02:00
Joshua Barretto
43ae09d2f0
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
update (uk_UA) translation
See merge request veloren/veloren!2669
2021-07-24 19:56:21 +00:00
juliancoffee
7386da743e
(uk_UA) address feedback
2021-07-24 18:34:57 +03:00
Joshua Barretto
4bfc92c65d
Changed singleplayer map for a better default experience
2021-07-24 11:56:08 +01:00
juliancoffee
2e72f5e1c2
(uk_UA) misc hud translation
2021-07-24 01:50:14 +03:00
juliancoffee
d1f9e34fc3
(uk_UA) force update
2021-07-24 01:13:50 +03:00
juliancoffee
0e3e3bef4e
(uk_UA) MEAT translation
2021-07-24 01:13:02 +03:00
juliancoffee
eb3dd0a812
(uk_UA) graphics settings translation
2021-07-24 00:26:38 +03:00
juliancoffee
70a390e1d2
(uk_UA) frozen outcome translation
2021-07-24 00:12:41 +03:00
juliancoffee
c55bcd3475
(uk_UA) gameinput.greet translation
...
Здоровенькі були
2021-07-24 00:07:26 +03:00
juliancoffee
d0b15fa042
(uk_UA) update debuff translation
2021-07-24 00:03:34 +03:00
juliancoffee
a1bc725654
(uk_UA) update mining skills translation
2021-07-23 23:07:15 +03:00
juliancoffee
226dcb9f1a
(uk_UA) update healing aura skill translation
2021-07-23 22:44:14 +03:00
juliancoffee
5516e91cfe
(uk_UA) update bow skills translation
2021-07-23 22:18:49 +03:00
Samuel Keiffer
85b9f70469
Merge branch 'knightresspaladin/fix-circle-charge' into 'master'
...
Fixed CircleCharge and buffed Rugged Hide droppers
See merge request veloren/veloren!2613
2021-07-23 14:56:36 +00:00
schnippl0r
342de16d2e
Added en and de_DE translations for gameinput.greet.
2021-07-20 21:59:18 +02:00
