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

3550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
a45d29a49a 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
Marcel
c571b83c18 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
Monty Marz
f90c602c41 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
Carbonhell
4ff63345d8 Fixes mouseinput event ignoring cursor_grabbed being true 2020-04-08 23:46:42 +02:00
Joshua Barretto
c0fc0c2186 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
5a3ca149b4 Fixed the player being rendered after dying 2020-04-08 21:28:33 +01:00
Songtronix
45b8dd921e 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
2a93c57fb0 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Imbris
1c1eed6c26 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
74eae70662 Fix the problems of players walking over water with dithering 2020-04-07 22:50:01 +00:00
Forest Anderson
ab1f9af297 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
9c96e6fb3b Prevent projectiles from hitting their owners 2020-04-06 23:08:54 +02:00
Monty Marz
a0a1402a9e 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
721c7e50e1 Small UI fixes 2020-04-04 21:51:06 +00:00
Imbris
ed5ef03952 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
e2b5c48b12 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
9b85882f9a Add player transparency and silhouette 2020-04-04 19:36:55 +00:00
Imbris
d6004d7cdc Trim newlines from password when pressing enter 2020-04-04 13:55:25 -04:00
Monty Marz
e0c5157e6c Merge branch 'de_translation' into 'master' 
German Translation

See merge request veloren/veloren!884
 2020-04-04 14:39:54 +00:00
Monty Marz
d524eacdee German Translation 2020-04-04 14:39:54 +00:00
Songtronix
6e6fd54731 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
535fe4325f Update Turkish translation to include new strings 2020-04-02 16:46:59 +00:00
Songtronix
039355c0f8 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
6787509a43 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
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
Shane Handley
0f71fe2bdc fix: Restore run SFX when the character is using a weapon other than the sword. 2020-04-02 14:47:26 +11:00
Imbris
a8fff80b0c Show errors loading individual files during glob asset loading 2020-04-01 20:37:23 -04:00
Imbris
053ec2d874 Make Asset impls avoid panics when parsing fails 2020-04-01 20:06:15 -04:00
Imbris
f02aa99b8e Fix security 2020-04-01 20:03:15 -04:00
Imbris
26502fe9f7 Merge branch 'combat' into 'master' 
Combat rewrite

See merge request veloren/veloren!855
 2020-04-01 21:29:19 +00:00
Imbris
baf973a32a Merge branch 'master' into 'combat' 
# Conflicts:
#   CHANGELOG.md
 2020-04-01 20:42:27 +00:00
Songtronix
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
Pfauenauge90
5a857f04b6 Update CHANGELOG.md 2020-04-01 19:22:05 +02:00
Imbris
7f45873ff6 fmt 2020-04-01 11:52:44 -04:00
Imbris
bfa85e427a Fix tests 2020-04-01 11:41:26 -04:00
AdamWhitehurst
6f4736b179 better timing const name, 
timing_delay 400 -> 350
 2020-04-01 08:40:25 -07:00
AdamWhitehurst
cb8a49a5e3 refactor transition logic (thx imbris) 2020-04-01 08:39:18 -07:00
Imbris
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
AdamWhitehurst
6d77152f2b Documentation for swap_loadout 2020-04-01 07:30:18 -07:00
AdamWhitehurst
bf870b357e Remove unused KnockUp LocalEvent (use ApplyForce) 2020-04-01 07:30:06 -07:00
AdamWhitehurst
15d30d061c remove unnecessary line 2020-04-01 07:10:35 -07:00
AdamWhitehurst
ce9716c97a expose and use blocking consts 2020-04-01 07:07:10 -07:00
AdamWhitehurst
43cf27434e triple_strike combo timing window 600 -> 400 2020-04-01 06:43:28 -07:00
AdamWhitehurst
0b324993bc Roll move_dir handling 1.5 -> 0.25 2020-04-01 06:42:56 -07:00
AdamWhitehurst
3f0bcb3d9c Roll duration 500 -> 700ms 2020-04-01 06:24:02 -07:00
AdamWhitehurst
626427770b Roll speed 15.0 -> 25.0 2020-04-01 06:23:26 -07:00
Imbris
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
Marli Frost
74e9adac39
feat: configure audio output using an enum 2020-03-31 22:29:30 +01:00
Marli Frost
b5d4e7c89b
fix: avoid rodio API when audio is disabled 2020-03-31 21:28:09 +01:00
Marli Frost
dd673a3bcc
allow the game to start without an audio device 2020-03-31 21:27:55 +01:00