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
8,452 Commits 151 Branches 18 Tags 2.1 GiB
7b04599a3b
Commit Graph

1845 Commits

Author SHA1 Message Date
Sam
0d53e790fd Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00
Sam
fca56be4c0 Balance tweaks 2021-05-10 18:53:52 -05:00
Sam
d14fd59711 Increased exp of clay golems. 2021-05-10 18:53:51 -05:00
Sam
a497ac0353 Added kit for testing. 2021-05-10 18:53:50 -05:00
Sam
4e5a456b18 Balance tweaks. 2021-05-10 18:53:49 -05:00
Snowram
47a2bf7de8 Adds haniwa sentry object 2021-05-10 18:53:48 -05:00
Sam
c67c56d194 Dungeon placement. Tweaks to melee. 2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0 Added armor, more ai tweaks. 2021-05-10 18:53:46 -05:00
Sam
1c8db241e2 Golem AI 2021-05-10 18:53:43 -05:00
Sam
5fa4358e74 Clay golem attacks done. 2021-05-10 18:53:01 -05:00
Monty Marz
fab3794bf3 Fix 1h-axes 2021-05-10 20:44:09 +00:00
Avi Weinstock
abcb6f34a3 Remove the dependency of the new mindflayer AI on action_state.timer. 2021-05-09 21:16:57 -04:00
Avi Weinstock
1dfcdce1c0 Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons. 2021-05-09 18:09:31 -04:00
Illia Denysenko
cb2412148b Miniboss Loot quickfix 2021-05-09 21:29:35 +00:00
Monty Marz
a17bb0ad73 Better inactive/active audio slider logic 2021-05-09 09:51:41 +00:00
Illia Denysenko
1c22a2b3fd /skill_preset command 2021-05-08 15:47:09 +00:00
Snowram
ad3a63fc80 Merge branch 'snowram/craftmats-ron-fix' into 'master' 
Fixes object manifest

See merge request veloren/veloren!2273
 2021-05-07 21:06:37 +00:00
Nícolas Wildner
f517b06d50 Update pt br 20210507 2021-05-07 20:07:14 +00:00
Snowram
ec3fa365d0 Fixes object manifest 2021-05-07 22:04:57 +02:00
Snowram
831bfd0be9 Snowram/craft mats 2021-05-07 17:03:45 +00:00
Illia Denysenko
07ba3e659d Update uk_UA 2021-05-07 14:32:03 +00:00
Avi Weinstock
e4cda4309e Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
Sam
dc7e45c8bd Rebalancing 2021-05-05 14:43:56 -04:00
Sam
062c290e49 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Sam
d99623b298 Buff icons 2021-05-04 08:45:14 -04:00
Sam
2652660a58 Addressed comments and more testing feedback. 2021-05-04 08:45:14 -04:00
Sam
240a8e577d Minor balancing tweaks. 2021-05-04 08:45:13 -04:00
Sam
5c241850f1 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f Balancing. 2021-05-04 08:45:11 -04:00
Sam
7ac1488181 Added kit for testing tier 4 dungeons. 2021-05-04 08:45:11 -04:00
Sam
164fd0de04 Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
Sam
2290a22a15 Gave minotaur AI. 2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1 anims 2021-05-04 08:45:08 -04:00
Sam
257c670aaf Fix charge being broken. 2021-05-04 08:45:07 -04:00
Sam
d1139c3b7c Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Sam
e052c7b516 Cleave functional 2021-05-04 08:45:06 -04:00
Sam
160bd3ef0c Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
Sam
660423932c Miscellaneous balancing 2021-05-04 08:45:05 -04:00
Sam
f11c10d3be Charge attack for minotaur functional. 2021-05-04 08:45:04 -04:00
Illia Denysenko
f04a4f907a Add possibility to translate buff outcomes 2021-05-03 23:02:59 +00:00
Samuel Keiffer
771a8db2a8 Merge branch 'slipped/oritweak' into 'master' 
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
 2021-05-03 18:49:22 +00:00
Samuel Keiffer
610c529c42 Merge branch 'sam/ability-sets' into 'master' 
Allow Specification of Custom Ability Sets per Weapon

See merge request veloren/veloren!2231
 2021-05-03 17:50:11 +00:00
Avi Weinstock
be39054767 Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
jshipsey
63fdc4f590 animal adjustments 2021-05-02 23:17:58 -04:00
James Melkonian
f553700e8c Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
Illia Denysenko
569d0a1ba5 - Split 'debug' kit to 'debug' and 'admin_cosmetics' 
- Add Velorite Admin Bow to 'debug'
- Add rings, cape and necklace to cultist kit
- Add mushroom curry to 'consumables' (former 'potions')
 2021-05-02 13:27:03 +00:00
jshipsey
769e21104e higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Joshua Barretto
d0953fcab0 Added map marker 2021-05-01 16:26:13 +00:00
Sam
d500a00414 Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
dd113c56cb Fixed ItemDef for custom weapons. 2021-05-01 09:25:54 -04:00
Sam
3cb0ee98c8 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Jan Dre
8f5370f372 German translation 2021-04-30 11:58:31 +00:00
DaforLynx
7334cce426 Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
Sam
7870109856 Deduplicated stuff in npc_armor. 2021-04-29 15:45:14 -04:00
Sam
91bb6392bb Removed old 2h variants of 1h weapons. 2021-04-29 13:18:04 -04:00
Scott Bronson
b7ac7b64f3 Fix spelling in seashells.ron 2021-04-28 16:32:19 +00:00
DaforLynx
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
Marcel
aa963493e8 Merge branch 'james/sound-unwraps' into 'master' 
Remove an unwrap and move outcome sfx to ron

