Commit Graph

4692 Commits

Author SHA1 Message Date
Songtronix
1c9ffd6b22 Merge branch 'songtronix/fix-readme' into 'master'
fix(readme): update link to correct book chapter

See merge request veloren/veloren!1176
2020-07-07 07:43:13 +00:00
Songtronix
3fa18e23ff fix(readme): update link to correct book chapter 2020-07-07 09:42:02 +02:00
Joshua Barretto
1df9fd6600 Merge branch 'zesterer/small-fixes' into 'master'
Actually small fixes this time

See merge request veloren/veloren!1175
2020-07-07 02:21:17 +00:00
Joshua Barretto
3cfd8bdd3c Fixed animal loadouts and /spawn 2020-07-07 02:21:14 +01:00
Joshua Barretto
d1cdb6ea55 Updated changelog 2020-07-07 01:11:37 +01:00
Joshua Barretto
e626f6255f Prevented pet damage 2020-07-07 01:01:39 +01:00
Joshua Barretto
f77d2f06c6 Fixed staff RMB, bug in ranged weapon code 2020-07-06 23:37:44 +01:00
Joshua Barretto
30619771af Improved block picking 2020-07-06 23:04:13 +01:00
Joshua Barretto
62b59de95a Fixed sprite select flickering 2020-07-06 22:41:21 +01:00
Marcel
91157d1dcf Merge branch 'protheory8/remove-spaces-in-cargo-config' into 'master'
Remove spaces in .cargo/config file

See merge request veloren/veloren!1166
2020-07-06 21:16:30 +00:00
Joshua Barretto
99a526f702 Made pets healable 2020-07-06 21:18:30 +01:00
Joshua Barretto
55852f9bc7 Made fireballs brighter, animals slightly more effective at combat 2020-07-06 21:02:16 +01:00
Joshua Barretto
64dc339f13 Reduced acceleration in air 2020-07-06 20:51:57 +01:00
Joshua Barretto
d943bb4537 Made pets regulate their speed 2020-07-06 20:51:23 +01:00
Joshua Barretto
a10e613df0 Merge branch 'zesterer/server-fixes' into 'master'
Fixed view distance bug

See merge request veloren/veloren!1170
2020-07-06 17:12:02 +00:00
Joshua Barretto
ddaa0a9246 Made char select handle client events 2020-07-06 17:11:19 +01:00
Joshua Barretto
bdab3972c2 Fixed view distance bug 2020-07-06 16:36:13 +01:00
Jack Rubino
2ce92b88a9 Update it_IT.ron 2020-07-06 14:27:55 +00:00
scott-c
b72d817cf7 Fix 1h models in character select idle animation #662 2020-07-06 17:54:26 +08:00
scott-c
6014bd8364 fix 1h second item cache issue #661 2020-07-06 17:54:26 +08:00
Marcel
e19d170b61 Merge branch 'imbris/smaller-fixes' into 'master'
Stop spamming loadout, Update specs

See merge request veloren/veloren!1165
2020-07-06 09:50:46 +00:00
Joshua Barretto
37e6f2cceb Merge branch 'songtronix/fix-singleplayer-viewdistance' into 'master'
fix: allow maximum view distance in singleplayer

See merge request veloren/veloren!1167
2020-07-06 09:50:44 +00:00
Songtronix
200496d1bc fix: allow maximum view distance in singleplayer 2020-07-06 10:37:44 +02:00
Imbris
8d39f27458 Upgrade hashbrown 2020-07-06 03:15:06 -04:00
protheory8
7ef4d3e093 Remove spaces in .cargo/config file 2020-07-06 11:36:24 +05:00
Imbris
afff8a43b9 Add some code to count how many updates will be sent for each component type (commented out) 2020-07-06 02:25:29 -04:00
Justin Shipsey
d63da1beb9 Merge branch 'snowram/quadsmall-fix' into 'master'
post-quad rewrite fixup

See merge request veloren/veloren!1161
2020-07-06 06:07:29 +00:00
Snowram
d6da1f0e75 post-quad rewrite fixup 2020-07-06 06:07:29 +00:00
Imbris
c2d6d00b00 point to github specs to access PairedStorage type, fix Loadout sync spam 2020-07-06 01:56:02 -04:00
Nícolas Wildner
9f7f9f96f9 Update pt_BR.ron 2020-07-06 01:57:34 +00:00
Nícolas Wildner
0654addb98 Updating pt_BR translation 2020-07-05 22:52:42 -03:00
Joshua Barretto
3c1fddfb0b Merge branch 'zesterer/server-fixes' into 'master'
Server bug fixes

See merge request veloren/veloren!1159
2020-07-05 19:41:30 +00:00
Marcel
4e45ecb17c Merge branch 'xMAC94x/network-small-fixes' into 'master'
X mac94x/network small fixes

See merge request veloren/veloren!1160
2020-07-05 19:40:22 +00:00
Joshua Barretto
3bef87016b Merge branch 'qutrin/another-fix' into 'master'
Fix loot table (again)

See merge request veloren/veloren!1157
2020-07-05 19:13:58 +00:00
Joshua Barretto
dd2a81b1f3 Increased network test timeouts 2020-07-05 19:56:06 +01:00
Marcel Märtens
3a6319f2f6 compress everything 2020-07-05 20:14:47 +02:00
Joshua Barretto
a9f862ee95 Fixed multiple char select bug 2020-07-05 18:05:00 +01:00
Marcel Märtens
092b1e0d6c small fix 2020-07-05 18:54:34 +02:00
Piotr Korgól
713d0c5e8a Add a test for the loot table's validity 2020-07-05 18:52:36 +02:00
Piotr Korgól
d0b7958309 Fix loot table (again) 2020-07-05 18:52:34 +02:00
Joshua Barretto
616dd29df1 Merge branch 'zesterer/bombs' into 'master'
Added bombs, training dummies, throwable items, more block kinds, weaker explosions

See merge request veloren/veloren!1155
2020-07-05 16:45:19 +00:00
Joshua Barretto
43f75f2f54 Removed bomb timeout 2020-07-05 16:15:51 +01:00
Joshua Barretto
fd39ee97bc Added training dummies 2020-07-05 16:15:51 +01:00
Joshua Barretto
92c9db5291 Made fluids block explosions 2020-07-05 16:15:51 +01:00
Joshua Barretto
38c422bef7 Added bombs to loot table 2020-07-05 16:15:51 +01:00
Joshua Barretto
2f6a618d5a Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
Justin Shipsey
1c7c04141a Merge branch 'snowram/quad-rework' into 'master'
quadruped rewrite

See merge request veloren/veloren!1116
2020-07-05 15:00:14 +00:00
jshipsey
50fcd6c6a3 remove slowmo test mode 2020-07-05 10:00:44 -04:00
jshipsey
2c14b2f891 clippy fixes 2020-07-05 09:39:56 -04:00
jshipsey
62eb66173f tweaks and fixes 2020-07-05 09:39:55 -04:00