Songtronix
c4edda1a80
Fix discord rich presence
2019-10-05 15:35:59 +00:00
Marcel
07fc8367cc
Merge branch 'password-argon2' into 'master'
...
Update client-side password hashing to argon2
See merge request veloren/veloren!544
2019-10-05 13:12:20 +00:00
Wu Yu Wei
888c52d161
Update client-side password hashing to argon2
2019-10-05 13:12:20 +00:00
Forest Anderson
d6fab64d1f
Merge branch 'revert-129674eb' into 'master'
...
Revert "Added to systems directory"
See merge request veloren/veloren!541
2019-10-05 00:28:30 +00:00
Forest Anderson
e6ee44aa1b
Revert "Added to systems directory"
...
This reverts commit 129674eb1c34e9e8d35d00d7973b99143d3a888e
2019-10-04 23:53:10 +00:00
Forest Anderson
8d6689a5db
Merge branch 'haslersn/nix/init' into 'master'
...
default.nix, shell.nix: init
See merge request veloren/veloren!506
2019-10-04 23:47:16 +00:00
Forest Anderson
ee6680125b
Added to systems directory
2019-10-04 19:26:58 -04:00
haslersn
aa765814c7
default.nix, shell.nix: init
...
This commit inits the `default.nix` and `shell.nix`. They support
`nix build` and `nix-shell`, respectively.
* `nix-shell` sets up the build environment for Veloren so
that you can manually build it using `cargo build`. This
is for developping as it speeds up subsequent compilations
because intermediate compilation artifacts are reused.
* `nix build` builds Veloren, stores the result in the Nix
store and creates a `result` symlink to it. Make sure that
the LFS files are checked out before using `nix build`.
2019-10-04 19:26:27 -04:00
Forest Anderson
e1ad5b3a87
Merge branch 'appcrashwin7/veloren-exp-command' into 'master'
...
add give_exp command
See merge request veloren/veloren!536
2019-10-04 21:02:07 +00:00
Timo Koesters
808cc75fb3
Merge branch 'timo-bow' into 'master'
...
Timo bow
See merge request veloren/veloren!513
2019-10-04 20:09:29 +00:00
timokoesters
cfa13163b8
Fix fonts
2019-10-04 21:30:32 +02:00
timokoesters
54d3808c3f
fix(bow): Don't remove vel and use sticky component instead
2019-10-04 21:30:13 +02:00
Pfauenauge90
045555f1a2
rebase fix
2019-10-04 21:02:45 +02:00
jshipsey
86f1939dfd
added bow wielding animations
2019-10-04 21:02:45 +02:00
timokoesters
6d056e05f7
feat(combat): melee combat damage depends on power of the weapon
...
Normal NPCs have a weapon of power 5 so they do 5 damage if the attack
is not blocked. Bosses and players have power 10.
2019-10-04 21:02:44 +02:00
timokoesters
049fe3808e
feat(bow): make arrows stick to walls
2019-10-04 21:02:44 +02:00
timokoesters
e0e7a6e390
fix(render): figures without vel don't render
2019-10-04 21:02:44 +02:00
timokoesters
ec716292cd
feat(bow): sticky arrows
2019-10-04 21:02:43 +02:00
timokoesters
69120552e9
feat(bow): Client side prediction
2019-10-04 21:02:43 +02:00
timokoesters
257443fd37
fix(bow): initial orientation wrong for 1 frame
2019-10-04 21:02:42 +02:00
Pfauenauge90
8939385b92
assets, rotation, offset changes
2019-10-04 21:02:42 +02:00
timokoesters
455e7e08b8
Remove warnings
2019-10-04 21:02:42 +02:00
timokoesters
993936017d
Reuse combat code
2019-10-04 21:02:41 +02:00
timokoesters
c34d18f73f
Make arrows deal damage
2019-10-04 21:02:41 +02:00
timokoesters
1288a1ab65
Allow projectiles to react to triggers
2019-10-04 21:02:40 +02:00
Pfauenauge90
ff722e7e59
made bow available in char selection
2019-10-04 21:02:40 +02:00
Pfauenauge
8bf3b87b1b
bow position
2019-10-04 21:02:40 +02:00
timokoesters
9c974232ae
Initial bow & arrow implementation
2019-10-04 21:02:39 +02:00
Monty Marz
2d492460fe
Merge branch 'slipped/aesthetics' into 'master'
...
Assets update, aesthetics, minor fixes
See merge request veloren/veloren!529
2019-10-04 18:27:12 +00:00
Monty Marz
b8ac93c4ca
Assets update, aesthetics, minor fixes
2019-10-04 18:27:12 +00:00
Songtronix
5703c8a32f
Merge branch 'shandley/basic-menu-music' into 'master'
...
Play some music on game launch
See merge request veloren/veloren!535
2019-10-04 17:53:38 +00:00
Shane Handley
a58f01a022
Play some music on game launch
2019-10-05 02:31:24 +09:00
Mckol
79ffa737dc
Merge branch 'mckol/password-hashing' into 'master'
...
Hash the passwords client-side
See merge request veloren/veloren!533
2019-10-04 16:44:31 +00:00
Mckol
a15c11f023
Hash the passwords client-side
2019-10-04 16:44:31 +00:00
appcrashwin7
7d25f0ae5e
add give_exp command
2019-10-04 17:48:14 +02:00
Acrimon
f86b4795a9
Merge branch 'nick12/max_msg_len' into 'master'
...
Add max chat message length
Closes #115
See merge request veloren/veloren!432
2019-10-04 14:51:28 +00:00
Acrimon
2aa8ce9495
Format code.
2019-10-04 16:26:22 +02:00
Acrimon
d84817137b
Updated to work on latest master.
2019-10-04 16:25:47 +02:00
Nick12
0629a967c0
Increase max bytes per chat message
2019-10-04 16:14:54 +02:00
Nicolas
c6e66fb2e1
Add max chat message length
...
Fixes #115
Credit to @scorpion9979 for the previous implementation (https://gitlab.com/veloren/veloren/merge_requests/215 )
2019-10-04 16:14:54 +02:00
Marcel
cad641f115
Merge branch 'shandley/limit-sfx-range' into 'master'
...
Set a distance limit on the trigger of sound effects.
See merge request veloren/veloren!516
2019-10-04 09:58:58 +00:00
S Handley
60854efbfc
This is a re-commit of this feature from MR yarn run test where shandley had a catastrophic git cockup.
2019-10-04 09:58:58 +00:00
Forest Anderson
022e73c902
Merge branch 'updating-thingies' into 'master'
...
Updated toolchain version and a bunch of deps.
Closes #273
See merge request veloren/veloren!479
2019-10-03 22:06:01 +00:00
Forest
add6d77491
Removed now stable feature
2019-10-03 17:28:17 -04:00
Forest
1be355c0f1
Updated cargo.lock
2019-10-03 17:20:16 -04:00
Forest
b1c95e651e
Changed to oct toolchain
2019-10-03 17:19:22 -04:00
Forest Anderson
f79a82c554
Bumped toolchain again
2019-10-03 17:19:22 -04:00
Forest Anderson
16c2bdf089
Removed trailing semicolon
2019-10-03 17:19:22 -04:00
Acrimon
cbf1267e97
Update fast_noise.rs
2019-10-03 17:19:22 -04:00
Acrimon
99005c1d30
Update lib.rs
2019-10-03 17:19:22 -04:00
