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
3,084 Commits 151 Branches 18 Tags 2.1 GiB
86e15695fc
Commit Graph

3084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Shipsey
86e15695fc weapon control bone 2020-03-05 14:02:11 +00:00
Imbris
3c7a8a7ce7 Merge branch 'shandley/deselect-after-drop' into 'master' 
Deselect the inventory slot after dropping an item.

Closes #510

See merge request veloren/veloren!836
 2020-03-05 07:43:54 +00:00
Shane Handley
9d8d61736b Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00
Acrimon
7478d1a063 Merge branch 'shandley/inventory-sfx' into 'master' 
Add inventory SFX

Closes #485

See merge request veloren/veloren!810
 2020-03-04 10:09:48 +00:00
S Handley
b0ca85069b Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it. 2020-03-04 10:09:48 +00:00
Forest Anderson
e89810e0a1 Merge branch 'shandley/no-wield-sfx-rolling' into 'master' 
No wield/unwield sfx when rolling

Closes #507

See merge request veloren/veloren!830
 2020-03-01 19:45:05 +00:00
S Handley
daa0a10c2c Revert "Do that better, and add a TODO." 
This reverts commit 9b0f11bd89.

It wasn't better.
 2020-03-01 19:45:05 +00:00
Forest Anderson
0456016265 Merge branch 'tim74/add-veloren-desktop-and-appdata-files' into 'master' 
Add veloren desktop and appdata files

See merge request veloren/veloren!823
 2020-02-28 15:11:54 +00:00
Marcel
fa77646823 Merge branch 'docker-server' into 'master' 
Docker server

See merge request veloren/veloren!821
 2020-02-27 21:43:17 +00:00
Artem Polishchuk
ce7b9a84b8 Add desktop file and AppData manifest 
Fix screenshot duplicate in appdata

Move .png icon to git lfs
 2020-02-27 16:25:07 -05:00
Marcel Märtens
0cb0328c79 workaround for tests and tarpaulin 2020-02-27 22:19:51 +01:00
Marcel Märtens
bf14deb5e0 automated macos builds 2020-02-27 12:50:43 +01:00
Marcel Märtens
1fbdb9c590 auto-generated docker image for server-cli based on kaniko like i researched for torvus and correct release branch detection: 
- ade4d37575
 2020-02-26 17:08:46 +01:00
Imbris
0d189cb546 Merge branch 'kalculate/attacking-the-dead' into 'master' 
Fixing #504 - Enemies stop attacking after combat

Closes #504

See merge request veloren/veloren!820
 2020-02-26 05:35:55 +00:00
Caleb Cochran
89dd2fbaa0 Added changelog entry 2020-02-25 22:41:58 -06:00
Caleb Cochran
219f9fa3be Added missed comma 2020-02-25 22:01:51 -06:00
Caleb Cochran
8479230e66 Replaced commas (fmt issue) 2020-02-25 21:59:08 -06:00
Caleb Cochran
9f7aa61fbd Fixing #504 - Enemies stop attacking after combat 2020-02-25 20:48:09 -06:00
Justin Shipsey
21291739e5 Merge branch 'slipped/smallfixes' into 'master' 
animation housekeeping

See merge request veloren/veloren!818
 2020-02-25 06:47:56 +00:00
Justin Shipsey
5438514343 animation housekeeping 2020-02-25 06:47:56 +00:00
Imbris
6b6adb86d7 Merge branch 'shandley/small-animal-run-sfx' into 'master' 
Emit run sfx for some non-humanoids

Closes #502

See merge request veloren/veloren!814
 2020-02-23 01:26:51 +00:00
S Handley
d87061fe14 Add a volume option to SfxEvents, and use this to dispatch movement sfx for quadripeds at a volume proportionate to their size. 2020-02-23 01:26:51 +00:00
Forest Anderson
5bad014ae2 Merge branch 'shandley/level-up-command-hp' into 'master' 
Update max hp after using the set_level command

Closes #496

See merge request veloren/veloren!816
 2020-02-23 00:41:51 +00:00
Justin Shipsey
8e93bd7413 Merge branch 'juli/sfx-sword-update' into 'master' 
UpdatedSoundFX

See merge request veloren/veloren!815
 2020-02-23 00:16:15 +00:00
