Giovanni Spera
4232148b83
Stopping auto-walk after death: Fixes #607
2020-07-07 20:56:44 +02:00
Ben Frankel
823141f825
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
e8b4b29d70
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
258e39f1dc
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
85a3f8637d
fix specs
2020-07-07 14:28:00 +02:00
Marcel
2a0b4c6c92
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
6ddd09b7b6
specs back to master
2020-07-07 12:55:06 +02:00
Marcel
c8fd6f4766
Merge branch 'fix-macos' into 'master'
...
revert dispatch
See merge request veloren/veloren!1177
2020-07-07 10:09:07 +00:00
Marcel
b85a4493ea
revert dispatch
2020-07-07 11:19:38 +02:00
Marcel
55886be42f
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
c212de00c2
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
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
