juliancoffee
bf8acca375
Introduce helper functions and deduplicate docs
2021-08-03 16:31:13 +03:00
Samuel Keiffer
1ea0ffa736
Merge branch 'knightresspaladin/mage-ai' into 'master'
...
Update Mage AI to Intelligently Use Shockwave
See merge request veloren/veloren!2664
2021-08-03 12:53:32 +00:00
Imbris
9b623838e3
Merge branch 'imbris/backend-error' into 'master'
...
Add custom error message when there are no compatible graphics backends available
See merge request veloren/veloren!2721
2021-08-03 09:07:01 +00:00
Knightress Paladin
f4bea28092
Fix up comments relating to AI logic
2021-08-02 22:38:16 -07:00
Ygor Souza
734b98c82d
Allow axe combo to reward energy without skillpoint
...
When the character does not have the Double Strike Combo skill, the
ability's stage_data only contains one element, and thus the
stage_data.len() - 1 expression would set the max_energy_regen to 0.
This change forces the multiplier to 1 in this specific case, so the axe
can still reward energy without the combo skill point, to match the
other weapons.
2021-08-03 07:10:03 +02:00
Imbris
281e2c4d5b
Add custom error message when there are no compatible graphics backends available
2021-08-03 00:00:30 -04:00
Knightress Paladin
d12df2a88b
Restyle logic in Staff AI
2021-08-02 16:22:40 -07:00
Knightress Paladin
de55aef71d
Used adjusted_by_skills to correctly calculate ability values
2021-08-02 16:22:40 -07:00
Knightress Paladin
7604c6794a
Removed extra Warlock skills and made sceptre cultists rarer
2021-08-02 16:22:40 -07:00
Knightress Paladin
6913c54ab1
Allowed staff AI to queue shockwave if occupied by animation
2021-08-02 16:22:40 -07:00
Knightress Paladin
8d88457434
Restructured logic for staff AI
2021-08-02 16:22:40 -07:00
Monty Marz
135e631734
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
79e9313f60
transp -> opacity
2021-08-02 22:49:10 +02:00
Marcel
92f484a2f6
Merge branch 'xMAC94x/csv_export' into 'master'
...
move translation check to seperate ci step
See merge request veloren/veloren!2716
2021-08-02 19:12:42 +00:00
Marcel Märtens
3717ca2b8f
move translation check to seperate ci step
...
note: TAGUUID is used to avoid sqlinjections by choosing a branch name
2021-08-02 20:11:02 +02:00
Joshua Barretto
b84b37c351
Merge branch 'zesterer/better-agent-creation' into 'master'
...
Better Agent API
See merge request veloren/veloren!2719
2021-08-02 13:59:42 +00:00
Joshua Barretto
6dcea78315
Merge branch 'tygyh/buttons-refactoring' into 'master'
...
Tygyh/buttons refactoring
See merge request veloren/veloren!2718
2021-08-02 12:37:43 +00:00
Joshua Barretto
697cf418c3
Better Agent API
2021-08-02 13:08:39 +01:00
Dr. Dystopia
f70187bfeb
Add 'UpdateArgs import to 'buttons' file
2021-08-02 13:33:52 +02:00
Dr. Dystopia
e667208a9a
Create 'animation' file
2021-08-02 13:27:33 +02:00
Dr. Dystopia
5754fea270
Move variables closer to usage in 'buttons' file
2021-08-02 13:27:28 +02:00
Imbris
7e49d07f29
Merge branch 'imbris/bloom' into 'master'
...
Bloom
See merge request veloren/veloren!2693
2021-08-02 00:01:44 +00:00
Imbris
4719f1f26d
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
48d7e31b41
Enhance bloom::NUM_SIZES docs, add TODO, remove dbgs
2021-08-01 18:50:38 -04:00
Imbris
47d8b71839
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
d8c080afde
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
088d2077a1
Add ability to edit shader to enable filtering dim values for experimentation
2021-08-01 18:50:38 -04:00
Imbris
c85b5e13cb
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
1de1f4858d
Fixes and extra bloom
2021-08-01 18:50:37 -04:00
Imbris
df171671d8
Initial bloom impl
2021-08-01 18:50:37 -04:00
Marcel
3b39ffea3a
Merge branch 'xMAC94x/advanced_i18n' into 'master'
...
xmac94x/advanced i18n
See merge request veloren/veloren!2713
2021-08-01 19:46:09 +00:00
Marcel Märtens
3a1320634d
rename hud_settings to settings
2021-08-01 13:47:03 +02:00
Marcel
b6b4fbe774
Merge branch 'lboklin/fix-gliderwield-descend-jitter' into 'master'
...
Fix gliderwield downhill run jitter
See merge request veloren/veloren!2711
2021-08-01 11:20:47 +00:00
Ludvig Böklin
0d7c0dfd50
Fix gliderwield downhill run jitter
2021-08-01 11:20:46 +00:00
Marcel Märtens
ad9ccada28
move vector map out of manifest and switch to new manifest format
2021-08-01 13:12:01 +02:00
Marcel
fd52fd3b3e
Merge branch 'xMAC94x/i18n_file_move' into 'master'
...
xMAC94x/i18n file move
Closes #1258
See merge request veloren/veloren!2710
2021-08-01 10:13:41 +00:00
Marcel Märtens
05d38559d2
fix #1258
2021-08-01 11:20:51 +02:00
Marcel Märtens
999e5130b9
make folders POSIX style and move skills to hud
2021-08-01 10:56:10 +02:00
Joshua Barretto
d74c2b47c8
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
59490b2a89
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
Joshua Barretto
548e5fffbf
Merge branch 'imbris/tracy-mem' into 'master'
...
Add small feature to profile memory allocation with Tracy
See merge request veloren/veloren!2699
2021-07-31 21:54:28 +00:00
Joshua Barretto
f311556c0b
Merge branch 'imbris/small-fix' into 'master'
...
Fix typo in log message and remove prefixed '_' from a few used variables
See merge request veloren/veloren!2703
2021-07-31 21:54:25 +00:00
Joshua Barretto
85955c15dd
Merge branch 'capucho/more-uniformity' into 'master'
...
Fix uniformity bug in ui shader
See merge request veloren/veloren!2709
2021-07-31 21:33:34 +00:00
João Capucho
74008e342a
Fix uniformity bug in ui shader
2021-07-31 21:34:29 +01:00
Joshua Barretto
243790a0df
Added menacing, made agent code less hacky
2021-07-31 20:33:28 +01:00
Monty Marz
3ea5aa4d30
Merge branch 'pfau/fix_i18n' into 'master'
...
fix i18n for shortsword in char creation
See merge request veloren/veloren!2705
2021-07-31 16:58:20 +00:00
Monty Marz
fddc2e9570
fix i18n
2021-07-31 18:17:34 +02:00
Imbris
6e3c070116
Replace stamina -> energy in english localization strings
2021-07-31 01:35:28 -04:00
Imbris
22b77a7a04
Replace stamina -> energy in code, i18n keys, and asset names
2021-07-31 01:34:40 -04:00
Marcel
f56ff6f61c
Merge branch 'snowram/retry-release-ci' into 'master'
...
Retry release jobs on failure
See merge request veloren/veloren!2702
2021-07-31 03:02:59 +00:00
