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

1706 Commits

Author SHA1 Message Date
Illia Denysenko
652171b146 Add possibility to translate buff outcomes 2021-05-03 23:02:59 +00:00
Samuel Keiffer
a0899db36a 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
7b82e9b1f4 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
bb7dbe245d Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
jshipsey
3067aaeb2f animal adjustments 2021-05-02 23:17:58 -04:00
James Melkonian
6956d364d1 Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
Illia Denysenko
f46b87ffb4 - 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
3b49741350 higher health lower damage 2021-05-01 12:29:28 -04:00
jshipsey
f6043b7e53 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Joshua Barretto
b471128ce5 Added map marker 2021-05-01 16:26:13 +00:00
Sam
c5ce67f36c Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
0da50b17b8 Fixed ItemDef for custom weapons. 2021-05-01 09:25:54 -04:00
Sam
25c78dc660 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
3bf46fa640 Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
Jan Dre
8ee37767f5 German translation 2021-04-30 11:58:31 +00:00
DaforLynx
5358e7346a Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
Sam
3bc7d69446 Deduplicated stuff in npc_armor. 2021-04-29 15:45:14 -04:00
Sam
90fb4f43d2 Removed old 2h variants of 1h weapons. 2021-04-29 13:18:04 -04:00
Scott Bronson
612bc25f54 Fix spelling in seashells.ron 2021-04-28 16:32:19 +00:00
DaforLynx
5f8c7e54b5 Town music 2021-04-28 05:07:59 +00:00
Marcel
2abbd1cdda 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
3ae25b8348 Remove an unwrap and move outcome sfx to ron 2021-04-27 21:01:06 +00:00
Marcel
0a8a0452f5 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
7aa309fa06 Polish translations update. 2021-04-27 17:33:30 +02:00
Ludvig Böklin
b389806d2e Glider physics 2021-04-27 14:41:48 +00:00
jshipsey
585e468de1 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
Samuel Keiffer
06d9ec1d8a 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
8cc6469626 Fix campfire heal buff description 2021-04-25 23:06:47 +00:00
Joshua Barretto
a785fb13a8 Apply flat earth hack to mist 2021-04-25 23:28:19 +01:00
Joshua Barretto
430d75b67b Capped light access 2021-04-25 22:49:20 +01:00
Joshua Barretto
4626b7e95d More realistic cloud light extinction model 2021-04-25 22:26:07 +01:00
Joshua Barretto
d00348cbd2 Rebalanced arrow speed 2021-04-25 20:06:29 +01:00
Joshua Barretto
5c469b99d2 Fixed near cloud bug 2021-04-25 20:04:00 +01:00
Monty
c59f11ef6e Add i18n, change SCT Blocked col and string 2021-04-25 13:09:09 -04:00
Sam
fdd2b58954 Addressed testing feedback. 
Particles better.
 2021-04-25 13:09:08 -04:00
Sam
2d3d48e84c 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
5a759be5e3 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
434d1353eb block and parry sounds added 2021-04-25 13:09:06 -04:00
Sam
165603aa65 Parrying 2021-04-25 13:08:42 -04:00
Sam
c9e1b1d341 Melee weapons can now block. 2021-04-25 13:08:42 -04:00
Snowram
58300592ca More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
James Melkonian
7cfd8debed Phoenix AI pass 2021-04-25 04:07:11 +02:00
Snowram
4249d0ddcc Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
738be81943 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
b0d617d91d Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
e58e56cb07 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
5b8fbe9a23 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Ada Lovegirls
c7d6dde677 Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ben Wallis
2251c91b1a 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
d0108fe32b 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