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
|
b8716e03a6
|
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
|
5012e2ba8b
|
rename hud_settings to settings
|
2021-08-01 13:47:03 +02:00 |
|
Marcel
|
a79040d8f6
|
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
|
400734cc0a
|
Fix gliderwield downhill run jitter
|
2021-08-01 11:20:46 +00: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
|
c445b0937a
|
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
|
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 |
|
Joshua Barretto
|
9426f72916
|
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
|
da691cbf60
|
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
|
91ea29f108
|
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
|
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
|
7acca36629
|
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
|
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 |
|
Marcel
|
e1dad0d997
|
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 |
|
Imbris
|
3ddbb0a5fb
|
Merge branch 'mohs/refactoring_character_behavior' into 'master'
reducing complexity of character_behavior's run method by extracting logical pieces.
See merge request veloren/veloren!2697
|
2021-07-31 02:47:55 +00:00 |
|
Imbris
|
119c72f5d8
|
Fix typo in log message and remove prefixed '_' from a few used variables
|
2021-07-30 22:10:12 -04:00 |
|
Snowram
|
a3851c9214
|
Retry release jobs on failure
|
2021-07-31 00:09:54 +02:00 |
|
Thomas Kosel
|
2bf8a8c55c
|
improving code quality by removing superfluous &
|
2021-07-30 10:12:20 +02:00 |
|
Imbris
|
091dae07a4
|
Merge branch 'imbris/admin-cmd' into 'master'
Make admin adding/removing command arguments positional again
See merge request veloren/veloren!2700
|
2021-07-30 06:05:29 +00:00 |
|
Imbris
|
172bddf731
|
Make admin add/remove command arguments positional again
|
2021-07-30 01:25:38 -04:00 |
|
Imbris
|
c4ec279121
|
Add feature to profile memory allocation with Tracy
|
2021-07-30 01:06:57 -04:00 |
|
Monty Marz
|
8827d40660
|
Merge branch 'pfau/dualwield_starters' into 'master'
Remove sceptre, add swords
See merge request veloren/veloren!2692
|
2021-07-29 22:38:36 +00:00 |
|
Monty Marz
|
14eb0f9aa2
|
Remove sceptre, add swords
|
2021-07-29 22:38:35 +00:00 |
|
Thomas Kosel
|
3735688e4c
|
changing <Sys> to Self to be a little more speaking and less riddles.
|
2021-07-29 23:14:46 +02:00 |
|
Marcel
|
c98fd2f27a
|
Merge branch 'dystopia/translation_database' into 'master'
redo i18n git analysis completly and introduce a way to export csv data
See merge request veloren/veloren!2689
|
2021-07-29 21:04:18 +00:00 |
|
Thomas Kosel
|
005c33bb28
|
renaming methods to match the names of the methods called within
|
2021-07-29 22:55:58 +02:00 |
|
Thomas Kosel
|
0b07b14093
|
moving CharacterState interpreting methods to character_state.rs
|
2021-07-29 22:38:20 +02:00 |
|
Marcel Märtens
|
c234f1d926
|
mark missing files as untranslated
|
2021-07-29 22:18:47 +02:00 |
|
Marcel Märtens
|
4c0b74150d
|
remove some reexports
|
2021-07-29 22:18:34 +02:00 |
|
Imbris
|
20e7ec0423
|
Merge branch 'mix-mountable-pets' into 'master'
Prevented mountable pets
See merge request veloren/veloren!2698
|
2021-07-29 19:41:09 +00:00 |
|
Joshua Barretto
|
aa3ede79c1
|
Prevented mountable pets
|
2021-07-29 19:04:07 +00:00 |
|
Marcel Märtens
|
c3aa4c54a9
|
extract path logic
|
2021-07-29 20:15:23 +02:00 |
|
Marcel Märtens
|
bdda5ccd72
|
redo i18n git analysis completly and introduce a way to export csv data
also improve the performance by caching git_graph_descendant
|
2021-07-29 20:15:14 +02:00 |
|
Marcel Märtens
|
a5696e83a9
|
experiment with a git cache
|
2021-07-29 20:12:30 +02:00 |
|
Dr. Dystopia
|
c501b2eb70
|
base framework to print csv
|
2021-07-29 20:12:18 +02:00 |
|
Marcel Märtens
|
c9c32eea65
|
add a argument for i18n to enable csv generation
|
2021-07-29 20:12:13 +02:00 |
|
Imbris
|
c8db3e3d95
|
Merge branch 'capucho/shadow-uniformity' into 'master'
Fix non uniform control flow in shader
See merge request veloren/veloren!2696
|
2021-07-29 18:10:01 +00:00 |
|
Thomas Kosel
|
93045ba1ee
|
reducing complexity of character_behavior's run method by extracting logical pieces.
|
2021-07-29 20:09:31 +02:00 |
|
Imbris
|
6b54bedcd0
|
Merge branch 'imbris/1002-fix' into 'master'
Add comment to physics and replace magic number in climbing boost with a named...
Closes #1002
See merge request veloren/veloren!2694
|
2021-07-29 17:46:14 +00:00 |
|
João Capucho
|
c56ecee988
|
Fix non uniform control flow in shader
|
2021-07-29 18:05:27 +01:00 |
|
Imbris
|
9fb6b84670
|
Merge branch 'juliancoffee/hud_refactor' into 'master'
Skillbar hud refactoring (+ shortened key names)
See merge request veloren/veloren!2663
|
2021-07-29 16:08:56 +00:00 |
|