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 |
|
Marcel
|
42634b3651
|
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
|
b978dd68f4
|
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
|
98477a4007
|
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
|
fee443ab76
|
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
|
d4005bdd0e
|
fix(ci): avoid running redundant jobs on master
|
2020-05-28 20:22:49 +02:00 |
|
Songtronix
|
ff8323ae62
|
Merge branch 'songtronix/adjust-ci' into 'master'
fix(ci): adjust release trigger + make sure pipelines always run
See merge request veloren/veloren!1021
|
2020-05-28 18:04:30 +00:00 |
|
Songtronix
|
9021648bf6
|
fix(ci): adjust release trigger + make sure pipelines always run
|
2020-05-28 18:44:31 +02:00 |
|
Monty Marz
|
189f8e71ad
|
Merge branch 'CapsizeGlimmer/chat_bubbles' into 'master'
Capsize glimmer/chat bubbles
See merge request veloren/veloren!1017
|
2020-05-27 11:52:53 +00:00 |
|
CapsizeGlimmer
|
38216b207a
|
speech bubble changelog
|
2020-05-27 13:50:50 +02:00 |
|
CapsizeGlimmer
|
09600dc9cb
|
Redraw dark mode bubbles. Add padding to light mode bubbles.
|
2020-05-27 13:49:19 +02:00 |
|
CapsizeGlimmer
|
2f38332f7d
|
Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame
|
2020-05-27 13:49:18 +02:00 |
|
CapsizeGlimmer
|
a0628c7a93
|
NPCs now call for help when you hit them. Redraw speech bubble dark mode.
|
2020-05-27 13:49:18 +02:00 |
|
CapsizeGlimmer
|
946729ea7a
|
Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble'
|
2020-05-27 13:49:17 +02:00 |
|
CapsizeGlimmer
|
f8ae27c234
|
Chatting now creates speech bubbles
|
2020-05-27 13:49:14 +02:00 |
|
CapsizeGlimmer
|
b0bae18160
|
Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget
|
2020-05-27 13:49:13 +02:00 |
|
Justin Shipsey
|
937c5a79a6
|
Merge branch 'slipped/animstuff' into 'master'
orientation animation
See merge request veloren/veloren!1016
|
2020-05-27 06:41:55 +00:00 |
|
Justin Shipsey
|
7bbbf74fc2
|
orientation animation
|
2020-05-27 06:41:55 +00:00 |
|
Songtronix
|
dc077db7e8
|
Merge branch 'songtronix/no-one-saw-this' into 'master'
fix(ci): create artifacts on merge to master
See merge request veloren/veloren!1019
|
2020-05-27 06:10:59 +00:00 |
|
Imbris
|
2d4b497370
|
Merge branch 'qrazhan/450-feedback-on-alias-change' into 'master'
Issue #450: Send update chat message to all clients on successful alias change.
Closes #450
See merge request veloren/veloren!1018
|
2020-05-27 05:33:22 +00:00 |
|
Songtronix
|
90abea5768
|
fix(ci): create artifacts on merge to master
|
2020-05-27 07:12:54 +02:00 |
|
Prashan Dharmasena
|
2fb0964b7c
|
Closes #450: Send update chat message to all clients on successful alias change.
|
2020-05-26 22:00:47 -07:00 |
|
Joshua Barretto
|
3dfef5f30f
|
Merge branch 'sharp/deterministic-civsim' into 'master'
Make civsim and sites deterministic.
See merge request veloren/veloren!1009
|
2020-05-26 19:22:48 +00:00 |
|
Treeco
|
4648516eee
|
Merge branch 'treeco/settings-defaults' into 'master'
Change a bunch of settings defaults, fix sprite looting key
See merge request veloren/veloren!1013
|
2020-05-25 16:20:39 +00:00 |
|
Pfauenauge90
|
637cda50c3
|
Update help.png
|
2020-05-25 15:45:05 +01:00 |
|
Treeco
|
1bb8a53bdf
|
Change a bunch of settings defaults, fix sprite looting key
|
2020-05-25 15:44:27 +01:00 |
|
CapsizeGlimmer
|
9e7d637c8e
|
Waypoint notifications have a 10 second cooldown
|
2020-05-25 02:56:31 -04:00 |
|
Songtronix
|
b61d2fe30b
|
Merge branch 'songtronix/fix-ci' into 'master'
fix(ci): run pipeline for branches and tags
See merge request veloren/veloren!1015
|
2020-05-24 11:19:24 +00:00 |
|
Songtronix
|
1684a22682
|
fix(ci): run pipeline for branches and tags
|
2020-05-24 12:26:15 +02:00 |
|
Songtronix
|
953522901e
|
Merge branch 'songtronix/small-meta-fixes' into 'master'
Improve current CI situation
See merge request veloren/veloren!988
|
2020-05-23 09:02:13 +00:00 |
|
Songtronix
|
8c272ddec6
|
change(ci): adjust docs + fix release template
|
2020-05-23 10:02:39 +02:00 |
|