See merge request veloren/veloren!2206
 2021-04-27 21:01:06 +00:00
James Melkonian
2f00af83d8 Remove an unwrap and move outcome sfx to ron 2021-04-27 21:01:06 +00:00
Marcel
876686893b Merge branch 'duelsik/translations-PL-27-04-2021' into 'master' 
Polish translations update.

See merge request veloren/veloren!2205
 2021-04-27 20:54:48 +00:00
Daniel Mizerski
ec55c176fe Polish translations update. 2021-04-27 17:33:30 +02:00
Ludvig Böklin
34660462e9 Glider physics 2021-04-27 14:41:48 +00:00
jshipsey
2c74a86170 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
Samuel Keiffer
3f451ef7b3 Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master' 
Fix campfire heal buff description

See merge request veloren/veloren!2165
 2021-04-25 23:06:48 +00:00
Illia Denysenko
efd54021a7 Fix campfire heal buff description 2021-04-25 23:06:47 +00:00
Joshua Barretto
559e16e035 Apply flat earth hack to mist 2021-04-25 23:28:19 +01:00
Joshua Barretto
3e4afc5a45 Capped light access 2021-04-25 22:49:20 +01:00
Joshua Barretto
98f660e486 More realistic cloud light extinction model 2021-04-25 22:26:07 +01:00
Joshua Barretto
805822b0b0 Rebalanced arrow speed 2021-04-25 20:06:29 +01:00
Joshua Barretto
fa262d2a5c Fixed near cloud bug 2021-04-25 20:04:00 +01:00
Monty
2e24fcf165 Add i18n, change SCT Blocked col and string 2021-04-25 13:09:09 -04:00
Sam
d2d8d43410 Addressed testing feedback. 
Particles better.
 2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2 Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
alfy
73cb6d19ff Fixed the sounds since they were seemingly empty, as well as a new more organic wind sound 2021-04-25 13:09:06 -04:00
alfy
9f79c80072 block and parry sounds added 2021-04-25 13:09:06 -04:00
Sam
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Snowram
8f54a0bf31 More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
James Melkonian
0cf7e7114f Phoenix AI pass 2021-04-25 04:07:11 +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
jshipsey
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04: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
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02: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
5598d07944 Added crafting stations 2021-04-20 02:45:59 +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
Joshua Barretto
cb817c0313 Merge branch 'zesterer/econ-tweaks' into 'master' 
Rebalanced economy somewhat

See merge request veloren/veloren!2148
 2021-04-18 21:20:49 +00: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
Joshua Barretto
352fce239e Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
cac9ac6807 Trading stock limits 2021-04-18 18:58:26 +01:00
Joshua Barretto
250733a123 Better price rationalisation 2021-04-18 18:11:00 +01:00
Joshua Barretto
c0b71d0731 Removed legendaries from trading 2021-04-18 17:29:22 +01:00
Joshua Barretto
11683084ad Use labour value for prices 2021-04-18 17:05:14 +01:00
Joshua Barretto
fcc23a4427 Normalised prices within sites 2021-04-18 15:09:21 +01:00
Joshua Barretto
b72e454148 Rebalanced economy somewhat 2021-04-18 14:08:48 +01: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
Imbris
85ee4c8cd1 Merge branch 'aweinstock/server-authoritative-physics' into 'master' 
Aweinstock/server authoritative physics

See merge request veloren/veloren!2126
 2021-04-15 22:24:00 +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
jshipsey
8f20d17c9a attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63 combat tweaks 2021-04-15 11:43:52 -04:00
Avi Weinstock
50d0314a75 Add a toggle to negotiate the use of server-authoritative physics. 2021-04-15 08:50:17 -04:00
Sam
c88df846a7 Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky. 2021-04-14 17:38:37 -04:00
Stanisław Grupiński
fd7bf41678 Update main.ron 2021-04-14 12:40:02 +00:00
jshipsey
161382d06a changelog 2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374 loot tables, clippy, animation tweaks 2021-04-13 20:18:59 -04:00
jshipsey
42460f7e65 spins, combos 2021-04-13 20:18:59 -04:00
jshipsey
529f8eb5a6 more setups. chargeswing/dash anims 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
Marcel
4c23be44dd Merge branch 'socherbyc/assets' into 'master' 
Updates the Brazilian Portuguese (pt-BR) translation

See merge request veloren/veloren!2118
 2021-04-13 17:24:45 +00:00
Yuri Socher Bichibichi
c6dea3acca Updates the Brazilian Portuguese (pt-BR) translation 2021-04-13 11:56:58 -03:00
Vincent Foulon
a4bd47f340 Support quantity + use Enum for autocompletion + Address comments 2021-04-12 20:07:34 +02:00
Vincent Foulon
0692562533 New Command: "kit" + Removed Command: "debug" 
Update CHANGELOG.md

Update CHANGELOG.md
 2021-04-12 18:53:36 +02:00