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,318 Commits 151 Branches 18 Tags
Commit Graph

2318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Acrimon
7600cd0b2b Update lib.rs 2019-10-03 17:19:22 -04:00
Acrimon
6b87c25867 Updated toolchain version and a bunch of deps. 2019-10-03 17:19:22 -04:00
Forest Anderson
6ac12d996b 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
b74e6bb2f9 Formatted with fmt 2019-10-03 09:16:46 +10:00
Marcel
8766f58acc 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
c094c1282c feat(voxygen): add logo for windows executable 2019-10-02 16:57:08 +02:00
stevedagiraffe
fd74176c38 Added ability to toggle zoom inversion in settings 
Displayed as checkbox under the Gameplay tab.
 2019-10-02 23:09:05 +10:00
stevedagiraffe
ff79e9c27d associated zoom inversion to GameplaySettings 2019-10-02 22:44:41 +10:00
Monty Marz
a9bfa1995b 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
658063172e Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Songtronix
0d7d8f22d1 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
a007b3bad8 Add additional .vscode/ entry to .gitignore as this was not working for som devs. 2019-10-02 15:17:16 +09:00
Joshua Barretto
1937232340 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
606ca4a34b Higher level cache abstraction 2019-10-01 02:10:28 -04:00
Imbris
4137835750 Cache most recent chunk access in terrain meshing 2019-10-01 02:10:28 -04:00
Monty Marz
43d49aa6ce 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
cf8c85006e Function to cancel pending server connections in the login screen. 2019-09-29 19:12:26 +00:00
Forest Anderson
64ce49daeb 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
f9f2df44d6 Prevent double zip with CI 2019-09-29 10:59:34 +00:00
Monty Marz
5f9ad89cb4 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
15e9bf0ab5 Better stepping sounds (and minor voxel model fixes) 2019-09-27 16:04:22 +00:00
Joshua Barretto
87aa9d5e08 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
279685f84b Removed unnecessary code 2019-09-27 14:03:08 +01:00
Joshua Barretto
760daa551f Fixed cold near oceans, faster meshing 2019-09-27 12:46:20 +01:00
Joshua Barretto
bded33f1fa Made meshing considerably faster 2019-09-27 11:06:32 +01:00
Imbris
ea5233b793 Merge branch 'imbris/aa' into 'master' 
Anti aliasing options

See merge request veloren/veloren!514
 2019-09-27 05:00:38 +00:00
Imbris
60645612ac UI tweaks 2019-09-27 00:23:42 -04:00
Imbris
daf42cfef8 AA mode UI improvements 2019-09-26 23:46:49 -04:00