Marcel Märtens
1456497bd0
start working on RFC#11,
...
implement a regionmanager and basic region component as well as tests for those
this is a fist implementation and likly to change
Former-commit-id: fdb7097dc30ab1642d25a02532458bcc2811ab61
2021-08-13 10:08:21 +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
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
