783 Commits

Author SHA1 Message Date
Monty Marz
50afb859d1 Revert "Merge branch 'vzikl/add-zh-translation' into 'master'"
This reverts merge request !1241
2020-08-14 22:32:50 +00:00
Justin Shipsey
bdc05accbe fixed jump anim bug and non-attack bug for bipedlarge 2020-08-14 10:50:08 +00:00
Yusuf Bera Ertan
ba9dd361c4 tr_TR localization: add missing keys and update some 2020-08-13 23:50:06 +00:00
Joshua Barretto
7ca61abcec Merge branch 'zesterer/worldsim' into 'master'
World simulation, generation, and pathfinding improvements (including castles and caves)

See merge request veloren/veloren!1282
2020-08-12 21:40:56 +00:00
Joshua Barretto
331a61e426 Improved spawn rates of castles and cave monsters 2020-08-12 21:16:14 +01:00
Joshua Barretto
fb6170e624 Added decals to towns 2020-08-12 21:15:53 +01:00
Monty Marz
1450d79672 added grass sprites 2020-08-12 21:15:53 +01:00
Pfauenauge
77daeee721 drop gate parts 2020-08-12 21:15:53 +01:00
Joshua Barretto
a53b78e0c5 Fixed castle bug, better field RNG 2020-08-12 21:15:53 +01:00
Joshua Barretto
d8b7eb278f Added large caves, cave scatter, removed old caves 2020-08-12 21:15:53 +01:00
WelshPixie
75ca522179 fixed sprite rotations 2020-08-12 21:15:52 +01:00
Monty Marz
0441ad5e7e fix wrong filepath 2020-08-12 22:07:37 +02:00
Marcel
50ab217cbb Merge branch 'DoNeo/ru_translation' into 'master'
ru translations

See merge request veloren/veloren!1286
2020-08-12 18:42:46 +00:00
Monty Marz
3e8fe47b8d UI fixes, assets update 2020-08-12 18:10:18 +00:00
Marcel Märtens
a5f0c36ebb ru translations 2020-08-12 19:59:02 +02:00
Monty Marz
2d793d7e65 Add firework hues 2020-08-12 22:29:06 +08:00
scott-c
e5bf0230e9 Add firework item 2020-08-12 22:25:28 +08:00
IBotDEU
e030a2fa08 implemented ability to select bit depth and refresh rate and implemented seperate setting for fullscreen resolution 2020-08-09 20:30:22 +00:00
Imbris
ee418c19f0 Merge branch 'scott-c/particles' into 'master'
Particles

See merge request veloren/veloren!1156
2020-08-09 17:09:43 +00:00
nepo
d5e06a30b4 nepo/new bones 2020-08-08 22:37:50 +00:00
scott-c
ce49b9c599 cleanup unneeded matrix and shader code 2020-08-08 19:26:52 +08:00
Joshua Barretto
27324bc232 Explosion sound and event lights 2020-08-08 19:26:52 +08:00
Joshua Barretto
6e5b44addd Added outcome sound effects, fixed directional sound, particle outcomes 2020-08-08 19:26:52 +08:00
Joshua Barretto
575319f3aa Added outcome system, sound effects 2020-08-08 19:26:48 +08:00
Joshua Barretto
7725e11aee Better hash RNG 2020-08-08 19:25:33 +08:00
scott-c
e7c1781819 Add zest's changes 2020-08-08 19:25:33 +08:00
scott-c
b4e5dab7c5 Add toggle particles graphics setting 2020-08-08 19:25:01 +08:00
scott-c
29a78ceaa3 Add fireball and bomb particle effects 2020-08-08 19:25:00 +08:00
scott-c
4c765eac9b remove particle emitter component 2020-08-08 19:25:00 +08:00
scott-c
8d742a77cc Add particle velocity and ability particle emitter 2020-08-08 19:25:00 +08:00
scott-c
26a0bbb7f9 Add ParticleMgr 2020-08-08 19:24:55 +08:00
scott-c
ff25a88d6e Add particle pipeline 2020-08-08 19:24:25 +08:00
Monty Marz
fb0984efa1 address comments 2020-08-08 00:13:00 -04:00
Monty Marz
9869b2a8d7 group leader colouring, offset fix when debug menu is open,
fixed social tab visuals

text width limit

group interaction wording, group window adjustments
2020-08-08 01:15:58 +02:00
Monty Marz
a0dd070daf timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Monty Marz
64acb03083 Update CHANGELOG.md, german locale 2020-08-08 01:15:58 +02:00
Monty Marz
fb40666831 Social window assets 2020-08-08 01:14:19 +02:00
Monty Marz
b7e7cdbf94 group button and menu logic changes
group member panels

health bar text

text shadows and scaling

cleanup, don't show the player panel

social window assets
2020-08-08 01:14:19 +02:00
Imbris
320cbc9b3c New group UI functions 2020-08-08 01:14:19 +02:00
Monty Marz
c5720c02c9 Basic UI
Basic ui for groups and group window
2020-08-08 01:12:35 +02:00
Imbris
ef43cc0030 Add key to select entities 2020-08-08 01:09:02 +02:00
Marcel
eb6855ff96 Merge branch 'french_translation' into 'master'
French translation improvements

See merge request veloren/veloren!1263
2020-08-07 21:05:47 +00:00
Varpie
9d8db2c846 Fixing various obsolete texts and a few typos, uniform pronoun (tu->vous) and French style punctuation 2020-08-07 21:05:47 +00:00
Marcel Märtens
5c764cd933 add a translation test that verifys that all language RON files are parseable (without any git involved) 2020-08-07 21:31:34 +02:00
nepo
b8cb8ec68b nepo/dullahan 2020-08-07 03:56:59 +00:00
Marcel
0d0845c32e Merge branch 'patch-2' into 'master'
I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. I hope it's the last fix and that it finally appears in the next update.

See merge request veloren/veloren!1262
2020-08-06 23:05:41 +00:00
Judge Griesa
8d787aee94 I did it from scratch to match other languages files. -Deleted some tabs and empty spaces. 2020-08-05 16:22:44 +00:00
BottledByte
b8199542e0 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar
Also fixed two wrong asset references and did some .ron formatting
2020-08-05 01:21:42 +02:00
Judge Griesa
2fffdd902e -Added crafting commands missed in the file (Probably the reason why the file wasn't read by the game). Removed some weird whitespaces. Added some NPC lines while attacked. 2020-08-03 12:22:07 +00:00
Marcel
1af779cf2b Merge branch 'patch-2' into 'master'
-Removed some white spaces. Added some lines about tips. Fixed some sections.

See merge request veloren/veloren!1251
2020-08-03 08:13:41 +00:00