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

4065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Märtens
697e845468 first implementation of connect and tcp using a mio worker protocol and: 
- introduce a loadtest, for tcp messages
 - cleanup api
 - added a unittest
 - prepared a handshake message, which will in next commits get removed again
 - experimental mio worker merges
 - using uuid for participant id
 2020-06-09 01:22:35 +02:00
Marcel Märtens
833e5955dc initial implementation of a network api 2020-06-09 01:22:32 +02:00
Joshua Barretto
b8b8411d48 Merge branch 'yusdacra/update-turkish-translation' into 'master' 
Add missing strings, fix a few translations

See merge request veloren/veloren!931
 2020-06-08 21:47:32 +00:00
Yusuf Bera Ertan
f1dab26f67 Add missing strings, fix a few translations 2020-06-08 21:47:30 +00:00
Joshua Barretto
3e2dcf417e Merge branch 'yusdacra/fix-nixshell' into 'master' 
Fix nix-shell build issues

See merge request veloren/veloren!968
 2020-06-08 21:26:35 +00:00
Yusuf Bera Ertan
6bcf5e01d7
make nix-build and nix-shell work, simplify default.nix, expose more options 2020-06-09 00:12:25 +03:00
Marcel
f1adb4dd2e Merge branch 'xvar/clippy-fixes' into 'master' 
Initial clippy fixes as discussed in #587

See merge request veloren/veloren!1054
 2020-06-08 21:10:12 +00:00
Ben Wallis
c1c0ef5904 Initial clippy fixes as discussed in #587 2020-06-08 21:27:51 +01:00
Joshua Barretto
31ffafd3a2 Merge branch 'shandley/replace-audio-files' into 'master' 
Replace audio files

See merge request veloren/veloren!1052
 2020-06-08 16:26:48 +00:00
S Handley
c7c336e588 Replace audio files 2020-06-08 16:26:48 +00:00
Joshua Barretto
bd09d88e3d Merge branch 'shandley/attack-sfx' into 'master' 
Attack sfx

See merge request veloren/veloren!927
 2020-06-08 15:37:23 +00:00
Shane Handley
4714f8ddc7 Docs, make adding event mappers easier for sfx, remove placeholder 
sounds.
 2020-06-09 00:41:46 +10:00
Shane Handley
673f6a4b17 Post-rebase fix. 2020-06-08 10:19:42 +10:00
Shane Handley
337c277a6b Handle TripleStrike stages individually. 2020-06-08 10:19:42 +10:00
Shane Handley
afc6d2ab13 Fix some updated weapon references and an incomplete match after rebasing. 2020-06-08 10:19:42 +10:00
Shane Handley
016ebc7f71 Introduce a ToolCategory so we can ignore the specific type of weapon 
when deciding on the SFX to play when wielding/attacking.
 2020-06-08 10:19:42 +10:00
Shane Handley
97e8a96586 Target the specific attack types, to handle TripeStrike etc... 
Removed the Axe sfx until the animations show the swing
 2020-06-08 10:19:41 +10:00
Shane Handley
b543a9855a Add swoosh sounds for additional weapons. 2020-06-08 10:19:41 +10:00
Shane Handley
b131ba5b06 Add initial attack sfx code with bow shot sounds. 2020-06-08 10:19:41 +10:00
Songtronix
21f9f4a329 Merge branch 'xvar/fix-audio-device-crashes' into 'master' 
Fix #322 - Refactored audio output device enumeration to fail gracefully when...

Closes #322

See merge request veloren/veloren!1049
 2020-06-07 16:19:59 +00:00
Ben Wallis
f5ff14207b Fix #322 - Refactored audio output device enumeration to fail gracefully when audio devices with null or otherwise unusable names are encountered 2020-06-07 16:24:22 +01:00
Songtronix
1dce1106c7 Merge branch 'shandley/db-locking-mitigation' into 'master' 
DB Locking mitigations

See merge request veloren/veloren!1047
 2020-06-07 12:53:42 +00:00
Shane Handley
bfb3ba113e Enable WAL and busy_timeout for each sqlite connection to mitigate db locks, 2020-06-07 22:33:48 +10:00
Imbris
368983190e Merge branch 'imbris/fix-multibyte-whitspace-panic' into 'master' 
Fix panic with multibyte whitespace characters

Closes #583

See merge request veloren/veloren!1045
 2020-06-06 20:17:11 +00:00
Monty Marz
90a65a9d4d Merge branch 'averylostnomad/auto-walk' into 'master' 
Add simple auto walk functionality. Toggleable or push to hold