Shane Handley
f73b5b2fcb Update max hp and refill health when a player uses the set_level command. 2020-02-23 09:08:30 +09:00
Julian
7bc719e33f UpdatedSoundFX 
New souunds for Sword_in  and  Sword_out.
 2020-02-22 20:26:49 +01:00
Justin Shipsey
13cbef7865 Merge branch 'shandley/weapon-wield-sfx' into 'master' 
Add weapon wield/unwield sfx support

Closes #486

See merge request veloren/veloren!805
 2020-02-21 02:56:54 +00:00
S Handley
9ab2833056 Add weapon wield/unwield sfx support 2020-02-21 02:56:54 +00:00
Monty Marz
2afdebbe47 Merge branch 'pfau/hairstyles' into 'master' 
Orc hairstyles, several tiny UI fixes, fixed beard warnings

See merge request veloren/veloren!808
 2020-02-20 10:32:05 +00:00
Monty Marz
2180040f70 Orc hairstyles, several tiny UI fixes, fixed beard warnings 2020-02-20 10:32:03 +00:00
Songtronix
2d0b5d514a Merge branch 'imarv/refactor-server-events' into 'master' 
Move ServerEvents into own module

Closes #494

See merge request veloren/veloren!809
 2020-02-19 18:30:53 +00:00
Marvin Altemeier
035d74f502 Move ServerEvents into own module 2020-02-18 20:51:10 +01:00
Monty Marz
4b3d61f41d Merge branch 'pfau/fix-fonts' into 'master' 
Fix Fonts

See merge request veloren/veloren!806
 2020-02-17 16:22:49 +00:00
Monty Marz
18f46a6f83 Fix Fonts 2020-02-17 16:22:49 +00:00
Imbris
633abcb058 Merge branch 'treeco/add-gamma-setting' into 'master' 
Treeco/add gamma setting

Closes #312

See merge request veloren/veloren!797
 2020-02-17 02:01:06 +00:00
Treeco
abe47d8621 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
aaf1de9f9b Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Forest Anderson
30ec2755fe Merge branch 'ender/configurable_fonts' into 'master' 
Configurable fonts

See merge request veloren/veloren!778
 2020-02-16 17:27:33 +00:00
Joshua Barretto
1ca026f56d Merge branch 'zesterer-master-patch-73879' into 'master' 
Add a new name (to force the repo to update this file)

See merge request veloren/veloren!804
 2020-02-16 15:11:57 +00:00
Joshua Barretto
31449db578 Add a new name (to force the repo to update this file) 2020-02-16 15:11:34 +00:00
Rémy PHELIPOT
98c37d0b28 [i18n] Configurable fonts 
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
 2020-02-16 16:02:38 +01:00
Monty Marz
26f670e5c3 Merge branch 'pfau/fix-healthbars' into 'master' 
Fix healthbar background alignment

See merge request veloren/veloren!803
 2020-02-16 10:58:44 +00:00
Monty Marz
90680d5490 Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
Imbris
a08fc287ae Merge branch 'shandley/audio-channel-types' into 'master' 
Use non-spatial audio sinks for music

Closes #463

See merge request veloren/veloren!794
 2020-02-15 21:30:44 +00:00
S Handley
b739623579 Split the audio channels into SFX and music channels. This makes the 
Music Channel for exploration music a basic Sink without spatial audio
functionality, which is not required.
 2020-02-15 21:30:44 +00:00
Forest Anderson
f79b26d043 Merge branch 'angelonfira/add-ci-tarpaulin-workaround' into 'master' 
Try tarpaulin 4 times before failing

See merge request veloren/veloren!802
 2020-02-15 20:57:53 +00:00
Forest Anderson
b481d3c747 Try tarpaulin 4 times before failing 2020-02-15 20:57:52 +00:00
Songtronix
3c1121261a Merge branch 'imarv/fix-give-exp' into 'master' 
Fix /give_exp command an introduce /set_level

Closes #481 and #460

See merge request veloren/veloren!793
 2020-02-15 17:45:29 +00:00
Marvin Altemeier
a89003cbfa resolve #481 - add /set_level command 2020-02-14 22:11:41 +01:00
Marvin Altemeier
bfdfd87d89 change order of /give_exp arguments 2020-02-14 22:11:20 +01:00