f7d6f76a04
Added 36 Swords
...
I added 36 sword models to the code.
2020-05-29 18:23:00 +00:00
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
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
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
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
7963cfeade
fix(ci): avoid running redundant jobs on master
2020-05-28 20:22:49 +02:00
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
7fa71c2562
fix(ci): adjust release trigger + make sure pipelines always run
2020-05-28 18:44:31 +02:00
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
72e90d5376
speech bubble changelog
2020-05-27 13:50:50 +02:00
d5216cc8f3
Redraw dark mode bubbles. Add padding to light mode bubbles.
2020-05-27 13:49:19 +02:00
78a06550d0
Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame
2020-05-27 13:49:18 +02:00
3cea76b82f
NPCs now call for help when you hit them. Redraw speech bubble dark mode.
2020-05-27 13:49:18 +02:00
3c07d02218
Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble'
2020-05-27 13:49:17 +02:00
c65967ccdb
Chatting now creates speech bubbles
2020-05-27 13:49:14 +02:00
73a29b339c
Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget
2020-05-27 13:49:13 +02:00
3e698d5b32
Merge branch 'slipped/animstuff' into 'master'
...
orientation animation
See merge request veloren/veloren!1016
2020-05-27 06:41:55 +00:00
ea07d744a7
orientation animation
2020-05-27 06:41:55 +00:00
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
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
bb80bb256a
fix(ci): create artifacts on merge to master
2020-05-27 07:12:54 +02:00
cba403df36
Closes #450 : Send update chat message to all clients on successful alias change.
2020-05-26 22:00:47 -07:00
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
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
c1af72d5b8
Update help.png
2020-05-25 15:45:05 +01:00
ec2ed4da2c
Change a bunch of settings defaults, fix sprite looting key
2020-05-25 15:44:27 +01:00
2a83e91242
Waypoint notifications have a 10 second cooldown
2020-05-25 02:56:31 -04:00
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
26ee5e85cc
fix(ci): run pipeline for branches and tags
2020-05-24 12:26:15 +02:00
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
f71b317589
change(ci): adjust docs + fix release template
2020-05-23 10:02:39 +02:00
5b7f93e14e
change(ci): trigger CI if changes were made to it
2020-05-22 18:13:58 +02:00
e8ba1b9767
fix(ci): make release branches work
2020-05-22 18:13:58 +02:00
69c65808dd
add(ci): optional macos build
2020-05-22 18:13:58 +02:00
507086fac6
change(ci): centralise master/tag push check
2020-05-22 18:13:58 +02:00
ce7eced0b3
change(ci): centralise recompile check
2020-05-22 18:13:58 +02:00
93db252df6
change(ci): only run jobs if necessary
2020-05-22 18:13:57 +02:00
b6135f60ed
change(ci): document and add retries + fmt
2020-05-22 18:13:57 +02:00
07d7d17182
change(ci): take advantage of auto cancel pending pipelines
2020-05-22 18:13:57 +02:00
7e58f80f11
change(ci): remove unused github workflow
2020-05-22 18:13:57 +02:00
b6de531e76
change(ci): split up stages into separate files
2020-05-22 18:13:57 +02:00
1fc613d137
remove code owners as it's not being used
2020-05-22 18:13:57 +02:00
556c69de88
add issue template for bugs
2020-05-22 18:13:57 +02:00
49d4141f0e
Merge branch 'angelonfira/update-license' into 'master'
...
Update Veloren license year
See merge request veloren/veloren!1011
2020-05-22 13:02:03 +00:00
d9e0c774c2
Update Veloren license year
2020-05-22 08:05:10 -04:00
731fd4bcbc
Merge branch 'treeco/no-seed-skip' into 'master'
...
Changed SEED_SKIP to 0
See merge request veloren/veloren!1010
2020-05-22 00:01:21 +00:00
4c41cc1050
Changed SEED_SKIP to 0
2020-05-21 21:59:59 +01:00
2f89b863e0
Merge branch 'treeco/new-map' into 'master'
...
Changed default map and seed, lowered site counts
See merge request veloren/veloren!992
2020-05-21 20:46:54 +00:00
34427373ef
Make civsim and sites deterministic.
...
For anything in worldgen where you use a HashMap, *please* think
carefully about which hasher you are going to use! This is
especially true if (for some reason) you are depending on hashmap
iteration order remaining stable for some aspect of worldgen.
2020-05-21 21:43:54 +02:00
cdee191dd6
Merge branch 'aeronic/forest-tune' into 'master'
...
Aeronic/forest tune
See merge request veloren/veloren!1008
2020-05-21 04:09:59 +00:00
