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,009 Commits 151 Branches 18 Tags 2.1 GiB
136bf271b8
Commit Graph

4009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Songtronix
d7ea0cad8f 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
7fa71c2562 fix(ci): adjust release trigger + make sure pipelines always run 2020-05-28 18:44:31 +02:00
Monty Marz
2ad8172d6f 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
72e90d5376 speech bubble changelog 2020-05-27 13:50:50 +02:00
CapsizeGlimmer
d5216cc8f3 Redraw dark mode bubbles. Add padding to light mode bubbles. 2020-05-27 13:49:19 +02:00
CapsizeGlimmer
78a06550d0 Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3cea76b82f NPCs now call for help when you hit them. Redraw speech bubble dark mode. 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3c07d02218 Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
CapsizeGlimmer
c65967ccdb Chatting now creates speech bubbles 2020-05-27 13:49:14 +02:00
CapsizeGlimmer
73a29b339c Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget 2020-05-27 13:49:13 +02:00
Justin Shipsey
3e698d5b32 Merge branch 'slipped/animstuff' into 'master' 
orientation animation

See merge request veloren/veloren!1016
 2020-05-27 06:41:55 +00:00
Justin Shipsey
ea07d744a7 orientation animation 2020-05-27 06:41:55 +00:00
Songtronix
6789a95557 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
a550c5de52 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
bb80bb256a fix(ci): create artifacts on merge to master 2020-05-27 07:12:54 +02:00
Prashan Dharmasena
cba403df36 Closes #450: Send update chat message to all clients on successful alias change. 2020-05-26 22:00:47 -07:00
Joshua Barretto
786665eac4 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
e759d9a1c4 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
c1af72d5b8 Update help.png 2020-05-25 15:45:05 +01:00
Treeco
ec2ed4da2c Change a bunch of settings defaults, fix sprite looting key 2020-05-25 15:44:27 +01:00
CapsizeGlimmer
2a83e91242 Waypoint notifications have a 10 second cooldown 2020-05-25 02:56:31 -04:00
Songtronix
b849f654c5 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
26ee5e85cc fix(ci): run pipeline for branches and tags 2020-05-24 12:26:15 +02:00
Songtronix
9b0a652612 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
f71b317589 change(ci): adjust docs + fix release template 2020-05-23 10:02:39 +02:00