Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,565 Commits 151 Branches 18 Tags
Commit Graph

9565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Imbris
d3c8dc268e 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
330c743305 Fix typo in log message and remove prefixed '_' from a few used variables 2021-07-30 22:10:12 -04:00
Snowram
49461554e5 Retry release jobs on failure 2021-07-31 00:09:54 +02:00
Thomas Kosel
04efa90fcf
improving code quality by removing superfluous & 2021-07-30 10:12:20 +02:00
Imbris
ecf9153dff 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
9d761d5096 Make admin add/remove command arguments positional again 2021-07-30 01:25:38 -04:00
Imbris
a09f3a0532 Add feature to profile memory allocation with Tracy 2021-07-30 01:06:57 -04:00
Monty Marz
7b4c9bc2bb 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
2466cad155 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Thomas Kosel
354fa7d00b
changing <Sys> to Self to be a little more speaking and less riddles. 2021-07-29 23:14:46 +02:00
Marcel
cc337af764 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
8cd690f644
renaming methods to match the names of the methods called within 2021-07-29 22:55:58 +02:00
Thomas Kosel
c51e9a6880
moving CharacterState interpreting methods to character_state.rs 2021-07-29 22:38:20 +02:00
Marcel Märtens
91a5e18fb2 mark missing files as untranslated 2021-07-29 22:18:47 +02:00