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,089 Commits 151 Branches 18 Tags
Commit Graph

3089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Capucho
3a5b2c81ce Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
1a504f5a67 Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
218b75616e Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button 2020-03-05 18:38:39 +00:00
Capucho
005bca6230 Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration 2020-03-05 18:38:39 +00:00
Justin Shipsey
55fa458d12 Merge branch 'slipped/attack-anim-experiment' into 'master' 
weapon control bone

See merge request veloren/veloren!828
 2020-03-05 14:02:11 +00:00
Justin Shipsey
f8d18e4913 weapon control bone 2020-03-05 14:02:11 +00:00
Imbris
074f69cc9d 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
5b370a4f86 Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00
Acrimon
8cec151ae7 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
c7b4b94b15 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
14688d465b 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
1ae002e695 Revert "Do that better, and add a TODO." 
This reverts commit 9b0f11bd8922491bf2c2a9b4422d59982b227564.

It wasn't better.
 2020-03-01 19:45:05 +00:00
Forest Anderson
81206519bf 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
9cdf234099 Merge branch 'docker-server' into 'master' 
Docker server

See merge request veloren/veloren!821
 2020-02-27 21:43:17 +00:00
Artem Polishchuk
272d5eadcb 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
66e7c7f338 workaround for tests and tarpaulin 2020-02-27 22:19:51 +01:00
Marcel Märtens
6ba112f318 automated macos builds 2020-02-27 12:50:43 +01:00
Marcel Märtens
8ecdb53076 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
c51a224ce6 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
5795e53549 Added changelog entry 2020-02-25 22:41:58 -06:00
Caleb Cochran
4b3ca906a0 Added missed comma 2020-02-25 22:01:51 -06:00
Caleb Cochran
708ec6f8c0 Replaced commas (fmt issue) 2020-02-25 21:59:08 -06:00
Caleb Cochran
cf2c3ae856 Fixing #504 - Enemies stop attacking after combat 2020-02-25 20:48:09 -06:00
Justin Shipsey
b73b6ff0dd Merge branch 'slipped/smallfixes' into 'master' 
animation housekeeping

See merge request veloren/veloren!818
 2020-02-25 06:47:56 +00:00
Justin Shipsey
ea8744c4a1 animation housekeeping 2020-02-25 06:47:56 +00:00
Imbris
8863353ec4 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
aee89cc72f 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
ec2dbd13f3 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
f27835392f 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
b13e6d0e3b Update max hp and refill health when a player uses the set_level command. 2020-02-23 09:08:30 +09:00
Julian
03929561f7 UpdatedSoundFX 
New souunds for Sword_in  and  Sword_out.
 2020-02-22 20:26:49 +01:00
Justin Shipsey
b9391d2337 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
09a3729b5d Add weapon wield/unwield sfx support 2020-02-21 02:56:54 +00:00
Monty Marz
2eafc95dcf 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
4fc33f6c78 Orc hairstyles, several tiny UI fixes, fixed beard warnings 2020-02-20 10:32:03 +00:00
Songtronix
d6c8068e38 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
54179ba656 Move ServerEvents into own module 2020-02-18 20:51:10 +01:00
Monty Marz
6dd8dbad34 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
4aa1af5428 Fix Fonts 2020-02-17 16:22:49 +00:00
Imbris
3e4949fb95 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
952cc15b64 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
fd20ef1ecc Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Forest Anderson
74efc65693 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
430dc4a464 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
7526fd49cc Add a new name (to force the repo to update this file) 2020-02-16 15:11:34 +00:00
Rémy PHELIPOT
355a86438c [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
212ca91cdd 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
8cb963899a Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
Imbris
24fb10e423 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
63a1bcc591 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