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,160 Commits 151 Branches 18 Tags 2.1 GiB
6da7a11d33
Commit Graph

4160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wallis
6da7a11d33 Fixed suppressed clippy warnings for #587 - clone_on_copy 2020-06-18 22:25:48 +01:00
Marcel
babf452686 Merge branch 'xvar/fix-server-crash-on-high-char-lvl-login' into 'master' 
Server: Fixed panic on extremely high level character login due to exp overflow (#597)

See merge request veloren/veloren!1091
 2020-06-18 20:24:49 +00:00
Ben Wallis
54de646bb3 Server: Fixed panic on extremely high level character login due to exp overflow (#597) 2020-06-18 20:45:37 +01:00
Justin Shipsey
eeb73fd534 Merge branch 'scott-c/fix-swap-loadout' into 'master' 
Remove wield requirement to swap loadout

See merge request veloren/veloren!1089
 2020-06-18 13:31:17 +00:00
Marcel
d2f8372447 Merge branch 'xvar/fix-window-moving-bug' into 'master' 
Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588)

See merge request veloren/veloren!1088
 2020-06-17 17:47:33 +00:00
scott-c
88d68df2c0 Remove wield requirement to swap loadout 2020-06-17 21:34:58 +08:00
Ben Wallis
4a4a106232 Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588) 2020-06-17 12:40:11 +01:00
Marcel
71a49b0e22 Merge branch 'fix-ci' into 'master' 
first rule evaluated to never, switched that

See merge request veloren/veloren!1086
 2020-06-17 09:09:09 +00:00
Marcel Märtens
0d34c2a10b first rule evaluated to never, switched that 2020-06-17 10:41:17 +02:00
Marcel
06a2e006b7 Merge branch 'allow_manual_ci' into 'master' 
allow release to be build manually and remove the extra jobs for it

See merge request veloren/veloren!1070
 2020-06-17 08:30:50 +00:00
Justin Shipsey
86d7fc3f7c Merge branch 'slipped/glidewield' into 'master' 
glidewield

See merge request veloren/veloren!1033
 2020-06-16 21:32:40 +00:00
Justin Shipsey
2f896849d4 Wield glider instead of weapon when attempting glide wield, change behavior when running into walls to not drop out of gliding 2020-06-16 21:32:39 +00:00
Marcel Märtens
b9344ffeb7 CI cleanup 
- switching more to rules syntax
  - clean up some templates
  - EITHER optional builds or build builds
  - ordering
 2020-06-16 12:45:35 +02:00
Imbris
c22f9530e4 Merge branch 'scott-c/wield-changes' into 'master' 
Scott c/wield changes

See merge request veloren/veloren!1072
 2020-06-15 20:51:35 +00:00
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