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

2143 Commits

Author SHA1 Message Date
João Capucho
74008e342a
Fix uniformity bug in ui shader 2021-07-31 21:34:29 +01:00
Monty Marz
fddc2e9570 fix i18n 2021-07-31 18:17:34 +02:00
Monty Marz
2466cad155 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
João Capucho
4bcda1c395
Fix non uniform control flow in shader 2021-07-29 18:05:27 +01:00
Marcel
9b30bb9e7d Merge branch 'juliancoffee/entity_refactor' into 'master' 
Improve terms of EntityConfig and LoadoutBuilder

See merge request
2021-07-28 23:19:04 +00:00
juliancoffee
9c7f96b6c1 Improve terms of EntityConfig and LoadoutBuilder 
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
 2021-07-28 19:19:10 +03:00
Marcel
1116363aec Merge branch 'fungoid/add_fr_translation_for_gameinput.greet' into 'master' 
Added fr translation for gameinput.greet

See merge request
2021-07-28 15:52:16 +00:00
Marcel
13b1063406 Merge branch 'tygyh/Update-missing-swedish-translations' into 'master' 
Tygyh/update missing swedish translations

See merge request
2021-07-27 11:14:52 +00:00
Jonathan Berglin
6607c84a90 Tygyh/update missing swedish translations 2021-07-27 11:14:52 +00:00
Nico Janzen
113fb181a3 Fix spelling errors in German translations 2021-07-27 11:06:22 +00:00
Alexis Maheu
3bd7b4594c Added fr translation for gameinput.greet 2021-07-26 20:29:30 -04:00
DanTheOne
47e49f0409 Add shortcut to toggle chat 2021-07-26 02:42:35 +02:00
Joshua Barretto
b517119468 Merge branch 'juliancoffee/update-uk_UA' into 'master' 
update (uk_UA) translation

See merge request
2021-07-24 19:56:21 +00:00
juliancoffee
71a0295104 (uk_UA) address feedback 2021-07-24 18:34:57 +03:00
Joshua Barretto
b2143d52a8 Changed singleplayer map for a better default experience 2021-07-24 11:56:08 +01:00
juliancoffee
cd775b9f16 (uk_UA) misc hud translation 2021-07-24 01:50:14 +03:00
juliancoffee
ae992ec12a (uk_UA) force update 2021-07-24 01:13:50 +03:00
juliancoffee
15341bf140 (uk_UA) MEAT translation 2021-07-24 01:13:02 +03:00
juliancoffee
ca9f42498d (uk_UA) graphics settings translation 2021-07-24 00:26:38 +03:00
juliancoffee
05fb25584e (uk_UA) frozen outcome translation 2021-07-24 00:12:41 +03:00
juliancoffee
996a030c31 (uk_UA) gameinput.greet translation 
Здоровенькі були
 2021-07-24 00:07:26 +03:00
juliancoffee
e685d7686e (uk_UA) update debuff translation 2021-07-24 00:03:34 +03:00
juliancoffee
8be18e5b05 (uk_UA) update mining skills translation 2021-07-23 23:07:15 +03:00
juliancoffee
32ac89903c (uk_UA) update healing aura skill translation 2021-07-23 22:44:14 +03:00
juliancoffee
18ad64d984 (uk_UA) update bow skills translation 2021-07-23 22:18:49 +03:00
Samuel Keiffer
564214cc87 Merge branch 'knightresspaladin/fix-circle-charge' into 'master' 
Fixed CircleCharge and buffed Rugged Hide droppers

See merge request
2021-07-23 14:56:36 +00:00
schnippl0r
35c3fdce67 Added en and de_DE translations for gameinput.greet. 2021-07-20 21:59:18 +02:00
Knightress Paladin
c9f0293f56 Made Ngoubou rarer to spawn 2021-07-18 23:21:41 -07:00
Knightress Paladin
91ac4af88f Fixed CircleCharge and buffed Rugged Hide droppers 2021-07-18 23:12:55 -07:00
Snowram
00b029d338 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
Samuel Keiffer
42d6e4b118 Merge branch 'juliancoffee/overworld_assetization' into 'master' 
Wildlife assetization

See merge request
2021-07-18 13:43:32 +00:00
Joshua Barretto
1c5ce83b66 Merge branch 'zesterer/better-sunsets' into 'master' 
More sunset variation for higher graphics modes

See merge request
2021-07-18 00:59:22 +00:00
Joshua Barretto
23c35cfca8 Merge branch 'aweinstock/hats' into 'master' 
Basic implementation of hat visuals.

See merge request
2021-07-17 19:42:26 +00:00
Joshua Barretto
689574e9a0 More sunset variation for higher graphics modes 2021-07-17 19:00:12 +01:00
juliancoffee
4a83cb13c5 Add Automatic NameKind to EntityConfig 
+ add animal entities for wildlife spawns
 2021-07-17 15:37:31 +03:00
juliancoffee
91b3f49c15 Replace EntityConfig main/second_tool with hands 
+ Check equip_slot can hold item in LoadoutBuilder
 2021-07-17 15:37:31 +03:00
juliancoffee
335dbf4cc8 Move builder assets in EntityConfig to meta field 2021-07-17 15:37:31 +03:00
juliancoffee
b74dd21d3b Merge None-loot in EntityConfig to LootKind 2021-07-17 15:37:31 +03:00
juliancoffee
19c7355c4e Add wildlife assetization support 
+ add asset tests
+ migrate tundra animals
+ migrate taiga animals
+ declare temperate zone (animals yet to be created)
+ declare jungle zone (animals yet to be created)
+ declare tropical zone (animals yet to be created)
+ declare desert zone (animals yet to be created)
+ declare water (river inhabitants) zones (animals yet to be created)
 2021-07-17 15:37:30 +03:00
juliancoffee
f7b7f1ca4d Add Exact body field for EntityConfig 
Add Alignment field to EntityConfig

+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
 2021-07-17 15:37:30 +03:00
Forest Anderson
83692ae1b7 Merge branch 'aylana/asp-sfx' into 'master' 
Princess-Lana - Add asp sound effects for the game

See merge request
2021-07-17 01:49:20 +00:00
Avi Weinstock
78ae2d76dc Add per-species head offsets. 2021-07-16 19:22:28 -04:00
Avi Weinstock
17c2459a01 Basic implementation of hat visuals. 2021-07-16 18:49:40 -04:00
Samuel Keiffer
651b775932 Merge branch 'knightresspaladin/healing-aura' into 'master' 
Knightresspaladin/healing aura

See merge request
2021-07-16 21:32:03 +00:00
Monty Marz
1443b3e78d icon 2021-07-16 18:39:14 +02:00
Samuel Keiffer
0ef3a978b0 Merge branch 'juliancoffee/patch_animal_dash_double_hit' into 'master' 
Set charge_through to false for non-humanoid dash

See merge request
2021-07-16 15:33:59 +00:00
juliancoffee
c6b1446f72 Set charge_through to false for non-humanoid dash 2021-07-16 15:49:02 +03:00
Marcel
33aba370d4 Merge branch 'zesterer/sfx' into 'master' 
Clipped arrow sound effects for more immediate feedback

See merge request
2021-07-16 10:32:29 +00:00
Aylana
513085da30 Add asp sound effects 2021-07-15 20:15:36 +02:00
Marcel
b8f7975195 Merge branch 'AlexBethel/item-typos' into 'master' 
Correct spelling errors in item descriptions

See merge request
2021-07-15 08:15:43 +00:00