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
Nícolas Wildner
9ed713b334
Replace pt_BR.ron
2020-06-04 12:52:00 +00: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
Marcel
95ded4779e
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
e0e1bac577
update toolchain to nightly-2020-05-31
2020-05-31 13:24:10 +02:00
Songtronix
b9c1042833
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
6970f36185
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
8f01e35746
fix(ci): avoid unneeded jobs on master
2020-05-30 11:08:05 +02:00
Prashan Dharmasena
6865894f96
Closes #573 . Do not announce alias change for non-body players.
2020-05-29 18:36:52 -07:00
Monty Marz
f076a60260
Merge branch 'pfau/assets' into 'master'
...
Pfau/assets
See merge request veloren/veloren!1023
2020-05-29 18:23:00 +00:00
Monty Marz
f7d6f76a04
Added 36 Swords
...
I added 36 sword models to the code.
2020-05-29 18:23:00 +00:00
Marcel
9a328f5c32
Merge branch 'xmac94x/ci-caches' into 'master'
...
Different Jobs now have different target directorys, as `cargo` seems to have...
See merge request veloren/veloren!1024
2020-05-29 16:22:22 +00:00
Marcel Märtens
dcea5776c1
Different Jobs now have different target directorys, as cargo
seems to have some weird behavior, see more in MR25 of veloren-docker-ci:
...
https://gitlab.com/veloren/veloren-docker-ci/-/merge_requests/25
2020-05-29 15:50:23 +02:00
Monty Marz
6d1ec73b47
Merge branch '561-info-popup-for-saved-waypoints-only-appear-for-the-second-time-you-visit-one' into 'master'
...
Resolve "Info popup for saved waypoints only appear for the second time you visit one"
Closes #561
See merge request veloren/veloren!1014
2020-05-29 11:39:12 +00:00
Songtronix
a912bc9552
Merge branch 'songtronix/final-ci-fix-pls' into 'master'
...
fix(ci): avoid running redundant jobs on master
See merge request veloren/veloren!1022
2020-05-28 18:34:16 +00:00
Songtronix
7963cfeade
fix(ci): avoid running redundant jobs on master
2020-05-28 20:22:49 +02:00