Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,712 Commits 151 Branches 18 Tags 2.1 GiB
2635c405fe
Commit Graph

2712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Acrimon
82789f9565 Merge branch 'revert-4498cece' into 'master' 
Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'"

See merge request veloren/veloren!549
 2019-10-06 07:32:43 +00:00
Songtronix
aa556ba4b3 feat(env): added DISABLE_GIT_LFS_CHECK 2019-10-06 07:33:24 +02:00
Forest Anderson
b13f9f37f7 Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" 
This reverts merge request !547
 2019-10-06 01:31:47 +00:00
Acrimon
4498cece46 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
Forest Anderson
0304b51159 Chanced to ignore msvc instead of windows 
Change server to ignore msvc
 2019-10-05 17:57:29 -04:00
Forest Anderson
e1bab6afe0 Added jemalloc for Linux systems 2019-10-05 17:57:29 -04:00
Forest Anderson
9ef98ce1a5 Remove heaptrack 2019-10-05 17:57:29 -04:00
Monty Marz
54aac3859f 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
Timo Koesters
f3787879d3 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
Acrimon
954881d84d 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
timokoesters
4a99e5bc1e refactor: joined on &stats twice 2019-10-05 17:37:10 +02:00
timokoesters
2fc4a8d9aa fix(exp): crash when gaining many levels at once 2019-10-05 17:37:10 +02:00
Piotr Korgól
09429b45d1 Make /adminify admin-only and /waypoint free 2019-10-05 17:37:10 +02:00
Piotr Korgól
9e10c8b700 Make enemies spawn with different levels 2019-10-05 17:37:09 +02:00
Piotr Korgól
152efaee3b Make nametags display levels 2019-10-05 17:37:09 +02:00
Songtronix
2a62314dd1 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
Songtronix
43cae5ea64 Fix discord rich presence 2019-10-05 15:35:59 +00:00
Marcel
af3b4739ec 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
193ff105e2 Update client-side password hashing to argon2 2019-10-05 13:12:20 +00:00
Forest Anderson
bbb341e07d 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
28eb492b56 Revert "Added to systems directory" 
This reverts commit 129674eb1c
 2019-10-04 23:53:10 +00:00
Forest Anderson
b7ce4c60ad 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
129674eb1c Added to systems directory 2019-10-04 19:26:58 -04:00
haslersn
b12b7bb615 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
2f1c62d2ed 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
74239c5346 Merge branch 'timo-bow' into 'master' 
Timo bow

See merge request veloren/veloren!513
 2019-10-04 20:09:29 +00:00
timokoesters
5a1052a1a6
Fix fonts 2019-10-04 21:30:32 +02:00
timokoesters
460a494e77
fix(bow): Don't remove vel and use sticky component instead 2019-10-04 21:30:13 +02:00
Pfauenauge90
f1c4e7040a
rebase fix 2019-10-04 21:02:45 +02:00
jshipsey
66e8f4c4bc
added bow wielding animations 2019-10-04 21:02:45 +02:00
timokoesters
d876215012
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
ba3db852f7
feat(bow): make arrows stick to walls 2019-10-04 21:02:44 +02:00
timokoesters
469349a426
fix(render): figures without vel don't render 2019-10-04 21:02:44 +02:00
timokoesters
fc97c27b65
feat(bow): sticky arrows 2019-10-04 21:02:43 +02:00
timokoesters
575f7da64d
feat(bow): Client side prediction 2019-10-04 21:02:43 +02:00
timokoesters
df4c4bbd5d
fix(bow): initial orientation wrong for 1 frame 2019-10-04 21:02:42 +02:00
Pfauenauge90
e404ea0d4f
assets, rotation, offset changes 2019-10-04 21:02:42 +02:00
timokoesters
fe17b4952c
Remove warnings 2019-10-04 21:02:42 +02:00
timokoesters
ab634f1d21
Reuse combat code 2019-10-04 21:02:41 +02:00
timokoesters
2ba143a514
Make arrows deal damage 2019-10-04 21:02:41 +02:00
timokoesters
e3c02f8ac1
Allow projectiles to react to triggers 2019-10-04 21:02:40 +02:00
Pfauenauge90
39e5530d45
made bow available in char selection 2019-10-04 21:02:40 +02:00
Pfauenauge
b5180320fb
bow position 2019-10-04 21:02:40 +02:00
timokoesters
d46f1e1859
Initial bow & arrow implementation 2019-10-04 21:02:39 +02:00
Monty Marz
d598f2879c 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
4c1eba1f3e Assets update, aesthetics, minor fixes 2019-10-04 18:27:12 +00:00
Songtronix
1fc5e3cff7 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
b1d775728a Play some music on game launch 2019-10-05 02:31:24 +09:00
Mckol
564e000498 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
9aba318df2 Hash the passwords client-side 2019-10-04 16:44:31 +00:00