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,047 Commits 151 Branches 18 Tags 2.1 GiB
imbris/vox_snap
Commit Graph

4047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
1b8262caed Save surroundings to .vox 2020-06-08 02:07:11 -04:00
Songtronix
54960142e2 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
1d564f53c7 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
ea414f6921 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
24cdea0a4c Enable WAL and busy_timeout for each sqlite connection to mitigate db locks, 2020-06-07 22:33:48 +10:00
Imbris
a981d72d28 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
d8f43d3ae4 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
efe071d998 Fix panic with multibyte whitespace characters 2020-06-06 15:58:16 -04:00
Pfauenauge90
1c1d0d9ca6 Added spanish translation file 2020-06-06 21:46:53 +02:00
Pfauenauge90
de7ab9f5ed update default keybindings file, en.ron, de_DE.ron 2020-06-06 21:29:35 +02:00
Joey Maher
458ac4af5e Adds simple auto walk functionality. Toggleable or push to hold 2020-06-06 13:09:01 -05:00
Songtronix
8c68d7aace 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
25e74ee6e2 Toggle_lantern after dropping a Lantern slot item 2020-06-06 07:37:43 -05:00
Imbris
521688f1bb 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
76f7f4fd98 Renaming and adding comments 2020-06-05 16:33:39 -05:00
Joey Maher
09541af551 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
8d90952074 Add channel to send messages up from methods like fetch_events to hud 2020-06-05 14:27:22 -05:00
Monty Marz
b380143e4b 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
e0633a238e Update CHANGELOG and a TODO, fix safer deserialisation for inventory 
data.
 2020-06-04 11:44:33 +00:00
Justin Shipsey
ceee05f757 Merge branch 'shoulderhotfix' into 'master' 
fix shoulders in charselect

See merge request veloren/veloren!1039
 2020-06-04 06:49:54 +00:00
jshipsey
b0b0fca64a fix shoulders in charselect 2020-06-04 02:14:03 -04:00
Monty Marz
3cffdac6fd 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
6c0587393e update german translation 2020-06-03 19:32:54 +00:00
Monty Marz
1fcf903d83 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
b34da9b07b More item drops 2020-06-03 17:59:09 +00:00
Marcel
8f8bb8d32f 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
030f1050a4 change(ci): run coverage on branch and master 2020-06-03 10:31:05 +02:00
Imbris
f9178a268a 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
b1d191301a 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
475f62b57f 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
9a069c93dc Better physics comments, removed camera snapping 2020-06-01 21:33:20 +01:00
Monty Marz
43dc2322bf 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
scott-c
c899bdf6ab Add to changelog 2020-06-01 22:21:54 +08:00
scott-c
2d3f81b4c1 Add character info to /players command 2020-06-01 22:04:44 +08:00
scott-c
fe20da3923 send level change event for set_level command 2020-06-01 22:04:44 +08:00
scott-c
bfd97cac7e Fix build error 2020-06-01 22:04:44 +08:00
scott-c
7eb1b2c263 Add level up network event 2020-06-01 22:04:44 +08:00
scott-c
730399b5f4 Add character select network event 2020-06-01 22:04:44 +08:00
scott-c
136bf271b8 Fix social list having incorrect player count 2020-06-01 22:04:44 +08:00
scott-c
c23183b1ca Add character name and level to social window 2020-06-01 22:04:44 +08:00
scott-c
636fcafd2e Restore player alias being displayed in chat 2020-06-01 22:04:44 +08:00
scott-c
66f6368e83 Handle out of bounds panic 2020-06-01 21:56:46 +08:00
scott-c
fefd643657 Fix unused variable compiler warning 2020-06-01 21:56:46 +08:00
scott-c
288c7cdbfa fix #562 Confusing chat alias 2020-06-01 21:36:39 +08:00
Justin Shipsey
c4cd2f5283 Merge branch 'snowram/quadrupeds-tails' into 'master' 
optimization and tails

See merge request veloren/veloren!1031
 2020-06-01 00:33:24 +00:00
Justin Shipsey
3877efec50 optimization and tails 2020-06-01 00:33:24 +00:00
Imbris
df5f09de14 Merge branch 'shandley/char-deletion-fix' into 'master' 
Ensure that the player uuid and character id both match in a character deletion query

See merge request veloren/veloren!1027
 2020-05-31 22:09:51 +00:00
Shane Handley
84d0332c6d Ensure that the player uuid and character id both match in a character deletion query. 2020-06-01 02:29:05 +10:00
Marcel
8667d5a815 Merge branch 'revert-95ded477' into 'master' 
Revert "Merge branch 'xMAC94x/update-toolchain' into 'master'"

See merge request veloren/veloren!1030
 2020-05-31 16:19:02 +00:00
Marcel
5bf0634d29 Revert "Merge branch 'xMAC94x/update-toolchain' into 'master'" 
This reverts merge request !1029
 2020-05-31 15:53:33 +00:00