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

3649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yusuf Bera Ertan
a136dadf29 Add Turkish (Turkey) translation file 2020-03-31 19:52:45 +02:00
Imbris
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
Imbris
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
Imbris
2a126fff83 Upgrade vek version so that it actually uses the patch 2020-03-30 19:44:51 -04:00
Forest Anderson
b8a41215e4 Merge branch 'capucho/portuguese-translation' into 'master' 
Portuguese translation

See merge request veloren/veloren!863
 2020-03-30 21:29:41 +00:00
Capucho
b99f63a621 Make so that the resume button doesn't eject the mouse 2020-03-30 22:00:46 +01:00
Capucho
eb7b1a2ff4 Added a portuguese translation 2020-03-30 22:57:26 +02:00
Mckol
e05083852f Updated Cargo.lock to fix vek not compiling 2020-03-30 15:45:22 +02:00
AdamWhitehurst
1a239ad035 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-29 13:40:08 -07:00
AdamWhitehurst
1b2b0786e6 remove unused timed_combo 2020-03-29 13:40:03 -07:00
jshipsey
f0eb63f18b fireball damage tweaks/staff shooting anim 2020-03-29 14:00:05 -04:00
Songtronix
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
Jack Rubino
7224272c95 Add Italian translation 2020-03-29 13:40:57 +02:00
jshipsey
504814674b cleanup, tweak to triplestrike stage 1 2020-03-29 03:53:52 -04:00
Imbris
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
S Handley
a82c055fa6 Add Italian translation 2020-03-29 01:47:18 +00:00
AdamWhitehurst
46e8658525 triple_strike orientation 2020-03-28 13:50:42 -07:00
comfymattress
c5c6d1d3db Fixed Flowers and Grass items 2020-03-28 14:13:55 -05:00
Imbris
309e1df1e2 fix debug item rons 2020-03-28 14:50:05 -04:00
Pfauenauge90
a1c342edf0 small fix 2020-03-28 18:06:00 +01:00
Imbris
26c4341b97 Remove None variant fromm armor types 2020-03-28 03:51:24 -04:00
Imbris
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
jshipsey
83dd70af26 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 23:59:45 -04:00
jshipsey
2924d6dd6b proper bow animation 2020-03-27 23:59:05 -04:00
Imbris
4f3bb291a1 Combine dir and force in KnockUp and ApplyForce events 2020-03-27 22:19:23 -04:00
Imbris
94f44b0b32 Create Dir type for better enforcement of non NaN, normalized representations of directions 2020-03-27 22:02:07 -04:00
Imbris
8edbea5587 split toggle events 2020-03-27 21:32:30 -04:00
Justin Shipsey
7de4dd5269 Merge branch 'capucho/free-look-improvements' into 'master' 
Free look improvements

See merge request veloren/veloren!865
 2020-03-27 22:09:20 +00:00
Capucho
41b6404806 Fix the wrong default keybind change 2020-03-27 19:36:20 +00:00
Pfauenauge90
7e81d34dba Update headband-0.vox 2020-03-27 20:00:16 +01:00
Capucho
bba43dc9c8 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
AdamWhitehurst
94ec0cab41 prevent transition if pressing too early & timed 2020-03-27 11:17:34 -07:00
AdamWhitehurst
a4cdafc6f5 prevent holding to time combo 2020-03-27 11:08:10 -07:00
AdamWhitehurst
53c01a8572 Undo mistake, axe ability corrected. 
Axe m2 cost 0 -> 100
Axe m2 dmg 8 -> 12
 2020-03-27 11:07:21 -07:00
AdamWhitehurst
5f2ac7885d Axe m2 dmg 10 -> 15 
Axe m2 cost 0 -> 50
 2020-03-27 11:03:07 -07:00
AdamWhitehurst
298e28b7d9 Add triple_strike anims for axe and hammer 2020-03-27 11:00:58 -07:00
AdamWhitehurst
07c35765f0 Add timing window duration to triple strike 2020-03-27 10:43:18 -07:00
AdamWhitehurst
ecbadc3ba9 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 10:40:19 -07:00
AdamWhitehurst
e0f567dbb7 add triple strike timing 2020-03-27 10:40:15 -07:00
timokoesters
14b3d8970a Increase movement speed, make npcs slower than players 2020-03-27 18:39:26 +01:00
Pfauenauge90
38eae21ade fire bolt visuals 2020-03-27 18:31:45 +01:00
timokoesters
d32ec6ea40 Fix char selection not showing tools 2020-03-27 18:17:41 +01:00
timokoesters
3b572aeb65 Make apples great again 2020-03-27 17:51:35 +01:00
Pfauenauge90
369e58d807 update help screen 2020-03-27 17:50:34 +01:00
Joshua Barretto
3fe815875d Merge branch 'zesterer/small-fixes' into 'master' 
Water shader improvements

See merge request veloren/veloren!862
 2020-03-27 16:14:38 +00:00
timokoesters
431bc8a069 Projectile hits regenerate energy 2020-03-27 17:07:19 +01:00
AdamWhitehurst
f2fdb028a7 triples strike knockback 15.0 -> 16.0 2020-03-27 08:26:53 -07:00
AdamWhitehurst
08040aa3bd triple_strike knockback 20.0 -> 15.0 2020-03-27 08:17:17 -07:00
Joshua Barretto
bb67638df5 Better water shaders 2020-03-27 15:13:36 +00:00
Pfauenauge90
7de2fdcf09 remapped default look key, removed unused keys 2020-03-27 16:09:51 +01:00