Commit Graph

1389 Commits

Author SHA1 Message Date
Snowram
8f54a0bf31 More phoenix AI work
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
ab26efa970 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Ada Lovegirls
01c30868eb Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee Merge branch 'xvar/server-version-check' into 'master'
Added client/server version mismatch warnings

See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f Added client/server version mismatch message when a network error is encountered during client init.
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
holychowders
516f2fec4a Fix grammatical error in NPC message 2021-04-23 22:43:37 -07:00
Illia Denysenko
4e7aba5b3f update uk_UA localization 2021-04-23 21:30:46 +00:00
Nícolas Wildner
6188bb9e96 update pt_br 20210422 2021-04-23 01:00:41 +00:00
Monty Marz
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
Joshua Barretto
19184a49a7 Made the pit of tartarus less bad 2021-04-21 22:18:44 +01:00
Joshua Barretto
81ba200e48 Improve dynamic light reflection for hill climbing 2021-04-21 17:10:53 +01:00
Monty
a1b4e0bdaf remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Joshua Barretto
11ba02130c Made sprite/block selection effect more subtle 2021-04-20 02:46:07 +02:00
Joshua Barretto
483276b082 Made sprite/block selection effect more subtle 2021-04-20 02:46:06 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
c5455fa1a1 Merge branch 'zesterer/small-fixes' into 'master'
Small fixes

See merge request veloren/veloren!2163
2021-04-19 21:54:26 +00:00
Joshua Barretto
4ad5257e40 Rebalanced mist 2021-04-19 22:26:56 +01:00
Joshua Barretto
86287e8f0a Fixed negative cloud density bug 2021-04-19 22:02:47 +01:00
Imbris
8c9d4dc3dd Merge branch 'capucho/inactive-master' into 'master'
Lower volume of window on focus loss

See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
Marcel
c5caec4921 Merge branch 'capucho/map-kb-zoom' into 'master'
Add keybindings for map/minimap zoom

See merge request veloren/veloren!2161
2021-04-19 19:52:27 +00:00
João Capucho
164411cb43
Voxygen: Added translations for map zoom 2021-04-19 20:27:02 +01:00
Marcel
3c3aa3d325 Merge branch 'juliancoffee/update-uk_UA' into 'master'
Update localization for uk_UA

See merge request veloren/veloren!2155
2021-04-19 19:26:20 +00:00
Illia Denysenko
ef8926bc5c Update localization for uk_UA 2021-04-19 19:26:20 +00:00
João Capucho
f23b515dd8
Voxygen: Add master volume sliders to the settings 2021-04-19 19:58:14 +01:00
Joshua Barretto
f0f3da529b Fixed water shader, sky shader 2021-04-19 14:42:49 +01:00
Sam
ce7581037c Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Samuel Keiffer
60d38cc03b Merge branch 'aweinstock/dodgesplosion' into 'master'
Unlock dodge roll iframes and staff explosion by default.

See merge request veloren/veloren!2146
2021-04-18 20:46:15 +00:00
Avi Weinstock
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Marcel
62fcdcd998 Merge branch 'nwildner/update_pt_BR_20210417' into 'master'
update pt_br 20210417

See merge request veloren/veloren!2143
2021-04-18 19:33:39 +00:00
Nícolas Wildner
24b55d0f07 update pt_br 20210417 2021-04-18 19:33:39 +00:00
Ben Wallis
a4cdb89987 Implemented inventory sorting 2021-04-17 22:04:08 +01:00
Marcel
2a0c8e575f Merge branch 'kinggred-master-patch-80352' into 'master'
Update main.ron

See merge request veloren/veloren!2123
2021-04-17 18:28:31 +00:00
Samuel Keiffer
a1d9ba15d9 Merge branch 'DaforLynx/normalize' into 'master'
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds

See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
f441c8c206 Normalize + shrink all sfx; tweaks to combat music; change footstep sounds 2021-04-16 00:35:13 +00:00
Samuel Keiffer
c962c5f12e Merge branch 'gGmMsS/Burning' into 'master'
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
gGmMsS123
e33961e1fa M2 Staff Final Touch 2021-04-16 00:34:24 +03:00
gGmMsS123
0d956610ec Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
Avi Weinstock
2fb7575d60 Address MR 2126 comments. 2021-04-15 15:17:39 -04:00
Avi Weinstock
50d0314a75 Add a toggle to negotiate the use of server-authoritative physics. 2021-04-15 08:50:17 -04:00
Stanisław Grupiński
fd7bf41678 Update main.ron 2021-04-14 12:40:02 +00:00
jshipsey
ea9b871374 loot tables, clippy, animation tweaks 2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb alpha attacks 2021-04-13 20:18:59 -04:00
jshipsey
b53e1653f6 initial wield testing 2021-04-13 20:18:58 -04:00
Yuri Socher Bichibichi
c6dea3acca Updates the Brazilian Portuguese (pt-BR) translation 2021-04-13 11:56:58 -03:00
Samuel Keiffer
e1020945dd Merge branch 'aweinstock/combat-music' into 'master'
Add combat music transitions based on number of enemies in player radius.

See merge request veloren/veloren!2077
2021-04-12 06:01:19 +00:00
Marcel
e4a67a9ba2 Merge branch 'juliancoffee/update-uk_UA' into 'master'
Update localization for Ukrainian

