Joshua Barretto
|
1567e77a39
|
Merge branch 'capucho/player-dead-render-fix' into 'master'
Fixed the player being rendered after dying
See merge request veloren/veloren!894
|
2020-04-08 21:31:59 +00:00 |
|
Capucho
|
b6078d832a
|
Fixed the player being rendered after dying
|
2020-04-08 21:28:33 +01:00 |
|
Songtronix
|
6353367577
|
Merge branch 'carbonhell/keybindings' into 'master'
Carbonhell/keybindings
Closes #178
See merge request veloren/veloren!886
|
2020-04-08 17:36:41 +00:00 |
|
Carbonhell
|
198c875559
|
Carbonhell/keybindings
|
2020-04-08 17:36:37 +00:00 |
|
Imbris
|
611359e52f
|
Merge branch 'capucho/player-effects' into 'master'
Fix the problems of players walking over water with dithering
See merge request veloren/veloren!890
|
2020-04-07 22:50:02 +00:00 |
|
Capucho
|
8f6686adc1
|
Fix the problems of players walking over water with dithering
|
2020-04-07 22:50:01 +00:00 |
|
Forest Anderson
|
dea7fd4549
|
Merge branch 'qutrin/projectile-betrayal-fix' into 'master'
Prevent arrows from hitting their owners
Closes #383
See merge request veloren/veloren!891
|
2020-04-06 22:19:02 +00:00 |
|
Piotr Korgól
|
84b1abdfcb
|
Prevent projectiles from hitting their owners
|
2020-04-06 23:08:54 +02:00 |
|
Monty Marz
|
32db0df208
|
Merge branch 'pfau/small_ui_fixes' into 'master'
Small UI fixes
See merge request veloren/veloren!888
|
2020-04-04 21:51:06 +00:00 |
|
Monty Marz
|
07242644ca
|
Small UI fixes
|
2020-04-04 21:51:06 +00:00 |
|
Imbris
|
e2c818b556
|
Merge branch 'imbris/fix' into 'master'
Remove newline from password when pressing enter
See merge request veloren/veloren!887
|
2020-04-04 21:45:30 +00:00 |
|
Joshua Barretto
|
7d0efd0b0b
|
Merge branch 'capucho/player-effects' into 'master'
Add player transparency and silhouette
See merge request veloren/veloren!881
|
2020-04-04 19:36:56 +00:00 |
|
Capucho
|
a21ae27a77
|
Add player transparency and silhouette
|
2020-04-04 19:36:55 +00:00 |
|
Imbris
|
d36c2cac99
|
Trim newlines from password when pressing enter
|
2020-04-04 13:55:25 -04:00 |
|
Monty Marz
|
e0e86de21d
|
Merge branch 'de_translation' into 'master'
German Translation
See merge request veloren/veloren!884
|
2020-04-04 14:39:54 +00:00 |
|
Monty Marz
|
1af82604b5
|
German Translation
|
2020-04-04 14:39:54 +00:00 |
|
Songtronix
|
22f3319b44
|
Merge branch 'yusdacra/update-turkish-translation' into 'master'
Update Turkish translation to include new strings
See merge request veloren/veloren!878
|
2020-04-02 16:46:59 +00:00 |
|
Yusuf Bera Ertan
|
d62770fd6e
|
Update Turkish translation to include new strings
|
2020-04-02 16:46:59 +00:00 |
|
Songtronix
|
4fdf6896ab
|
Merge branch 'shandley/fix-sfx' into 'master'
Fix run SFX
See merge request veloren/veloren!880
|
2020-04-02 07:05:33 +00:00 |
|
Songtronix
|
e64462ad2e
|
Merge branch 'imbris/security' into 'master'
Update deps with security issues
See merge request veloren/veloren!879
|
2020-04-02 05:47:50 +00:00 |
|
Songtronix
|
7920830d8c
|
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 |
|
Shane Handley
|
3e4b40380f
|
fix: Restore run SFX when the character is using a weapon other than the sword.
|
2020-04-02 14:47:26 +11:00 |
|
Imbris
|
4652ae2f03
|
Show errors loading individual files during glob asset loading
|
2020-04-01 20:37:23 -04:00 |
|
Imbris
|
831d7c77a6
|
Make Asset impls avoid panics when parsing fails
|
2020-04-01 20:06:15 -04:00 |
|
Imbris
|
5ed77b5054
|
Fix security
|
2020-04-01 20:03:15 -04:00 |
|
Imbris
|
f34d4b379e
|
Merge branch 'combat' into 'master'
Combat rewrite
See merge request veloren/veloren!855
|
2020-04-01 21:29:19 +00:00 |
|
Imbris
|
97148cb6bb
|
Merge branch 'master' into 'combat'
# Conflicts:
# CHANGELOG.md
|
2020-04-01 20:42:27 +00:00 |
|
Songtronix
|
9de62b3164
|
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 |
|
Pfauenauge90
|
b256e374a4
|
Update CHANGELOG.md
|
2020-04-01 19:22:05 +02:00 |
|
Imbris
|
83c7a944da
|
fmt
|
2020-04-01 11:52:44 -04:00 |
|
Imbris
|
87a82bb59a
|
Fix tests
|
2020-04-01 11:41:26 -04:00 |
|
AdamWhitehurst
|
1ea2abd247
|
better timing const name,
timing_delay 400 -> 350
|
2020-04-01 08:40:25 -07:00 |
|
AdamWhitehurst
|
2b10797db1
|
refactor transition logic (thx imbris)
|
2020-04-01 08:39:18 -07:00 |
|
Imbris
|
a73d010f7b
|
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 |
|
AdamWhitehurst
|
f515cc70be
|
Documentation for swap_loadout
|
2020-04-01 07:30:18 -07:00 |
|
AdamWhitehurst
|
9ad9a24e22
|
Remove unused KnockUp LocalEvent (use ApplyForce)
|
2020-04-01 07:30:06 -07:00 |
|
AdamWhitehurst
|
0c4d428298
|
remove unnecessary line
|
2020-04-01 07:10:35 -07:00 |
|
AdamWhitehurst
|
e04fdd715e
|
expose and use blocking consts
|
2020-04-01 07:07:10 -07:00 |
|
AdamWhitehurst
|
237393993f
|
triple_strike combo timing window 600 -> 400
|
2020-04-01 06:43:28 -07:00 |
|
AdamWhitehurst
|
95bc486f7c
|
Roll move_dir handling 1.5 -> 0.25
|
2020-04-01 06:42:56 -07:00 |
|
AdamWhitehurst
|
56fab6db09
|
Roll duration 500 -> 700ms
|
2020-04-01 06:24:02 -07:00 |
|
AdamWhitehurst
|
89f441ae2c
|
Roll speed 15.0 -> 25.0
|
2020-04-01 06:23:26 -07:00 |
|
Imbris
|
0d6e3028da
|
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 |
|
Marli Frost
|
3806f08eb0
|
feat: configure audio output using an enum
|
2020-03-31 22:29:30 +01:00 |
|
Marli Frost
|
a83f09bd60
|
fix: avoid rodio API when audio is disabled
|
2020-03-31 21:28:09 +01:00 |
|
Marli Frost
|
c82d1b9316
|
allow the game to start without an audio device
|
2020-03-31 21:27:55 +01:00 |
|
Imbris
|
3e768349be
|
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 |
|
Yusuf Bera Ertan
|
c5331cbabe
|
Add Turkish (Turkey) translation file
|
2020-03-31 19:52:45 +02:00 |
|
Imbris
|
508def2701
|
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 |
|
Imbris
|
7b6c6111f0
|
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 |
|