|
|
4c3732d20c
|
Merge branch 'imbris/asset-errors' into 'master'
Make Asset impls avoid panics when parsing fails
See merge request veloren/veloren!869
|
2020-04-02 05:47:28 +00:00 |
|
|
|
a8fff80b0c
|
Show errors loading individual files during glob asset loading
|
2020-04-01 20:37:23 -04:00 |
|
|
|
053ec2d874
|
Make Asset impls avoid panics when parsing fails
|
2020-04-01 20:06:15 -04:00 |
|
|
|
26502fe9f7
|
Merge branch 'combat' into 'master'
Combat rewrite
See merge request veloren/veloren!855
|
2020-04-01 21:29:19 +00:00 |
|
|
|
baf973a32a
|
Merge branch 'master' into 'combat'
# Conflicts:
# CHANGELOG.md
|
2020-04-01 20:42:27 +00:00 |
|
|
|
59492dec0b
|
Merge branch 'Plecra/veloren-fix-windows-tests' into 'master'
fix: connect to LOCALHOST address in tests
See merge request veloren/veloren!875
|
2020-04-01 17:39:58 +00:00 |
|
|
|
5a857f04b6
|
Update CHANGELOG.md
|
2020-04-01 19:22:05 +02:00 |
|
|
|
7f45873ff6
|
fmt
|
2020-04-01 11:52:44 -04:00 |
|
|
|
bfa85e427a
|
Fix tests
|
2020-04-01 11:41:26 -04:00 |
|
|
|
6f4736b179
|
better timing const name,
timing_delay 400 -> 350
|
2020-04-01 08:40:25 -07:00 |
|
|
|
cb8a49a5e3
|
refactor transition logic (thx imbris)
|
2020-04-01 08:39:18 -07:00 |
|
|
|
29672a00e0
|
Point to newly released vek, add todo to reconsider empty item, remove uneeded ori slerp, remove agent from character behavior, add todos to combat sys, check if entities still exist before possessing & if possessed entity has a loadout move the active item into the second item space
|
2020-04-01 11:15:14 -04:00 |
|
|
|
6d77152f2b
|
Documentation for swap_loadout
|
2020-04-01 07:30:18 -07:00 |
|
|
|
bf870b357e
|
Remove unused KnockUp LocalEvent (use ApplyForce)
|
2020-04-01 07:30:06 -07:00 |
|
|
|
15d30d061c
|
remove unnecessary line
|
2020-04-01 07:10:35 -07:00 |
|
|
|
ce9716c97a
|
expose and use blocking consts
|
2020-04-01 07:07:10 -07:00 |
|
|
|
43cf27434e
|
triple_strike combo timing window 600 -> 400
|
2020-04-01 06:43:28 -07:00 |
|
|
|
0b324993bc
|
Roll move_dir handling 1.5 -> 0.25
|
2020-04-01 06:42:56 -07:00 |
|
|
|
3f0bcb3d9c
|
Roll duration 500 -> 700ms
|
2020-04-01 06:24:02 -07:00 |
|
|
|
626427770b
|
Roll speed 15.0 -> 25.0
|
2020-04-01 06:23:26 -07:00 |
|
|
|
f8f0f4fe4c
|
Merge branch 'audioless' into 'master'
Allow the game to start without an audio device
See merge request veloren/veloren!874
|
2020-04-01 11:41:29 +00:00 |
|
|
|
74e9adac39
|
feat: configure audio output using an enum
|
2020-03-31 22:29:30 +01:00 |
|
|
|
b5d4e7c89b
|
fix: avoid rodio API when audio is disabled
|
2020-03-31 21:28:09 +01:00 |
|
|
|
dd673a3bcc
|
allow the game to start without an audio device
|
2020-03-31 21:27:55 +01:00 |
|
|
|
c5c66d2eb9
|
Merge branch 'yusdacra/add-turkish-translation' into 'master'
Add Turkish (Turkey) translation
See merge request veloren/veloren!864
|
2020-03-31 19:24:08 +00:00 |
|
|
|
a136dadf29
|
Add Turkish (Turkey) translation file
|
2020-03-31 19:52:45 +02:00 |
|
|
|
37a39ac38d
|
Merge branch 'capucho/resume-do-not-eject-cursor' into 'master'
Don't eject mouse on resume
Closes #307
See merge request veloren/veloren!873
|
2020-03-31 16:50:45 +00:00 |
|
|
|
c85ae65219
|
Merge branch 'capucho/password_cursor_fix' into 'master'
Fix the cursor lagging behind on the password field
See merge request veloren/veloren!859
|
2020-03-31 16:39:56 +00:00 |
|
|
|
2a126fff83
|
Upgrade vek version so that it actually uses the patch
|
2020-03-30 19:44:51 -04:00 |
|
|
|
b8a41215e4
|
Merge branch 'capucho/portuguese-translation' into 'master'
Portuguese translation
See merge request veloren/veloren!863
|
2020-03-30 21:29:41 +00:00 |
|
|
|
b99f63a621
|
Make so that the resume button doesn't eject the mouse
|
2020-03-30 22:00:46 +01:00 |
|
|
|
eb7b1a2ff4
|
Added a portuguese translation
|
2020-03-30 22:57:26 +02:00 |
|
|
|
e05083852f
|
Updated Cargo.lock to fix vek not compiling
|
2020-03-30 15:45:22 +02:00 |
|
|
|
1a239ad035
|
Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat
|
2020-03-29 13:40:08 -07:00 |
|
|
|
1b2b0786e6
|
remove unused timed_combo
|
2020-03-29 13:40:03 -07:00 |
|
|
|
f0eb63f18b
|
fireball damage tweaks/staff shooting anim
|
2020-03-29 14:00:05 -04:00 |
|
|
|
4d959df166
|
Merge branch 'fix_italian_localization' into 'master'
Fix Italian translation
See merge request veloren/veloren!870
|
2020-03-29 13:00:39 +00:00 |
|
|
|
7224272c95
|
Add Italian translation
|
2020-03-29 13:40:57 +02:00 |
|
|
|
504814674b
|
cleanup, tweak to triplestrike stage 1
|
2020-03-29 03:53:52 -04:00 |
|
|
|
4212199648
|
Merge branch 'jackrubino/italian-translation' into 'master'
Add Italian translation
See merge request veloren/veloren!868
|
2020-03-29 01:47:18 +00:00 |
|
|
|
a82c055fa6
|
Add Italian translation
|
2020-03-29 01:47:18 +00:00 |
|
|
|
46e8658525
|
triple_strike orientation
|
2020-03-28 13:50:42 -07:00 |
|
|
|
c5c6d1d3db
|
Fixed Flowers and Grass items
|
2020-03-28 14:13:55 -05:00 |
|
|
|
309e1df1e2
|
fix debug item rons
|
2020-03-28 14:50:05 -04:00 |
|
|
|
a1c342edf0
|
small fix
|
2020-03-28 18:06:00 +01:00 |
|
|
|
26c4341b97
|
Remove None variant fromm armor types
|
2020-03-28 03:51:24 -04:00 |
|
|
|
8a71452135
|
Move armor types to a new location, use a const for the moving cutoff in voxygen anims
|
2020-03-28 01:52:12 -04:00 |
|
|
|
83dd70af26
|
Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat
|
2020-03-27 23:59:45 -04:00 |
|
|
|
2924d6dd6b
|
proper bow animation
|
2020-03-27 23:59:05 -04:00 |
|
|
|
4f3bb291a1
|
Combine dir and force in KnockUp and ApplyForce events
|
2020-03-27 22:19:23 -04:00 |
|
