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
7,836 Commits 151 Branches 18 Tags
Commit Graph

1660 Commits

Author SHA1 Message Date
Snowram
5b8fbe9a23 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Ada Lovegirls
c7d6dde677 Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ben Wallis
2251c91b1a Merge branch 'xvar/server-version-check' into 'master' 
Added client/server version mismatch warnings

See merge request veloren/veloren!2184
 2021-04-24 09:05:45 +00:00
Ben Wallis
d0108fe32b Added client/server version mismatch message when a network error is encountered during client init. 
Added warning banner on character select when successfully connected to a server with a mismatched version.
 2021-04-24 09:08:30 +01:00
holychowders
e7bbe45a42 Fix grammatical error in NPC message 2021-04-23 22:43:37 -07:00
Illia Denysenko
37ed8aa208 update uk_UA localization 2021-04-23 21:30:46 +00:00
Nícolas Wildner
a04768a33e update pt_br 20210422 2021-04-23 01:00:41 +00:00
Monty Marz
ccb913a2c0 Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
d47dc7c49e remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Joshua Barretto
1aed08f885 Made the pit of tartarus less bad 2021-04-21 22:18:44 +01:00
Joshua Barretto
1c225ff449 Improve dynamic light reflection for hill climbing 2021-04-21 17:10:53 +01:00
Ludvig Böklin
99d6cc04db Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Monty
9cf21aada5 remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Joshua Barretto
b511113145 Made sprite/block selection effect more subtle 2021-04-20 02:46:07 +02:00
Joshua Barretto
4710a35c29 Made sprite/block selection effect more subtle 2021-04-20 02:46:06 +02:00
Monty
c40bd37452 more sprite stuff and crafting UI update 
fix item images
fix CR display
 2021-04-20 02:46:06 +02:00
Monty
afea896b5b fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
b605048ae3 Added crafting stations 2021-04-20 02:45:59 +02:00
Joshua Barretto
a3993793a7 Merge branch 'zesterer/small-fixes' into 'master' 
Small fixes

See merge request veloren/veloren!2163
 2021-04-19 21:54:26 +00:00
Joshua Barretto
8f23d476e8 Rebalanced mist 2021-04-19 22:26:56 +01:00
Joshua Barretto
f6e71f1e87 Fixed negative cloud density bug 2021-04-19 22:02:47 +01:00
Imbris
0f10b75130 Merge branch 'capucho/inactive-master' into 'master' 
Lower volume of window on focus loss

See merge request veloren/veloren!2150
 2021-04-19 20:39:49 +00:00
Marcel
6f16c1deba Merge branch 'capucho/map-kb-zoom' into 'master' 
Add keybindings for map/minimap zoom

See merge request veloren/veloren!2161
 2021-04-19 19:52:27 +00:00
João Capucho
06406aee59
Voxygen: Added translations for map zoom 2021-04-19 20:27:02 +01:00
Marcel
6d7c55c726 Merge branch 'juliancoffee/update-uk_UA' into 'master' 
Update localization for uk_UA

See merge request veloren/veloren!2155
 2021-04-19 19:26:20 +00:00
Illia Denysenko
422a1ba214 Update localization for uk_UA 2021-04-19 19:26:20 +00:00
João Capucho
ae99ed0ade
Voxygen: Add master volume sliders to the settings 2021-04-19 19:58:14 +01:00
Joshua Barretto
81f2c430f2 Fixed water shader, sky shader 2021-04-19 14:42:49 +01:00
Sam
b0d9a3b4ba Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
2c8f900299 Merge branch 'zesterer/econ-tweaks' into 'master' 
Rebalanced economy somewhat

See merge request veloren/veloren!2148
 2021-04-18 21:20:49 +00:00
Samuel Keiffer
9d145fccb5 Merge branch 'aweinstock/dodgesplosion' into 'master' 
Unlock dodge roll iframes and staff explosion by default.

See merge request veloren/veloren!2146
 2021-04-18 20:46:15 +00:00
Avi Weinstock
b16d97b39c Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Marcel
9b117dad62 Merge branch 'nwildner/update_pt_BR_20210417' into 'master' 
update pt_br 20210417

See merge request veloren/veloren!2143
 2021-04-18 19:33:39 +00:00
Nícolas Wildner
d64b4b448b update pt_br 20210417 2021-04-18 19:33:39 +00:00
Joshua Barretto
40ca69148c Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
f5f57f89a8 Trading stock limits 2021-04-18 18:58:26 +01:00
Joshua Barretto
b342bb036d Better price rationalisation 2021-04-18 18:11:00 +01:00
Joshua Barretto
cee7a79ae7 Removed legendaries from trading 2021-04-18 17:29:22 +01:00
Joshua Barretto
4732c77519 Use labour value for prices 2021-04-18 17:05:14 +01:00
Joshua Barretto
0a880843c3 Normalised prices within sites 2021-04-18 15:09:21 +01:00
Joshua Barretto
0939e602a4 Rebalanced economy somewhat 2021-04-18 14:08:48 +01:00
Ben Wallis
07e6f8fbd9 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Marcel
f4d5a196b4 Merge branch 'kinggred-master-patch-80352' into 'master' 
Update main.ron

See merge request veloren/veloren!2123
 2021-04-17 18:28:31 +00:00
Samuel Keiffer
8a83b00e78 Merge branch 'DaforLynx/normalize' into 'master' 
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds

See merge request veloren/veloren!2120
 2021-04-16 00:35:15 +00:00
DaforLynx
4d74fe9d7c Normalize + shrink all sfx; tweaks to combat music; change footstep sounds 2021-04-16 00:35:13 +00:00
Samuel Keiffer
a62598c62c Merge branch 'gGmMsS/Burning' into 'master' 
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
 2021-04-15 23:51:33 +00:00
Imbris
0a44ec852a Merge branch 'aweinstock/server-authoritative-physics' into 'master' 
Aweinstock/server authoritative physics

See merge request veloren/veloren!2126
 2021-04-15 22:24:00 +00:00
gGmMsS123
90a47a20ea M2 Staff Final Touch 2021-04-16 00:34:24 +03:00
gGmMsS123
db8d189ebd Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
Avi Weinstock
26fbe51786 Address MR 2126 comments. 2021-04-15 15:17:39 -04:00