775f556d64
feat(env): added DISABLE_GIT_LFS_CHECK
2019-10-06 07:33:24 +02:00
604929b5c3
Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'"
...
This reverts merge request !547
2019-10-06 01:31:47 +00:00
7bb05ce2e8
Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'
...
Change memory allocator to jemalloc
Closes #278
See merge request veloren/veloren!547
2019-10-05 22:49:19 +00:00
c442ff7d8a
Chanced to ignore msvc instead of windows
...
Change server to ignore msvc
2019-10-05 17:57:29 -04:00
c37dd91647
Added jemalloc for Linux systems
2019-10-05 17:57:29 -04:00
34975879ad
Remove heaptrack
2019-10-05 17:57:29 -04:00
8899c0aadd
Merge branch 'timo-icon' into 'master'
...
fix(bow): use axe as default icon, not debug stick
See merge request veloren/veloren!539
2019-10-05 21:51:08 +00:00
27fa51b205
fix(bow): adds bow icon art
2019-10-05 21:51:08 +00:00
3d422d9295
Merge branch 'qutrin/npc-levels' into 'master'
...
Enemies spawn with random levels, Nametags display levels
See merge request veloren/veloren!532
2019-10-05 15:54:06 +00:00
28cc67679a
refactor: joined on &stats twice
2019-10-05 17:37:10 +02:00
2dd51fe2a9
fix(exp): crash when gaining many levels at once
2019-10-05 17:37:10 +02:00
6d0c71042e
Make /adminify admin-only and /waypoint free
2019-10-05 17:37:10 +02:00
bca68e6ed8
Make enemies spawn with different levels
2019-10-05 17:37:09 +02:00
eb538d680d
Make nametags display levels
2019-10-05 17:37:09 +02:00
256e3d873f
Merge branch 'songtronix/fix-rich-presence' into 'master'
...
Fix discord rich presence
See merge request veloren/veloren!543
2019-10-05 15:35:59 +00:00
c4edda1a80
Fix discord rich presence
2019-10-05 15:35:59 +00:00
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
888c52d161
Update client-side password hashing to argon2
2019-10-05 13:12:20 +00:00
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
e6ee44aa1b
Revert "Added to systems directory"
...
This reverts commit 129674eb1c
2019-10-04 23:53:10 +00:00
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
ee6680125b
Added to systems directory
2019-10-04 19:26:58 -04:00
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
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
808cc75fb3
Merge branch 'timo-bow' into 'master'
...
Timo bow
See merge request veloren/veloren!513
2019-10-04 20:09:29 +00:00
cfa13163b8
Fix fonts
2019-10-04 21:30:32 +02:00
54d3808c3f
fix(bow): Don't remove vel and use sticky component instead
2019-10-04 21:30:13 +02:00
045555f1a2
rebase fix
2019-10-04 21:02:45 +02:00
86f1939dfd
added bow wielding animations
2019-10-04 21:02:45 +02:00
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
049fe3808e
feat(bow): make arrows stick to walls
2019-10-04 21:02:44 +02:00
e0e7a6e390
fix(render): figures without vel don't render
2019-10-04 21:02:44 +02:00
ec716292cd
feat(bow): sticky arrows
2019-10-04 21:02:43 +02:00
69120552e9
feat(bow): Client side prediction
2019-10-04 21:02:43 +02:00
257443fd37
fix(bow): initial orientation wrong for 1 frame
2019-10-04 21:02:42 +02:00
8939385b92
assets, rotation, offset changes
2019-10-04 21:02:42 +02:00
455e7e08b8
Remove warnings
2019-10-04 21:02:42 +02:00
993936017d
Reuse combat code
2019-10-04 21:02:41 +02:00
c34d18f73f
Make arrows deal damage
2019-10-04 21:02:41 +02:00
1288a1ab65
Allow projectiles to react to triggers
2019-10-04 21:02:40 +02:00
ff722e7e59
made bow available in char selection
2019-10-04 21:02:40 +02:00
8bf3b87b1b
bow position
2019-10-04 21:02:40 +02:00
9c974232ae
Initial bow & arrow implementation
2019-10-04 21:02:39 +02:00
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
b8ac93c4ca
Assets update, aesthetics, minor fixes
2019-10-04 18:27:12 +00:00
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
a58f01a022
Play some music on game launch
2019-10-05 02:31:24 +09:00
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
a15c11f023
Hash the passwords client-side
2019-10-04 16:44:31 +00:00
7d25f0ae5e
add give_exp command
2019-10-04 17:48:14 +02:00
