Joshua Barretto
f44b39420b
Merge branch 'sam/creature-stats' into 'master'
...
Creature Specific Stats
See merge request veloren/veloren!1182
2020-07-09 00:04:25 +00:00
Samuel Keiffer
44e6fe01f1
Different body types now have different health values and gain different amounts of healths on leveling.
2020-07-09 00:04:25 +00:00
Joshua Barretto
8ab24d4c06
Merge branch 'sam/axe-spin-attack' into 'master'
...
Spin attack for axe
See merge request veloren/veloren!1171
2020-07-08 19:58:41 +00:00
Samuel Keiffer
736132e154
Spin attack for axe
2020-07-08 19:58:41 +00:00
Marcel
2d50d600a5
Merge branch 'xvar/preventdatalossfromdeserialization' into 'master'
...
Removed de-serialization failure tolerance to prevent player inventory/loadout wipes (#659 )
See merge request veloren/veloren!1173
2020-07-08 18:26:59 +00:00
Ben Wallis
599b1ec627
Added CharacterDataError when character list fails to load due to Loadout de-serialization error
2020-07-08 09:34:20 +01:00
Ben Wallis
240bd0639b
Added migration to create a default inventory and loadout for characters without one
2020-07-08 09:09:48 +01:00
Ben Wallis
8b8c68a3b8
Removed de-serialization failure tolerance to prevent player inventory/loadout wipes
2020-07-08 09:09:47 +01:00
Marcel
315ed25f2c
Merge branch 'pyrious/fix-character-state-on-inventory-change' into 'master'
...
Maintain character state when inventory is modified
Closes #602
See merge request veloren/veloren!1180
2020-07-07 23:54:56 +00:00
Ben Frankel
51dc3629c8
Maintain character state when inventory is modified
...
If the mainhand slot is swapped out or dropped while the character is
wielding, the character will be set to idle (same behavior). However, if
an item is picked up or used; or a non-mainhand item is dropped; or two
non-mainhand items are swapped; the character state will not be set to
idle (new behavior).
Rationale for keeping the same behavior:
Swapping a weapon out while in a wielding state can put the player in a
barehanded wielding state, which would be inconsistent with the fact
that that state can't be entered by toggling wield while barehanded.
Rationale for setting the new behavior:
Setting character state to idle was originally added because "Interact"
was mapped to right mouse button, so picking up an item with RMB would
also activate secondary attack if the player was wielding during the
interaction. Now the default keybinding for "Interact" is E, so this
isn't a problem unless the player changes their keybinding to RMB.
In addition, setting character state to idle for any inventory
manipulation may cause players to fall out of glider unexpectedly.
2020-07-07 09:43:48 -07:00
Justin Shipsey
5d858160df
Merge branch 'scott-c/1h-fixes' into 'master'
...
1h fixes
See merge request veloren/veloren!1158
2020-07-07 15:29:33 +00:00
Marcel
466ce77b9d
Merge branch 'xMAC94x/specs' into 'master'
...
fix specs
See merge request veloren/veloren!1179
2020-07-07 13:00:09 +00:00
Marcel Märtens
a2a33ddd55
fix specs
2020-07-07 14:28:00 +02:00
Marcel
113151ddf9
Merge branch 'xMAC94x/specs' into 'master'
...
specs back to master
See merge request veloren/veloren!1178
2020-07-07 11:43:31 +00:00
Marcel Märtens
00528bee71
specs back to master
2020-07-07 12:55:06 +02:00
Marcel
d75a800d5e
Merge branch 'fix-macos' into 'master'
...
revert dispatch
See merge request veloren/veloren!1177
2020-07-07 10:09:07 +00:00
Marcel
06cc3f5de0
revert dispatch
2020-07-07 11:19:38 +02:00
Marcel
b6d281f0d1
Merge branch 'xmac94x_song/dependencies' into 'master'
...
updated dependencies and fixed stuff
See merge request veloren/veloren!1169
2020-07-07 08:31:27 +00:00
Marcel Märtens
d71e9d0ee9
updated dependencies and fixed stuff
...
- replace serde_derive by feature of serde
incl. source code modifications to compile
- reduce futures-timer to "2.0" to be same as async_std
- update notify
- removed mio, bincode and lz4 compress in common as networking is now in own crate
btw there is a better lz4 compress crate, which is newer than 2017
- update prometheus to 0.9
- can't update uvth yet due to usues
- hashbrown to 7.2 to only need a single version
- libsqlite3 update
- image didn't change as there is a problem with `image 0.23`
- switch old directories with newer directories-next
- no num upgrade as we still depend on num 0.2 anyways
- rodio and cpal upgrade
- const-tewaker update
- dispatch (untested) update
- git2 update
- iterations update
2020-07-07 09:43:49 +02:00
Songtronix
89e6edb4dc
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
3e34f1c8d5
fix(readme): update link to correct book chapter
2020-07-07 09:42:02 +02:00
Joshua Barretto
6a5305e414
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
9243ab8a52
Fixed animal loadouts and /spawn
2020-07-07 02:21:14 +01:00
Joshua Barretto
333d8c70b3
Updated changelog
2020-07-07 01:11:37 +01:00
Joshua Barretto
5b8234eb5a
Prevented pet damage
2020-07-07 01:01:39 +01:00
Joshua Barretto
693761edb0
Fixed staff RMB, bug in ranged weapon code
2020-07-06 23:37:44 +01:00
Joshua Barretto
8d56f3cc09
Improved block picking
2020-07-06 23:04:13 +01:00
Joshua Barretto
e7726f61de
Fixed sprite select flickering
2020-07-06 22:41:21 +01:00
Marcel
3096efec93
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
fd6c2547da
Made pets healable
2020-07-06 21:18:30 +01:00
Joshua Barretto
b3bba8aabb
Made fireballs brighter, animals slightly more effective at combat
2020-07-06 21:02:16 +01:00
Joshua Barretto
75894ff8d6
Reduced acceleration in air
2020-07-06 20:51:57 +01:00
Joshua Barretto
fe402a1c52
Made pets regulate their speed
2020-07-06 20:51:23 +01:00
Joshua Barretto
01c0606e52
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
7a158d7547
Made char select handle client events
2020-07-06 17:11:19 +01:00
Joshua Barretto
f2092233b7
Fixed view distance bug
2020-07-06 16:36:13 +01:00
scott-c
d3142cab09
Fix 1h models in character select idle animation #662
2020-07-06 17:54:26 +08:00
scott-c
73a985656e
fix 1h second item cache issue #661
2020-07-06 17:54:26 +08:00
Marcel
92e3e3bc27
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
8cd376d007
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
1c9ed3f470
fix: allow maximum view distance in singleplayer
2020-07-06 10:37:44 +02:00
Imbris
ba1b10bf40
Upgrade hashbrown
2020-07-06 03:15:06 -04:00
protheory8
89c8da8678
Remove spaces in .cargo/config file
2020-07-06 11:36:24 +05:00
Imbris
09a949404f
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
f9079beb6b
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
cbf7d43fb4
post-quad rewrite fixup
2020-07-06 06:07:29 +00:00
Imbris
c4f5dee34f
point to github specs to access PairedStorage type, fix Loadout sync spam
2020-07-06 01:56:02 -04:00
Joshua Barretto
621c8257ce
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
35d681eb7f
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
5ae6582f2f
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
