Commit Graph

2421 Commits

Author SHA1 Message Date
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
appcrashwin7
1069173d83 add give_exp command 2019-10-04 17:48:14 +02:00
Acrimon
2b98b85020 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
b4bca0a150 Format code. 2019-10-04 16:26:22 +02:00
Acrimon
6d6c020eab Updated to work on latest master. 2019-10-04 16:25:47 +02:00
Nick12
e8340d88af Increase max bytes per chat message 2019-10-04 16:14:54 +02:00
Nicolas
6e4d556073 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
101c563b03 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
810a7e5b5d 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
e4785b8a5d 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
35b9040a6f Removed now stable feature 2019-10-03 17:28:17 -04:00
Forest
12bdefd146 Updated cargo.lock 2019-10-03 17:20:16 -04:00
Forest
4a59ed233c Changed to oct toolchain 2019-10-03 17:19:22 -04:00
Forest Anderson
5bcec6391a Bumped toolchain again 2019-10-03 17:19:22 -04:00
Forest Anderson
6ee99786d6 Removed trailing semicolon 2019-10-03 17:19:22 -04:00
Acrimon
f39d454f93 Update fast_noise.rs 2019-10-03 17:19:22 -04:00
Acrimon
772e85fbea Update lib.rs 2019-10-03 17:19:22 -04:00
Acrimon
e151b81c11 Update lib.rs 2019-10-03 17:19:22 -04:00
Acrimon
03bf74f414 Updated toolchain version and a bunch of deps. 2019-10-03 17:19:22 -04:00
Forest Anderson
6715f02a4e Merge branch 'stevedagiraffe/add-option-to-invert-scroll-wheel' into 'master'
Resolve #266 "Add option to invert scroll wheel"

Closes #266

See merge request veloren/veloren!528
2019-10-02 23:39:32 +00:00
stevedagiraffe
f1b78d21c8 Formatted with fmt 2019-10-03 09:16:46 +10:00
Marcel
fdaf344fec Merge branch 'songtronix/add-executable-icon' into 'master'
Adds executable logo for veloren-voxygen.exe

Closes #261

See merge request veloren/veloren!527
2019-10-02 15:01:34 +00:00
Songtronix
bced3cb638 feat(voxygen): add logo for windows executable 2019-10-02 16:57:08 +02:00
stevedagiraffe
8680e92548 Added ability to toggle zoom inversion in settings
Displayed as checkbox under the Gameplay tab.
2019-10-02 23:09:05 +10:00
stevedagiraffe
f149182290 associated zoom inversion to GameplaySettings 2019-10-02 22:44:41 +10:00
Monty Marz
131204f308 Merge branch 'char_overhaul' into 'master'
Char overhaul and asset update

See merge request veloren/veloren!523
2019-10-02 10:05:17 +00:00
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Songtronix
c1a13ebe13 Merge branch 'shandley/gitignore-vscode' into 'master'
Add additional .vscode/ entry to .gitignore as this was not working for some devs.

See merge request veloren/veloren!525
2019-10-02 06:22:49 +00:00
Shane Handley
cb987ed850 Add additional .vscode/ entry to .gitignore as this was not working for som devs. 2019-10-02 15:17:16 +09:00
Joshua Barretto
9ef7036024 Merge branch 'imbris/mesh-speed' into 'master'
Cache most recent chunk access in terrain meshing

See merge request veloren/veloren!522
2019-10-01 08:23:25 +00:00
Imbris
83b5ca3335 Higher level cache abstraction 2019-10-01 02:10:28 -04:00
Imbris
89a1c45ac7 Cache most recent chunk access in terrain meshing 2019-10-01 02:10:28 -04:00
Monty Marz
ff82e77ec9 Merge branch 'Carbonhell/serverCancel' into 'master'
Adds a way to cancel a pending connection to a server.

Closes #254

See merge request veloren/veloren!521
2019-09-29 19:12:26 +00:00
Carbonhell
6f6fdd87af Function to cancel pending server connections in the login screen. 2019-09-29 19:12:26 +00:00
Forest Anderson
9b19fcc49b Merge branch 'angelonfira/remove-artifact-download-extra-zip' into 'master'
Prevent double zip with CI

Closes #232

See merge request veloren/veloren!519
2019-09-29 10:59:34 +00:00
Forest Anderson
a9771850d7 Prevent double zip with CI 2019-09-29 10:59:34 +00:00
Monty Marz
2ade20b347 Merge branch 'pfauenauge/assets' into 'master'
Better stepping sounds (and minor voxel model fixes)

See merge request veloren/veloren!518
2019-09-27 16:04:22 +00:00
Monty Marz
11a022abb3 Better stepping sounds (and minor voxel model fixes) 2019-09-27 16:04:22 +00:00
Joshua Barretto
45fbd75907 Merge branch 'zesterer/small-fixes' into 'master'
Zesterer/small fixes

See merge request veloren/veloren!517
2019-09-27 13:09:55 +00:00
Joshua Barretto
8d2f1d470c Removed unnecessary code 2019-09-27 14:03:08 +01:00
Joshua Barretto
a90ceddde0 Fixed cold near oceans, faster meshing 2019-09-27 12:46:20 +01:00
Joshua Barretto
09197049cb Made meshing considerably faster 2019-09-27 11:06:32 +01:00