Closes #582

See merge request veloren/veloren!1044
 2020-06-06 20:12:24 +00:00
Imbris
212368aa89 Fix panic with multibyte whitespace characters 2020-06-06 15:58:16 -04:00
Pfauenauge90
5b57910575 Added spanish translation file 2020-06-06 21:46:53 +02:00
Pfauenauge90
d43ae06e00 update default keybindings file, en.ron, de_DE.ron 2020-06-06 21:29:35 +02:00
Joey Maher
7051720d12 Adds simple auto walk functionality. Toggleable or push to hold 2020-06-06 13:09:01 -05:00
Songtronix
a3ff3da528 Merge branch 'averylostnomad/stop-lantern-glow-on-drop' into 'master' 
Remove lantern glow when a lit lantern is thrown out of inventory

Closes #581

See merge request veloren/veloren!1042
 2020-06-06 12:54:58 +00:00
Joey Maher
4dfea1da5b Toggle_lantern after dropping a Lantern slot item 2020-06-06 07:37:43 -05:00
Imbris
881f104670 Merge branch 'averylostnomad/show-screenshot-location' into 'master' 
Show screenshot location in the ingame chat

Closes #560

See merge request veloren/veloren!1041
 2020-06-05 21:50:24 +00:00
Joey Maher
9554b23b16 Renaming and adding comments 2020-06-05 16:33:39 -05:00
Joey Maher
98509ce929 Moving to a single crossbeam channel as a detail of Window, using strings instead of ClientEvent, and formatting 2020-06-05 15:53:15 -05:00
Joey Maher
fb75587f2d Add channel to send messages up from methods like fetch_events to hud 2020-06-05 14:27:22 -05:00
Monty Marz
33ca76a52f Merge branch 'shandley/persistence-loadouts' into 'master' 
Loadout persistence

Closes #570

See merge request veloren/veloren!1035
 2020-06-04 11:44:33 +00:00
S Handley
45949e7577 Update CHANGELOG and a TODO, fix safer deserialisation for inventory 
data.
 2020-06-04 11:44:33 +00:00
Justin Shipsey
418ead25b3 Merge branch 'shoulderhotfix' into 'master' 
fix shoulders in charselect

See merge request veloren/veloren!1039
 2020-06-04 06:49:54 +00:00
jshipsey
b172752abc fix shoulders in charselect 2020-06-04 02:14:03 -04:00
Monty Marz
092a0e2ec5 Merge branch 'pfau/update_german_translation' into 'master' 
update german translation

See merge request veloren/veloren!1038
 2020-06-03 19:32:55 +00:00
Monty Marz
507e0c4d00 update german translation 2020-06-03 19:32:54 +00:00
Monty Marz
eff2a39b19 Merge branch 'new-weapon-drops' into 'master' 
More item drops

See merge request veloren/veloren!1036
 2020-06-03 17:59:09 +00:00
Monty Marz
2ff1edae28 More item drops 2020-06-03 17:59:09 +00:00
Marcel
6e153af22b Merge branch 'songtronix/always-run-coverage' into 'master' 
change(ci): run coverage on branch and master

See merge request veloren/veloren!1037
 2020-06-03 09:50:46 +00:00
Songtronix
4a567deb2d change(ci): run coverage on branch and master 2020-06-03 10:31:05 +02:00
Imbris
e6fb017e9c Merge branch 'shandley/persistence-inventory' into 'master' 
Inventory Persistence

Closes #550

See merge request veloren/veloren!1020
 2020-06-01 21:34:53 +00:00
S Handley
d0f03fcff4 Make the persistence system code more generic so that it handles all 
data associated with a character, rather than individually as we were
planning to do with stats/inv/etc... This removes potential for DB locking when we deal with each individually, and we
should have plenty of room for additional writes within the transaction.
 2020-06-01 21:34:52 +00:00
Joshua Barretto
38ed85ab38 Merge branch 'zesterer/small-fixes' into 'master' 
Better physics comments, removed camera snapping

See merge request veloren/veloren!1034
 2020-06-01 20:50:24 +00:00
Joshua Barretto
6365015cd1 Better physics comments, removed camera snapping 2020-06-01 21:33:20 +01:00
Monty Marz
83b226068e Merge branch 'scott-c/improve-chat-aliases' into 'master' 
fix #562 Confusing chat alias

Closes #562

See merge request veloren/veloren!1006
 2020-06-01 16:26:22 +00:00