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
4,306 Commits 151 Branches 18 Tags 2.1 GiB
0d5937ad1c
Commit Graph

4306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Monty Marz
175bb54de0 Merge branch 'WelshPixie/new-flora' into 'master' 
added new flora

See merge request veloren/veloren!1074
 2020-06-15 16:39:22 +00:00
Delyth Williams
b73da5507e added new flora 2020-06-15 16:39:21 +00:00
scott-c
b2cbf3ee8f Adjust character state's energy regen 2020-06-15 18:13:47 +08:00
scott-c
0b9cae84de Add changes to change log 2020-06-15 18:13:32 +08:00
scott-c
f2f79a1b3c reset energy regen on ability use instead of wield 2020-06-15 18:12:30 +08:00
scott-c
8bcafa6f19 automatically wield on secondary or ability3 2020-06-15 18:12:30 +08:00
Marcel
44da25729c Merge branch 'angel/add-testing' into 'master' 
Add slots tests and documentation

See merge request veloren/veloren!1058
 2020-06-14 21:53:30 +00:00
Marcel
48d0e22f44 Merge branch 'shandley/roll-sfx-bug' into 'master' 
Fix run/roll sfx state

See merge request veloren/veloren!1084
 2020-06-14 21:50:54 +00:00
Shane Handley
825cf98a00 Fixes a bug where run sfx were being played during a roll. 2020-06-15 06:53:50 +10:00
Forest Anderson
361952077e Added loadout replace test and documentation 
Finished documenting
 2020-06-14 16:16:53 -04:00
Forest Anderson
697c7d734a Merge branch 'angel/fix-pages-pipeline-stage' into 'master' 
Fix pages stage to publish

See merge request veloren/veloren!1082
 2020-06-14 18:45:26 +00:00
Forest Anderson
053721ba40 Fix pages stage to publish 2020-06-14 14:03:26 -04:00
Forest Anderson
c2beeef600 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Forest Anderson
1649eadcdd Add unequip tests 2020-06-14 13:56:17 -04:00
Imbris
0d570ffc27 Merge branch 'yusdacra/fix-nixshell' into 'master' 
Fix shell.nix build

See merge request veloren/veloren!1078
 2020-06-14 17:28:26 +00:00
Forest Anderson
2efaba31a9 Merge branch 'angel/add-doc-gitlab-pages' into 'master' 
Add Veloren docs on Gitlab pages

See merge request veloren/veloren!1062
 2020-06-14 17:08:17 +00:00
Imbris
4901dde20d Merge branch 'shandley/docs-audio' into 'master' 
Add documentation for audio module.

See merge request veloren/veloren!1060
 2020-06-14 16:56:32 +00:00
S Handley
00dd75526c Add documentation for audio module. 2020-06-14 16:56:32 +00:00
Imbris
26e53409d8 Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' 
Globally suppressed clippy lint option_map_unit_fn for #587

See merge request veloren/veloren!1071
 2020-06-14 16:48:07 +00:00
Ben Wallis
c1c968f479 Globally suppressed clippy lint option_map_unit_fn for #587 2020-06-14 16:48:07 +00:00
Imbris
fb47115695 Merge branch 'xvar/clippy-fixes-redundant_closure_found' into 'master' 
Fixed suppressed clippy warnings for #587 - redundant_closure

See merge request veloren/veloren!1065
 2020-06-14 16:33:04 +00:00
Imbris
290cb58039 Merge branch 'imbris/fix' into 'master' 
Stop rendering images without area

See merge request veloren/veloren!1081
 2020-06-14 16:32:40 +00:00
Imbris
aff43e6bea Stop rendering 0 size images 2020-06-14 12:06:47 -04:00
Songtronix
24f6c585a5 Merge branch 'songtronix/hot-fix-594' into 'master' 
hotfix: panic trying to create a character

Closes #594

See merge request veloren/veloren!1080
 2020-06-14 11:11:01 +00:00
Songtronix
779769f64e hotfix: panic trying to create a character 2020-06-14 12:40:08 +02:00
Songtronix
0fba5283a2 Merge branch 'slipped/attacks' into 'master' 
bow m2 attack and arrow hold animation

See merge request veloren/veloren!1079
 2020-06-14 09:22:21 +00:00
Justin Shipsey
688f917308 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Songtronix
69710cde5c Merge branch 'jtai/log-chat-messages' into 'master' 
log-chat-messages

