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

2215 Commits

Author SHA1 Message Date
Marcel
b70fc67099 Merge branch 'juliancoffee/i18n_formatting' into 'master' 
(en) i18n cleaning

See merge request veloren/veloren!2798
 2021-09-01 22:47:36 +00:00
juliancoffee
2f6d029d44 (en) i18n cleaning 2021-09-01 19:38:59 +03:00
Imbris
0b922deed6 Merge branch 'capucho/naga' into 'master' 
Replace shaderc with naga

See merge request veloren/veloren!2749
 2021-08-31 22:38:17 +00:00
João Capucho
0476f9ce0b
Replace shaderc with naga 2021-08-31 22:53:10 +01:00
Joshua Barretto
caebc891f8 Removed unused tree assets 2021-08-31 10:15:52 +01:00
Monty Marz
2e5414d3e0 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Joshua Barretto
f6da0ca2f0 Improved giant trees 2021-08-30 00:03:16 +01:00
Joshua Barretto
32807f6019 Smaller acacia 2021-08-29 20:38:40 +01:00
Joshua Barretto
bfbcb8bb57 More tree variety 2021-08-29 18:38:34 +01:00
Joshua Barretto
7d23b9c9ea More spot detailing 2021-08-29 14:54:01 +01:00
Joshua Barretto
a6a8a8ae48 Improved giant trees 2021-08-29 14:37:11 +01:00
Joshua Barretto
2e72d97b5e Multiple color gradient options 2021-08-29 13:57:36 +01:00
Joshua Barretto
d10ecc0ddf Better spot density 2021-08-29 13:08:13 +01:00
Joshua Barretto
51d8b14790 Added spot loot 2021-08-29 12:50:35 +01:00
Joshua Barretto
d22db59274 More spots 2021-08-28 16:48:34 +01:00
Monty Marz
70ddb8ec14 witch lantern 2021-08-28 14:53:31 +01:00
Monty Marz
6e36d2e6c3 witch kit 2021-08-28 14:53:31 +01:00
Monty Marz
b501c06471 emergency single voxel window fix 2021-08-28 14:53:30 +01:00
Monty Marz
5e9782b288 fixes 2021-08-28 14:53:30 +01:00
Monty Marz
57746d7083 fixes 2021-08-28 14:53:30 +01:00
Monty Marz
f3b56796ed witch stuff 2021-08-28 14:53:30 +01:00
Monty Marz
df46f5bcb0 lion rock 
fixes
 2021-08-28 14:53:30 +01:00
Monty Marz
0594ffc4ae More spots 2021-08-28 14:53:30 +01:00
Gemu Peachems
1c1a59b9ad Gnarling Totem 2021-08-28 14:53:30 +01:00
Monty Marz
4ed8f86afc dwarf grave 2021-08-28 14:53:30 +01:00
Joshua Barretto
7b5b2e632c sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
a66f1922aa More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Joshua Barretto
0f1d42708c Test spot entity spawning 2021-08-28 14:53:30 +01:00
Sam
ae17cc5358 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Marcel
8777d12afd Merge branch 'alxly/update-ru_RU' into 'master' 
alxly/update-ru_RU: add ru_RU missed translations

See merge request veloren/veloren!2757
 2021-08-17 12:18:33 +00:00
AlxlY
73fdd0c5ec alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity 2021-08-16 22:04:17 +02:00
juliancoffee
3b332b9213 Add ori_modifier for DashMelee and nerf it 
* 0.6 -> 0.3 ori modifier during charge in DashMelee
 2021-08-16 17:27:59 +03:00
juliancoffee
1baef392e6 Abilitiy tweaks 
Buff axe double_strike damage (90 -> 110 for first stage)
Decrease initial poise damage for hammer charged (20 -> 5)
 2021-08-15 23:20:21 +03:00
Marcel
f3afdc681a Merge branch 'update_pt_BR_20210810' into 'master' 
update pt_br translation 2021_08_10

See merge request veloren/veloren!2753
 2021-08-13 07:17:01 +00:00
Nícolas Wildner
cc1e7f3804 update pt_br translation 2021_08_10 2021-08-13 07:17:01 +00:00
AlxlY
a5cc713be0 alxly/update-ru_RU: updated transation after review. 2021-08-12 00:16:45 +02:00
AlxlY
b173c71840 alxly/update-ru_RU: fix translation based on @CodeReview comments. 2021-08-11 13:37:05 +02:00
Marcel
a049aa1e32 Merge branch 'trade-window-improvements' into 'master' 
UI: Fixes and enhancements to the trading window

See merge request veloren/veloren!2738
 2021-08-11 09:25:17 +00:00
AlxlY
54f6a71637 alxly/update-ru_RU: added proper translations after review. changed indentation to spaces 2021-08-11 00:48:48 +02:00
AlxlY
743865d25e alxl/update-ru_RU: add ru_RU missed translations 2021-08-10 23:36:02 +02:00
juliancoffee
a93c6931d4 Implement /kit all and a bit of refactoring 
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
 2021-08-10 13:28:38 +03:00
Samuel Keiffer
756249fd04 Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master' 
Consolidate redundant stage sections

See merge request veloren/veloren!2748
 2021-08-10 01:23:26 +00:00
Sam
4ecf8649c4 Fixed sfx file after consolidation. 2021-08-09 20:24:04 -04:00
Snowram
efbf538569 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
juliancoffee
fc0a66bae0 Tweak boss knockback abilities 
Tweak Mindflayer vortex knockback (make it rarer)
Tweak Tidal Warrior pincer and wave knockback
Tweak claygolem rocket and shockwave knockback
Tweak Yeti shockwave and strike knockback
 2021-08-09 13:05:01 +03:00
juliancoffee
d054ff0162 Complete skill preset "max" with sceptre HDuration 2021-08-09 10:09:12 +01:00
Xeriab Nabil
c1d7aec7f1 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
Samuel Keiffer
3b3bf10e4a Merge branch 'juliancoffee/pillar_fix' into 'master' 
Nerf pillars + Fix Beam ori

See merge request veloren/veloren!2732
 2021-08-07 16:35:24 +00:00
juliancoffee
65d4d692f2 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
Xeriab Nabil
4c02227de7 UI: Fixes and enhancements to trading window 2021-08-06 17:11:54 +03:00