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

4155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
99546f7598 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
Ben Wallis
317e118560 Voxygen: Fixed weird window movement caused by moving the window with the cursor grabbed (#588) 2020-06-17 12:40:11 +01:00
Marcel
9887b9c70f 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
6342df7a1d first rule evaluated to never, switched that 2020-06-17 10:41:17 +02:00
Marcel
3f3b65efd5 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
d497e6febd Merge branch 'slipped/glidewield' into 'master' 
glidewield

See merge request veloren/veloren!1033
 2020-06-16 21:32:40 +00:00
Justin Shipsey
ead6494ca6 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
ce8980228e 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
d349c35d32 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
f638c01dcb 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
8b63fe7f15 added new flora 2020-06-15 16:39:21 +00:00
scott-c
61571a8e74 Adjust character state's energy regen 2020-06-15 18:13:47 +08:00
scott-c
4e0924368b Add changes to change log 2020-06-15 18:13:32 +08:00
scott-c
3ec8b7436d reset energy regen on ability use instead of wield 2020-06-15 18:12:30 +08:00
scott-c
ede5f6a48e automatically wield on secondary or ability3 2020-06-15 18:12:30 +08:00
Marcel
3fded3e7d1 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
160fadad1b 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
66817c7212 Fixes a bug where run sfx were being played during a roll. 2020-06-15 06:53:50 +10:00
Forest Anderson
d1dc5400d8 Added loadout replace test and documentation 
Finished documenting
 2020-06-14 16:16:53 -04:00
Forest Anderson
9716e0a5c8 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
03b8adb3e2 Fix pages stage to publish 2020-06-14 14:03:26 -04:00
Forest Anderson
6deaae8d74 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Forest Anderson
4cd8902017 Add unequip tests 2020-06-14 13:56:17 -04:00
Imbris
bc98de9a6c 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
816b47b63c 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
656fc95adc 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
6026399518 Add documentation for audio module. 2020-06-14 16:56:32 +00:00
Imbris
866bb8cc7f 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
3d28f97f51 Globally suppressed clippy lint option_map_unit_fn for #587 2020-06-14 16:48:07 +00:00
Imbris
b22af56ba9 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
234c293c27 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
b28e3a3949 Stop rendering 0 size images 2020-06-14 12:06:47 -04:00
Songtronix
5706dc6f91 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
391dcdff30 hotfix: panic trying to create a character 2020-06-14 12:40:08 +02:00
Songtronix
5e84f5c669 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
509ea38739 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Songtronix
a51e5c3033 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
c9f581a0f4
Add the network crate to sources in shell.nix 2020-06-14 06:29:11 +03:00
Monty Marz
8c3056d0ff 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
46e42cf8f2 fix broken main menu 2020-06-14 02:11:31 +02:00
jshipsey
67239809af log-chat-messages 2020-06-13 15:21:58 -04:00
Imbris
0f855ba2d8 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
dcf84b3ff5 Fixed suppressed clippy warnings for #587 - redundant_closure 2020-06-12 20:47:22 +01:00
Ben Wallis
52b0585135 Fixed suppressed clippy warnings for #587 - collapsible_if 2020-06-12 20:34:54 +01:00
Forest Anderson
0e8f76830f 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
d8f1d03021 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
6da880a63a remove unused files 2020-06-12 11:53:59 +02:00
Forest Anderson
decc386a6e 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
b91ea7d03a 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
93ac2a6d46
Update README with Mac builds 2020-06-11 21:58:44 -07:00