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 2.1 GiB
ead469a411
Commit Graph

3550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Imbris
b3791a2b4e Upgrade vek version so that it actually uses the patch 2020-03-30 19:44:51 -04:00
Forest Anderson
d583a7e91b Merge branch 'capucho/portuguese-translation' into 'master' 
Portuguese translation

See merge request veloren/veloren!863
 2020-03-30 21:29:41 +00:00
Capucho
3f1f9b9ab0 Make so that the resume button doesn't eject the mouse 2020-03-30 22:00:46 +01:00
Capucho
abc1a041fa Added a portuguese translation 2020-03-30 22:57:26 +02:00
Mckol
aa59e8715d Updated Cargo.lock to fix vek not compiling 2020-03-30 15:45:22 +02:00
AdamWhitehurst
d3b99fc026 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-29 13:40:08 -07:00
AdamWhitehurst
dcc9d44b1c remove unused timed_combo 2020-03-29 13:40:03 -07:00
jshipsey
ff56e5f9f9 fireball damage tweaks/staff shooting anim 2020-03-29 14:00:05 -04:00
Songtronix
2024718ad1 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
bb293c4442 Add Italian translation 2020-03-29 13:40:57 +02:00
jshipsey
fa54c90558 cleanup, tweak to triplestrike stage 1 2020-03-29 03:53:52 -04:00
Imbris
5ef8346ce2 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
1cb93b92ed Add Italian translation 2020-03-29 01:47:18 +00:00
AdamWhitehurst
86b0b8f644 triple_strike orientation 2020-03-28 13:50:42 -07:00
comfymattress
ae975a67f4 Fixed Flowers and Grass items 2020-03-28 14:13:55 -05:00
Imbris
6bd20c64f8 fix debug item rons 2020-03-28 14:50:05 -04:00
Pfauenauge90
e3a5051b52 small fix 2020-03-28 18:06:00 +01:00
Imbris
d3b5b1e637 Remove None variant fromm armor types 2020-03-28 03:51:24 -04:00
Imbris
f551c4a2c5 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
8fd774f21a Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 23:59:45 -04:00
jshipsey
49ba196671 proper bow animation 2020-03-27 23:59:05 -04:00
Imbris
ce0f54e9d6 Combine dir and force in KnockUp and ApplyForce events 2020-03-27 22:19:23 -04:00
Imbris
ba3fa16c33 Create Dir type for better enforcement of non NaN, normalized representations of directions 2020-03-27 22:02:07 -04:00
Imbris
df5a7ef0e3 split toggle events 2020-03-27 21:32:30 -04:00
Justin Shipsey
976043df83 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
15d2a6d3dc Fix the wrong default keybind change 2020-03-27 19:36:20 +00:00
Pfauenauge90
7d1f779c28 Update headband-0.vox 2020-03-27 20:00:16 +01:00
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
AdamWhitehurst
1d51f8fc0f prevent transition if pressing too early & timed 2020-03-27 11:17:34 -07:00
AdamWhitehurst
e4f2bf7ebf prevent holding to time combo 2020-03-27 11:08:10 -07:00
AdamWhitehurst
02b29efbfc Undo mistake, axe ability corrected. 
Axe m2 cost 0 -> 100
Axe m2 dmg 8 -> 12
 2020-03-27 11:07:21 -07:00
AdamWhitehurst
233595737e Axe m2 dmg 10 -> 15 
Axe m2 cost 0 -> 50
 2020-03-27 11:03:07 -07:00
AdamWhitehurst
d774091fa4 Add triple_strike anims for axe and hammer 2020-03-27 11:00:58 -07:00
AdamWhitehurst
8eb233bdbc Add timing window duration to triple strike 2020-03-27 10:43:18 -07:00
AdamWhitehurst
01264ce167 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 10:40:19 -07:00
AdamWhitehurst
2ffac59aa3 add triple strike timing 2020-03-27 10:40:15 -07:00
timokoesters
c6e635c511 Increase movement speed, make npcs slower than players 2020-03-27 18:39:26 +01:00
Pfauenauge90
0b3fb2dd3c fire bolt visuals 2020-03-27 18:31:45 +01:00
timokoesters
6fe5c5724c Fix char selection not showing tools 2020-03-27 18:17:41 +01:00
timokoesters
6fd3339b75 Make apples great again 2020-03-27 17:51:35 +01:00
Pfauenauge90
c3a4f897da update help screen 2020-03-27 17:50:34 +01:00
Joshua Barretto
fe07156531 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
ad0314b4f5 Projectile hits regenerate energy 2020-03-27 17:07:19 +01:00
AdamWhitehurst
4bfc934772 triples strike knockback 15.0 -> 16.0 2020-03-27 08:26:53 -07:00
AdamWhitehurst
31760d220a triple_strike knockback 20.0 -> 15.0 2020-03-27 08:17:17 -07:00
Joshua Barretto
3a989f061f Better water shaders 2020-03-27 15:13:36 +00:00