See merge request veloren/veloren!1076
 2020-06-14 08:41:41 +00:00
Yusuf Bera Ertan
f9d7626b66
Add the network crate to sources in shell.nix 2020-06-14 06:29:11 +03:00
Monty Marz
03cea72415 Merge branch 'pfau/fix_menu' into 'master' 
fix broken main menu

See merge request veloren/veloren!1077
 2020-06-14 00:56:34 +00:00
Monty Marz
716f936f6c fix broken main menu 2020-06-14 02:11:31 +02:00
jshipsey
cd8f2c801e log-chat-messages 2020-06-13 15:21:58 -04:00
Imbris
38ec0fde63 Merge branch 'xvar/clippy-fixes-collapsible_if' into 'master' 
Fixed suppressed clippy warnings for #587 - collapsible_if

See merge request veloren/veloren!1064
 2020-06-12 20:27:13 +00:00
Ben Wallis
4d6c553b1b Fixed suppressed clippy warnings for #587 - redundant_closure 2020-06-12 20:47:22 +01:00
Ben Wallis
8ed2109bcf Fixed suppressed clippy warnings for #587 - collapsible_if 2020-06-12 20:34:54 +01:00
Forest Anderson
d8a8cc7032 Test pages 
Added stage

Move files to public

Move folder instead

Make if already exists

Move filees

Finished cleaning
 2020-06-12 09:41:09 -04:00
Marcel
4822150220 Merge branch 'cleanup' into 'master' 
remove unused files

See merge request veloren/veloren!1069
 2020-06-12 11:03:22 +00:00
Marcel Märtens
1435d8d6be remove unused files 2020-06-12 11:53:59 +02:00
Forest Anderson
7459a1e95a Merge branch 'xvar/clippy-fixes-many_single_char_names' into 'master' 
Fixed suppressed clippy warnings for #587 - many_single_char_names

See merge request veloren/veloren!1066
 2020-06-12 08:02:53 +00:00
Songtronix
058f9a8e32 Merge branch 'j-tai/update-readme-mac-builds' into 'master' 
Update README with Mac builds

See merge request veloren/veloren!1068
 2020-06-12 06:11:34 +00:00
James Tai
99b7762d2f
Update README with Mac builds 2020-06-11 21:58:44 -07:00
Marcel
2802e8f6b1 Merge branch 'xMAC94x/increase_compile_time' into 'master' 
dependency reduction:

See merge request veloren/veloren!1063
 2020-06-11 22:19:26 +00:00
Marcel
ea0d2a8f0e Merge branch 'quickfix-ci' into 'master' 
quickfix ci

See merge request veloren/veloren!1067
 2020-06-11 21:51:29 +00:00
Marcel Märtens
7d9b2ff9b6 quickfix ci 2020-06-11 22:37:49 +02:00
Ben Wallis
967fd9280b Fixed suppressed clippy warnings for #587 - many_single_char_names 2020-06-11 20:07:46 +01:00
Marcel Märtens
0e59ee901e dependency reduction: 
- authc no longer uses reqwest
 - image only supports PNG
 - replace routille with tiny_http
 - several other dependencies
 - cargo upgrade
 - following improvement was measured on R7 1700X:
   before:
    - cargo build: 3076.73s user / 4:45 total / 589 dependencies
    - cargo test: 6118.38s user / 7:30 total / 959 dependencies
   after:
    - cargo build: 2680.54s user / 4:05 total / 480 dependencies
    - cargo test: 5351.81s user / 7:04 total / 791 dependencies
 - added xMAC94x to CODEOWNERS for Cargo.toml, he will protect them from now on and hit people with evil looks ;)
 2020-06-11 20:55:34 +02:00
Songtronix
d612e875a6 Merge branch 'shandley/missing-audio-no-panic' into 'master' 
Use empty sound data when a sound file cannot be loaded

See merge request veloren/veloren!1053
 2020-06-11 12:53:24 +00:00
S Handley
eda2f14940 Use empty sound data when a sound file cannot be loaded 2020-06-11 12:53:24 +00:00
Songtronix
85ad70e862 Merge branch 'xvar/suppress-existing-clippy-warnings' into 'master' 
Suppress all clippy warnings and change CI config to fail on clippy warnings

See merge request veloren/veloren!1059
 2020-06-11 09:54:59 +00:00
Ben Wallis
950c62efc6 Suppressed all existing clippy warnings in preparation for fixes as part of #587 2020-06-10 22:01:42 +01:00