jshipsey
f167026889
changelog
2020-08-01 02:28:57 -04:00
jshipsey
bcc257f893
cleanup, last tweaks
2020-08-01 02:19:45 -04:00
jshipsey
aa3bdc42d7
arming the cyclops
2020-08-01 02:19:45 -04:00
Snowram
1421517f84
Add frog npc, tweak pig model
2020-08-01 02:19:45 -04:00
jshipsey
487131efb8
cyclops run anim
2020-08-01 02:19:45 -04:00
Snowram
990762ba76
Bonerattler tweaks
2020-08-01 02:19:45 -04:00
jshipsey
5d2be2240e
maneater and feed anim
2020-08-01 02:19:45 -04:00
Snowram
90d7485c38
Add troll, truffler and wendigo npcs
2020-08-01 02:19:45 -04:00
jshipsey
8991b60929
catoblepas, bonerattler, rabbit, improved anims
2020-08-01 02:19:44 -04:00
jshipsey
baf67f303e
new models, anim tweaks
2020-08-01 02:19:44 -04:00
Snowram
3524d644f5
Various changes to npcs animations
...
- Improved dragon run with tilting
- New run animation for quadsmall, added tilting
2020-08-01 02:19:43 -04:00
Snowram
a0da059676
Skeleton rework with rough offsets
2020-08-01 02:19:43 -04:00
Judge Griesa
a5930e9676
-Removed some white spaces. Added some lines about tips. Fixed some sections.
2020-07-31 13:36:43 +00:00
Imbris
830fa3e9e0
Merge branch 'imbris/fix' into 'master'
...
Fix glyph too large panic
See merge request veloren/veloren!1250
2020-07-31 06:31:22 +00:00
Imbris
f589564760
Fix glyph to large panic
2020-07-31 01:13:31 -04:00
Marcel
66c7a18403
Merge branch 'xMAC94x/test_other_auth' into 'master'
...
switch to auth that doesn't use agent
See merge request veloren/veloren!1249
2020-07-30 23:44:53 +00:00
Marcel Märtens
7f97baca70
switch to auth that doesn't use agent
2020-07-31 01:05:01 +02:00
Marcel
151fd2bb8c
Merge branch 'Judge_Griesa/es_la_translation' into 'master'
...
Judge griesa/es la translation
See merge request veloren/veloren!1244
2020-07-30 10:22:10 +00:00
Marcel
0203854bd3
-Update on Latinamerican Spanish translation!
...
Some spell check and changed some words for others to have a better context.
2020-07-30 10:22:09 +00:00
Marcel
18f93bb3a0
Merge branch 'updateauth' into 'master'
...
update auth to newest version
See merge request veloren/veloren!1242
2020-07-29 17:53:22 +00:00
Marcel Märtens
0d5e61c4b6
update auth to newest version
2020-07-29 19:28:22 +02:00
Marcel
9f53a4a19f
Merge branch 'vzikl/add-zh-translation' into 'master'
...
add zh_CN support and chinese ttf fonts
See merge request veloren/veloren!1241
2020-07-29 14:35:47 +00:00
VZIKL
4d157ece01
add some chinese language
2020-07-29 21:09:19 +08:00
Marcel
b7f88b7e9f
Merge branch 'update_authc' into 'master'
...
update auth to the newest version and remove useless dep
See merge request veloren/veloren!1239
2020-07-28 23:21:13 +00:00
Marcel Märtens
96cde882ef
update auth to the newest version and remove useless dep
2020-07-29 00:05:23 +02:00
VZIKL
e56434d443
add zh_CN support and add chinese ttf fonts
2020-07-28 21:39:51 +08:00
Marcel
598f14b258
Merge branch 'yusdacra/update-tr-translation' into 'master'
...
tr_TR localization: add missing and update some keys
See merge request veloren/veloren!1229
2020-07-27 08:16:20 +00:00
Marcel
400090f897
Merge branch 'snowram/french-translation' into 'master'
...
fr_FR: Loading tips and villagers attack speech
See merge request veloren/veloren!1230
2020-07-27 08:16:14 +00:00
Imbris
ae9f4d5a53
Merge branch 'imbris/resize-fix' into 'master'
...
Fix filtering out resize events in the ui
See merge request veloren/veloren!1232
2020-07-26 23:27:53 +00:00
Imbris
ba14440a49
Fix filtering out resize events in the ui
2020-07-26 18:21:20 -04:00
Yusuf Bera Ertan
a76d2d3746
tr_TR localization: add missing and update some keys
2020-07-26 12:59:40 +03:00
Imbris
1123073bfd
Merge branch 'sam/arrow-charged-shot' into 'master'
...
Bow charged shot attack
See merge request veloren/veloren!1226
2020-07-26 03:06:53 +00:00
Samuel Keiffer
827b91d691
Bow charged shot attack
2020-07-26 03:06:53 +00:00
Imbris
9156dbadb8
Merge branch 'sam/armor-fixes' into 'master'
...
Armor fixes
See merge request veloren/veloren!1222
2020-07-25 23:57:04 +00:00
Samuel Keiffer
527e7a329e
Armor fixes
2020-07-25 23:57:04 +00:00
Imbris
c63a1d64e2
Merge branch 'imbris/fix' into 'master'
...
Make video mode selection slightly better
See merge request veloren/veloren!1227
2020-07-25 22:25:30 +00:00
Imbris
6435464d00
Make video mode selection slightly better
2020-07-25 17:07:50 -04:00
Snowram
20c2fd2c0b
Loading tips and villagers attack speech
2020-07-23 20:31:47 +02:00
Marcel
d25508e2df
Merge branch 'lausek/admin-joining' into 'master'
...
fix #660 ; Admins should join even if they aren't on whitelist
Closes #660
See merge request veloren/veloren!1219
2020-07-23 17:16:52 +00:00
lausek
f7a3a622e5
fix #660 ; Admins should join even if they aren't on whitelist
2020-07-23 17:16:52 +00:00
Monty Marz
ff178b503d
Merge branch 'hotfix_filepath' into 'master'
...
Hotfix filepath
See merge request veloren/veloren!1225
2020-07-23 14:02:22 +00:00
Monty Marz
9497d7e711
Update terrain.rs
2020-07-23 15:01:39 +02:00
Monty Marz
c903e27160
Merge branch 'pfau/loading_tips' into 'master'
...
Loading Screen tips
See merge request veloren/veloren!1224
2020-07-23 12:10:14 +00:00
Monty Marz
31cfc05123
lots of things
...
animation fixes by slipped
new cultist item
settings option for loading screen tips
loot table adjustments
2020-07-23 12:10:13 +00:00
Marcel
e912e3940f
Merge branch 'xMAC94x/netfix2' into 'master'
...
Participant closure was immeatiatly, even in case a new participant was...
See merge request veloren/veloren!1223
2020-07-23 08:39:33 +00:00
Marcel Märtens
46b4c87cf3
fixed !688
2020-07-22 09:50:26 +02:00
Marcel Märtens
dd581bc6c0
Participant closure was immeatiatly, even in case a new participant was connected, send a MSG and then dropped immeadiatly.
...
The remote site should see it connect, be open for 1 single stream and read the message before it's notified that the participant is closed actually.
This caused the faulure in one of our API tests (in lib, with client and server). Where it was possible that all messages were send and one side was dropped before the other side asked for the opened stream
Also introduce better error detection in participant(and scheduler) by removing the std_async::Result and intruduce `Result<(),ParticipantError>` instead
2020-07-22 09:18:15 +02:00
Justin Shipsey
24f968d813
Merge branch 'quickfixes' into 'master'
...
small fixes
See merge request veloren/veloren!1221
2020-07-21 13:36:10 +00:00
Marcel
eae5470f7d
Merge branch 'T-Dark-char-alias-slur-check-hotfix' into 'master'
...
T dark char alias slur check hotfix
See merge request veloren/veloren!1215
2020-07-21 09:59:00 +00:00
T-Dark0
fd9ec8fbd0
Voxygen and server-cli no longer panic if server creation returns error
...
The process just exists instead
2020-07-21 09:59:00 +00:00
