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,570 Commits 151 Branches 18 Tags 2.1 GiB
4d62b9b937
Commit Graph

9570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Knightress Paladin
e87bfae5cd Allowed staff AI to queue shockwave if occupied by animation 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
Marcel
b29e3c692e 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
ee704e171d 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
8be625c606 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
35902d45b4 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
45f94b0bce Better Agent API 2021-08-02 13:08:39 +01:00
Dr. Dystopia
e62d903041 Add 'UpdateArgs import to 'buttons' file 2021-08-02 13:33:52 +02:00
Dr. Dystopia
323e3166f5 Create 'animation' file 2021-08-02 13:27:33 +02:00
Dr. Dystopia
dffc91045e Move variables closer to usage in 'buttons' file 2021-08-02 13:27:28 +02:00
Imbris
1bb9a9e315 Merge branch 'imbris/bloom' into 'master' 
Bloom

See merge request veloren/veloren!2693
 2021-08-02 00:01:44 +00: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
147e4f00f6 Enhance bloom::NUM_SIZES docs, add TODO, remove dbgs 2021-08-01 18:50:38 -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
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