Commit Graph

4056 Commits

Author SHA1 Message Date
198b8a4994 Merge branch 'olexorus/change_falldmg' into 'master'
Improve fall damage calculation

See merge request veloren/veloren!902
2020-04-10 11:04:18 +00:00
7c0a3bafe6 Change how fall damage works 2020-04-10 12:03:15 +02:00
31db87040a Merge branch 'carbonhell/missing_mouse_event' into 'master'
Fixes mouse_input event not being pushed everytime

See merge request veloren/veloren!898
2020-04-10 04:28:17 +00:00
a60f4ea4e2 Merge branch 'treeco/fix-tree-artefact' into 'master'
Fixed leaf lerp doing weird things

See merge request veloren/veloren!899
2020-04-09 21:39:45 +00:00
542491c48d Fixed leaf lerp doing weird things 2020-04-09 21:03:17 +01:00
c0c92c4259 Fixes mouse_input event not being pushed everytime 2020-04-09 18:43:12 +02:00
ead469a411 Merge branch 'xMAC94x/small-fixes' into 'master'
Install meta package librust-backtrace+libbacktrace-dev in debian, this might...

See merge request veloren/veloren!896
2020-04-09 12:35:02 +00:00
342e46afcb Install meta package librust-backtrace+libbacktrace-dev in debian, this might fix the problem that we dont have server backtraces.
According to its documentation its specifically tailed down to deliver everything for rust backtrace crate:
https://packages.debian.org/buster/librust-backtrace+libbacktrace-dev
The official requierement would be install `cc` and `ar`, where `ar` is in binutils, and `cc` seems to be in gcc-8 or a subpackage of it. Both would requiere about 100MB additionally for backtraces, while this package should requiere additional 8MB
2020-04-09 11:22:34 +00:00
9427d5154b Merge branch 'carbonhell/cursor_grabbed_fix' into 'master'
Fixes mouseinput event ignoring cursor_grabbed being true

See merge request veloren/veloren!895
2020-04-08 23:03:47 +00:00
20ec77eeb0 Fixes mouseinput event ignoring cursor_grabbed being true 2020-04-08 23:46:42 +02:00
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
b6078d832a Fixed the player being rendered after dying 2020-04-08 21:28:33 +01:00
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
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
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
8f6686adc1 Fix the problems of players walking over water with dithering 2020-04-07 22:50:01 +00:00
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
84b1abdfcb Prevent projectiles from hitting their owners 2020-04-06 23:08:54 +02:00
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
07242644ca Small UI fixes 2020-04-04 21:51:06 +00:00
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
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
a21ae27a77 Add player transparency and silhouette 2020-04-04 19:36:55 +00:00
d36c2cac99 Trim newlines from password when pressing enter 2020-04-04 13:55:25 -04:00
e0e86de21d Merge branch 'de_translation' into 'master'
German Translation

See merge request veloren/veloren!884
2020-04-04 14:39:54 +00:00
1af82604b5 German Translation 2020-04-04 14:39:54 +00:00
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
d62770fd6e Update Turkish translation to include new strings 2020-04-02 16:46:59 +00:00
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
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
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
3e4b40380f fix: Restore run SFX when the character is using a weapon other than the sword. 2020-04-02 14:47:26 +11:00
4652ae2f03 Show errors loading individual files during glob asset loading 2020-04-01 20:37:23 -04:00
831d7c77a6 Make Asset impls avoid panics when parsing fails 2020-04-01 20:06:15 -04:00
5ed77b5054 Fix security 2020-04-01 20:03:15 -04:00
f34d4b379e Merge branch 'combat' into 'master'
Combat rewrite

See merge request veloren/veloren!855
2020-04-01 21:29:19 +00:00
97148cb6bb Merge branch 'master' into 'combat'
# Conflicts:
#   CHANGELOG.md
2020-04-01 20:42:27 +00:00
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
b256e374a4 Update CHANGELOG.md 2020-04-01 19:22:05 +02:00
83c7a944da fmt 2020-04-01 11:52:44 -04:00
87a82bb59a Fix tests 2020-04-01 11:41:26 -04:00
1ea2abd247 better timing const name,
timing_delay 400 -> 350
2020-04-01 08:40:25 -07:00
2b10797db1 refactor transition logic (thx imbris) 2020-04-01 08:39:18 -07:00
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
f515cc70be Documentation for swap_loadout 2020-04-01 07:30:18 -07:00
9ad9a24e22 Remove unused KnockUp LocalEvent (use ApplyForce) 2020-04-01 07:30:06 -07:00
0c4d428298 remove unnecessary line 2020-04-01 07:10:35 -07:00
e04fdd715e expose and use blocking consts 2020-04-01 07:07:10 -07:00
237393993f triple_strike combo timing window 600 -> 400 2020-04-01 06:43:28 -07:00
95bc486f7c Roll move_dir handling 1.5 -> 0.25 2020-04-01 06:42:56 -07:00