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

4039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
scott-c
41be1cb39d Add to changelog 2020-06-01 22:21:54 +08:00
scott-c
b03536bf4a Add character info to /players command 2020-06-01 22:04:44 +08:00
scott-c
d6c6ad144f send level change event for set_level command 2020-06-01 22:04:44 +08:00
scott-c
07e54e9b87 Fix build error 2020-06-01 22:04:44 +08:00
scott-c
a895296e0e Add level up network event 2020-06-01 22:04:44 +08:00
scott-c
1d98a0a4ee Add character select network event 2020-06-01 22:04:44 +08:00
scott-c
fd6911eb27 Fix social list having incorrect player count 2020-06-01 22:04:44 +08:00
scott-c
7cf9967e77 Add character name and level to social window 2020-06-01 22:04:44 +08:00
scott-c
41b60d5f34 Restore player alias being displayed in chat 2020-06-01 22:04:44 +08:00
scott-c
33b342fdf6 Handle out of bounds panic 2020-06-01 21:56:46 +08:00
scott-c
035f1ce95e Fix unused variable compiler warning 2020-06-01 21:56:46 +08:00
scott-c
e9b22c890a fix #562 Confusing chat alias 2020-06-01 21:36:39 +08:00
Justin Shipsey
90140f6692 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
b3c9389268 optimization and tails 2020-06-01 00:33:24 +00:00
Imbris
16a857eab6 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
547a63d8a7 Ensure that the player uuid and character id both match in a character deletion query. 2020-06-01 02:29:05 +10:00
Marcel
99301e44eb 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
443e7684ab Revert "Merge branch 'xMAC94x/update-toolchain' into 'master'" 
This reverts merge request !1029
 2020-05-31 15:53:33 +00:00
Marcel
00914e520f Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2020-05-31`

See merge request veloren/veloren!1029
 2020-05-31 11:41:11 +00:00
Marcel Märtens
a88be160aa update toolchain to nightly-2020-05-31 2020-05-31 13:24:10 +02:00
Songtronix
bd6a0f54a3 Merge branch 'qrazhan/573-dont-announce-alias-no-body' into 'master' 
Closes #573. Do not announce alias change for non-body players.

Closes #573

See merge request veloren/veloren!1025
 2020-05-31 06:31:37 +00:00
Songtronix
4ca66be966 Merge branch 'songtronix/fix-small-ci-mistake' into 'master' 
fix(ci): avoid unneeded jobs on master

See merge request veloren/veloren!1026
 2020-05-30 09:29:23 +00:00
Songtronix
3fabc0318f fix(ci): avoid unneeded jobs on master 2020-05-30 11:08:05 +02:00
Prashan Dharmasena
1e079f5766 Closes #573. Do not announce alias change for non-body players. 2020-05-29 18:36:52 -07:00
Monty Marz
18d9a86c06 Merge branch 'pfau/assets' into 'master' 
Pfau/assets

See merge request veloren/veloren!1023
 2020-05-29 18:23:00 +00:00
Monty Marz
39df00be50 Added 36 Swords 
I added 36 sword models to the code.
 2020-05-29 18:23:00 +00:00