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,700 Commits 151 Branches 18 Tags 2.1 GiB
6187cb8d23
Commit Graph

2221 Commits

Author SHA1 Message Date
jshipsey
6187cb8d23 address comments 2021-09-04 13:17:56 -04:00
jshipsey
523a15e5cc more spots 2021-09-04 00:18:58 -04:00
juliancoffee
f88373f7d8 Nerf coin drop from enemies 2021-09-03 01:15:27 +03:00
Sam
daf287a469 Small loot rebalance. 2021-09-01 23:50:17 -04:00
Samuel Keiffer
a733ad00e6 Merge branch 'ubruntu/sometimes-drop-nothing' into 'master' 
NPCs can drop nothing

See merge request veloren/veloren!2794
 2021-09-01 23:17:36 +00:00
ubruntu
bbc366e1b3 NPCs can drop nothing 2021-09-01 23:17:36 +00:00
Marcel
ad5cb064e2 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
f157f8efca (en) i18n cleaning 2021-09-01 19:38:59 +03:00
Imbris
16e2550e46 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
446d93dda0
Replace shaderc with naga 2021-08-31 22:53:10 +01:00
Joshua Barretto
b646aae2a4 Removed unused tree assets 2021-08-31 10:15:52 +01:00
Monty Marz
13c15b3840 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Joshua Barretto
9ac5e555e6 Improved giant trees 2021-08-30 00:03:16 +01:00
Joshua Barretto
92c463b315 Smaller acacia 2021-08-29 20:38:40 +01:00
Joshua Barretto
0011e75526 More tree variety 2021-08-29 18:38:34 +01:00
Joshua Barretto
4a9641cf44 More spot detailing 2021-08-29 14:54:01 +01:00
Joshua Barretto
98f4e95111 Improved giant trees 2021-08-29 14:37:11 +01:00
Joshua Barretto
643807e5ff Multiple color gradient options 2021-08-29 13:57:36 +01:00
Joshua Barretto
3592b5e7bb Better spot density 2021-08-29 13:08:13 +01:00
Joshua Barretto
87f4efd65b Added spot loot 2021-08-29 12:50:35 +01:00
Joshua Barretto
e05ca1f308 More spots 2021-08-28 16:48:34 +01:00
Monty Marz
7ced7e184e witch lantern 2021-08-28 14:53:31 +01:00
Monty Marz
dff5bbe1ec witch kit 2021-08-28 14:53:31 +01:00
Monty Marz
a8aaeaebec emergency single voxel window fix 2021-08-28 14:53:30 +01:00
Monty Marz
ae6d1b7924 fixes 2021-08-28 14:53:30 +01:00
Monty Marz
b085b02ff9 fixes 2021-08-28 14:53:30 +01:00
Monty Marz
771a380e6c witch stuff 2021-08-28 14:53:30 +01:00
Monty Marz
a22c0ab48f lion rock 
fixes
 2021-08-28 14:53:30 +01:00
Monty Marz
c22eb19f55 More spots 2021-08-28 14:53:30 +01:00
Gemu Peachems
b0a067fc8d Gnarling Totem 2021-08-28 14:53:30 +01:00
Monty Marz
1278020c88 dwarf grave 2021-08-28 14:53:30 +01:00
Joshua Barretto
76ba3496a1 sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
8b8adcc1b8 More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Joshua Barretto
bbcd842208 Test spot entity spawning 2021-08-28 14:53:30 +01:00
Sam
790c3669a0 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Marcel
738136e70f 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
4b62797f03 alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity 2021-08-16 22:04:17 +02:00
juliancoffee
130ae1f429 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
e3798e5d2a 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
7158ae1936 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
dc4574aa49 update pt_br translation 2021_08_10 2021-08-13 07:17:01 +00:00
AlxlY
bd26d2ad2a alxly/update-ru_RU: updated transation after review. 2021-08-12 00:16:45 +02:00
AlxlY
b8f37f474b alxly/update-ru_RU: fix translation based on @CodeReview comments. 2021-08-11 13:37:05 +02:00
Marcel
0bedfde53e 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
d47620959b alxly/update-ru_RU: added proper translations after review. changed indentation to spaces 2021-08-11 00:48:48 +02:00
AlxlY
18a6ff3f31 alxl/update-ru_RU: add ru_RU missed translations 2021-08-10 23:36:02 +02:00
juliancoffee
3ac74a8259 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
d5feca45c5 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
2103abbb76 Fixed sfx file after consolidation. 2021-08-09 20:24:04 -04:00
Snowram
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00