See merge request veloren/veloren!2107
2021-04-12 02:28:56 +00:00
Illia Denysenko
4ac8015ed9 Update localization for Ukrainian 2021-04-12 02:28:55 +00:00
Avi Weinstock
df4f44d946 Address MR 2077 review comments. 2021-04-11 22:08:42 -04:00
Avi Weinstock
7c34a96934 Make fade timings configurable, and stop combat music on death. 2021-04-11 22:08:41 -04:00
Avi Weinstock
f1b022cdee Add new version of combat soundtrack, and change details of how transitions between tracks work. 2021-04-11 22:08:41 -04:00
Avi Weinstock
5bfdd5f1af Add combat music transitions based on number of enemies in player radius. 2021-04-11 22:08:40 -04:00
Marcel
54024ce401 Merge branch 'DaforLynx/more-music' into 'master'
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds

See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
9db290d4ea Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds 2021-04-12 00:43:08 +00:00
Marcel
5e7adc6767 Merge branch 'trade-help-tooltips' into 'master'
Show ctrl-click and shift-click usage in item tooltips during trades.

See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
8a25ebb59a Show ctrl-click and shift-click usage in item tooltips during trades. 2021-04-11 22:56:02 +00:00
Marcel
d7a9ab7e23 Merge branch 'master' into 'master'
Update and fix zh_CN

See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
law4x
4403cd71a5 Update and fix zh_CN 2021-04-11 22:55:59 +00:00
Marcel
eca27a30b5 Merge branch 'danielduel/PL-local' into 'master'
Add/Extend PL locale

See merge request veloren/veloren!2091
2021-04-11 22:55:58 +00:00
BuildTools
c4294d968d Add/modify Polish translations 2021-04-11 19:10:09 +02:00
Vincent Foulon
a2e92c6715 add new loader + move some images 2021-04-11 16:35:25 +02:00
Snowram
52a53963ec Lossless compression of UI assets 2021-04-11 16:35:25 +02:00
Vincent Foulon
95f69fea36 remove unused images 2021-04-11 16:35:23 +02:00
Vincent Foulon
2097fbcacd optimized all images 2021-04-11 16:35:23 +02:00
Vincent Foulon
7128c3d3f6 Asset reorganization + removed some unused and duplicates + reduce size of some images 2021-04-11 16:35:17 +02:00
Monty Marz
6772e71aaa UI fixes and more 2021-04-11 03:49:47 +00:00
Marcel
99e494976d Merge branch 'ccm7676/lang_bug_fix' into 'master'
fixed the Select a Language text on languages where it was broken

See merge request veloren/veloren!2089
2021-04-10 15:47:28 +00:00
Marcel
e6683bb764 Merge branch 'juliancoffee/uk_UA-localizaion' into 'master'
Update localization files for Ukrainian

See merge request veloren/veloren!2090
2021-04-10 14:54:13 +00:00
Illia Denysenko
4717ad25a8 Update localization files for Ukrainian 2021-04-10 14:54:12 +00:00
Marcel
12c3ee440e Merge branch 'MigraineX/update-es-ES' into 'master'
Updated the Spanish (ES) translation

See merge request veloren/veloren!2094
2021-04-10 14:20:40 +00:00
MigraineX
07fd6f16f8 Updated the Spanish (ES) translation 2021-04-10 14:31:57 +02:00
Joshua Yanovski
af94753ad9 Remove panics and unwraps, part 1.
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Carl Marino
d2151ad76c fixed the Select a Language text on languages where it was broken 2021-04-09 18:39:53 +02:00
hqurve
be42cc60c4 Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window 2021-04-07 20:24:22 +00:00
Vincent Foulon
5e23c164e6 Add missing translations + Add "enemy_killed" text for villagers 2021-04-07 13:26:15 +02:00
James Melkonian
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
Marcel
187a85e056 Merge branch 'renamenorsk_norskbokmål' into 'master'
Rename Norsk to Norsk bokmål

See merge request veloren/veloren!2064
2021-04-06 11:37:54 +00:00
Kim André Moen Bjørkede
2380f9e8c2 Rename Norsk to Norsk bokmål 2021-04-06 11:37:51 +00:00
Marcel
2ed85a2dc0 Merge branch 'tonyvu0605/VietTranslation' into 'master'
Started Vietnamese Translation

See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
Joshua Barretto
de9ad0942f Merge branch 'zesterer/follow-cam' into 'master'
Added auto camera setting

See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Samuel Keiffer
3c50321a80 Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.

See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
Samuel Keiffer
f79493f7d0 Merge branch 'sam/sceptre-nerfs' into 'master'
Sam/sceptre nerfs

See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
Joshua Barretto
60e2ed3e7d Added auto camera setting 2021-04-05 23:24:31 +01:00
Sam
ba0b6c309b Flattened roll progression. 2021-04-05 17:50:53 -04:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
theCow61
b99c02401d Change to auto walk/glide. 2021-04-05 16:07:17 -05:00
Marcel
88079cfd30 Merge branch 'japanese' into 'master'
Add Japanese message translation

See merge request veloren/veloren!2049
2021-04-05 13:38:30 +00:00
Monty Marz
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
DaforLynx
6734198104 Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
tonyvu0605
e0dbd5566d Started Vietnamese Translation 2021-04-03 22:17:57 -04:00
Samuel Keiffer
8d9f63404e Merge branch 'sam/combat-ratings' into 'master'
Tweaks to Combat Rating Calculation

See merge request veloren/veloren!2051
2021-04-03 17:33:34 +00:00
Sam
ca1a93ba21 Actually committed bone staff fix. 2021-04-03 10:26:32 -04:00
Justin Shipsey
debf88e42f Merge branch 'vfoulon80/refine-item-icons' into 'master'
Refine some item icons

See merge request veloren/veloren!2045
2021-04-03 11:19:36 +00:00
Snowram
9a3f6d8261 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
Sam
27f178286d Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Jun NOGATA
129a3de2eb Add Japanese message translation 2021-04-03 01:50:10 +09:00