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
12,168 Commits 151 Branches 18 Tags 2.1 GiB
258feee634
Commit Graph

12168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DaforLynx
258feee634 Fix crash when Gap Between Songs is set to 0.0; changed name to Music Spacing 2022-08-11 02:56:40 +00:00
Joshua Barretto
099ed62a69 Merge branch 'isse/town-music-fix' into 'master' 
Add town music to cliff towns and desert cities

See merge request veloren/veloren!3524
 2022-08-10 10:15:44 +00:00
IsseW
0cd4d71d00 Add town music to cliff towns and desert cities 2022-08-10 11:03:22 +02:00
Marcel
c2847bbbf2 Merge branch 'juliancoffee/boost-skills-ui' into 'master' 
Force no digits after dot printing for boosts

See merge request veloren/veloren!3523
 2022-08-09 22:29:20 +00:00
Marcel
877b4b06d7 Merge branch 'isse/spectate' into 'master' 
Spectate mode

Closes #1379

See merge request veloren/veloren!3457
 2022-08-09 22:09:59 +00:00
juliancoffee
02c78c28f4 Force no digits after dot printing for boosts 2022-08-10 01:06:17 +03:00
IsseW
e236807559 Add to changelog 2022-08-09 19:25:48 +02:00
IsseW
87821d5c1d force update counter 2022-08-09 19:22:09 +02:00
IsseW
a165bc09bc character viewpoint 2022-08-09 18:45:45 +02:00
IsseW
bf44ebd12b spectate speedup key 2022-08-09 18:44:10 +02:00
Isse
0471e78f41 spectate mode :D 2022-08-09 18:43:13 +02:00
Ben Wallis
cc6a4c92f5 Merge branch 'juliancoffee/hud-tutorial-click-fix' into 'master' 
Fix tutorial key i18n

See merge request veloren/veloren!3520
 2022-08-09 16:16:08 +00:00
juliancoffee
56dc490903 Fix tutorial key i18n 2022-08-09 18:31:46 +03:00
Isse
b384391ff4 Merge branch 'juliancoffee/fix_death_message_buff' into 'master' 
Fix died_of_buff typo bug

See merge request veloren/veloren!3519
 2022-08-09 12:56:39 +00:00
juliancoffee
fe1ea00246 Fix died_of_buff typo bug 2022-08-09 14:40:26 +03:00
Marcel
06d827af11 Merge branch 'lokicalmito/added_romanian_translation' into 'master' 
Added Romanian translation

See merge request veloren/veloren!3516
 2022-08-08 20:22:03 +00:00
loki
a559645679 deleted .zip folder 2022-08-08 19:03:20 +03:00
loki
5d914c4577 changed folder to new format 2022-08-08 19:01:34 +03:00
loki
88b412f4c7 added romanian translation 2022-08-08 18:26:17 +03:00
Samuel Keiffer
8602a04e71 Merge branch 'floppy-DesertCity' into 'master' 
DesertCity

See merge request veloren/veloren!3495
 2022-08-08 09:58:19 +00:00
flo
5dd9991311 DesertCity 2022-08-08 09:58:18 +00:00
Marcel
5258668166 Merge branch 'imbris/ecs-storage-switch' into 'master' 
Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage

Closes #1559

See merge request veloren/veloren!3515
 2022-08-08 06:28:31 +00:00
Imbris
d5b59c2bb7 Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage 2022-08-08 00:38:20 -04:00
Samuel Keiffer
1066553f21 Merge branch 'juliancoffee/fluent-i18n' into 'master' 
Use Fluent for localisation (l10n) and internationalisation (i18n)

See merge request veloren/veloren!3508
 2022-08-07 18:21:31 +00:00
Marcel
f35608ac21 Merge branch 'kilpkonn/zoom_cap' into 'master' 
Fix crash caused by zooming out very far

Closes #1625

See merge request veloren/veloren!3514
 2022-08-07 17:50:22 +00:00
juliancoffee
38d3bdeeee Pre-merge activity 
* Add CHANGELOG
* Remove script to convert .ron files to .ftl files
 2022-08-07 20:42:33 +03:00
Tavo Annus
8a132d0726 Add zoom cap to admin to keep zoom in a sensible range 
By clamping zoom, panic due to float overflow is avoided

Regular player zoom cap is also reduced to a more sensible range
 2022-08-07 20:04:07 +03:00
juliancoffee
eed5aef1d0 fix wording 2022-08-07 18:09:30 +03:00
juliancoffee
67df7a1e74 fmt 2022-08-07 16:45:18 +03:00
juliancoffee
445b748e1a Improve ability i18n algorithm 2022-08-07 16:21:58 +03:00
juliancoffee
c10f722e25 Improve loading-tips args 2022-08-07 16:21:58 +03:00
juliancoffee
05caa2d3a8 Fix rebase error 2022-08-07 16:21:58 +03:00
juliancoffee
e22babc51b Improve error diagnostic in LocalizationHandle 2022-08-07 16:21:58 +03:00
juliancoffee
f2df1adf27 Improve documentation 2022-08-07 16:21:58 +03:00
juliancoffee
c38d94e504 Refactor try_variaton and error handling in i18n 2022-08-07 16:21:53 +03:00
juliancoffee
b5436872ed Adress review, remove redundant .into_owned 2022-08-07 13:54:58 +03:00
juliancoffee
94dbd4cb25 Respond to review, make char_slider take String 2022-08-07 13:38:36 +03:00
Marcel
4131b3ac20 Merge branch 'DaforLynx/river-hotfix' into 'master' 
Lower volume of river sfx

See merge request veloren/veloren!3510
 2022-08-06 21:29:38 +00:00
DaforLynx
9a8c288580 Lower volume of river sfx 2022-08-06 21:29:38 +00:00
juliancoffee
a994984b09 Migrate i18n files to new format 2022-08-06 21:57:08 +03:00
juliancoffee
8bdf63b3f7 Update fluent fork 2022-08-06 21:57:08 +03:00
juliancoffee
d000cc90a1 Migrate code to new i18n API 2022-08-06 21:56:01 +03:00
juliancoffee
8ba50e62d5 New i18n implementation based on Fluent 2022-08-06 21:45:23 +03:00
juliancoffee
48eeabcc93 Fix broken i18n files 2022-08-06 21:45:23 +03:00
Marcel
29fb677c8a Merge branch 'vfoulon80/interaction-in-hostile-tree' into 'master' 
Deny any interaction received during hostile_tree

See merge request veloren/veloren!3467
 2022-08-06 18:31:43 +00:00
Vincent Foulon
8862258f61 Deny any interaction received during hostile_tree 2022-08-06 18:31:42 +00:00
Marcel
0f3eb6cb3f Merge branch 'DaforLynx/music-additions' into 'master' 
WIP: New music, "now playing" line in debug overlay, and music frequency slider

See merge request veloren/veloren!3501
 2022-08-01 17:41:45 +00:00
DaforLynx
bf4a582cf7 WIP: New music, "now playing" line in debug overlay, and music frequency slider 2022-08-01 17:41:44 +00:00
Isse
d059eefcc8 Merge branch 'isse/flashing-lights-setting' into 'master' 
Add setting to disable flashing lights

Closes #1598

See merge request veloren/veloren!3475
 2022-07-31 21:53:26 +00:00
Isse
cfdc2a8ae6 Add setting to disable flashing lights 2022-07-31 21:53:25 +00:00