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
6,406 Commits 151 Branches 18 Tags 2.1 GiB
a11786cbdd
Commit Graph

1231 Commits

Author SHA1 Message Date
Monty Marz
58d9534496 cleaned up skillbar, adjusted buffs placing 
cleaned up skillbar, adjusted buffs placing

cleaned up skillbar, adjusted buffs placing

render diary example items in voxygen instead of using pre-rendered image files
 2021-01-19 08:07:16 -05:00
Sam
bde2bc1f77 UI for sword skill tree 
Axe skill tree UI

Hammer skill tree UI

Bow skill tree UI

moar renders

Staff skill tree UI

Sceptre skill tree UI
 2021-01-19 08:07:12 -05:00
Monty Marz
3f436079e8 Skill-Tree UI 
switchable tabs
rework icons, fix cursor toggle
auto slot placing

Bow leap skill changed to bow glide skill.
 2021-01-19 08:07:06 -05:00
Sam
0ccbdc3b8c Sceptre skill tree. 2021-01-19 08:07:03 -05:00
Sam
5c7705f874 Staff skill tree. 2021-01-19 08:07:03 -05:00
Sam
662a08defc Implemented bow skill tree. 2021-01-19 08:07:02 -05:00
Sam
4dfe14c103 Hammer skill tree complete. 2021-01-19 08:07:02 -05:00
Sam
72604e8a4e Axe skill tree functional. 2021-01-19 08:07:01 -05:00
Sam
cc60ca58be Added sword skill tree 2021-01-19 08:06:59 -05:00
Sam
0e84ba18c2 Moved skill max level and skill prerequisites into ron files. 2021-01-19 08:06:59 -05:00
Sam
5a23f063a0 Ron file now used for skills belonging to each skill group. 2021-01-19 08:06:58 -05:00
Jesus Bracho
ec79890335 Provide buff information on killed entities 2021-01-18 05:46:53 +00:00
Acrimon
c5e3828c64 Merge branch 'master' into 'master' 
Update tr_TR to new multi file format.

See merge request veloren/veloren!1671
 2021-01-14 12:25:22 +00:00
Monty Marz
06e7ac25c1 fix loot tables, enemy bar color change 2021-01-09 15:26:24 +01:00
Ben Wallis
aef2637288 Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
Tadabito
db9a6a4cec Update tr_TR to new multi file format. 2021-01-02 12:04:04 +03:00
Vincent Foulon
da81b2f0b2 Update i18n's README.md to correct grammar and formatting 
Address the following reviews:
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145978
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145980
https://gitlab.com/veloren/veloren/-/merge_requests/1666#note_476145981
 2020-12-31 12:32:22 +01:00
Vincent Foulon
7a4c3fa9a6 renamed _root.ron files to _manifest.ron 2020-12-31 12:32:21 +01:00
Vincent Foulon
b3758d12e4 rename a translation file to prevent it from being ignored by git 2020-12-31 12:32:20 +01:00
Vincent Foulon
7150e1f820 rename a translation file and clear some commented code 2020-12-31 12:32:19 +01:00
Vincent Foulon
bb7cc3d53b (temp?) fixed list_localization function + add sub_directories to other languages 2020-12-31 12:32:17 +01:00
Vincent Foulon
00140384f7 convert the other languages into folders 2020-12-31 12:32:16 +01:00
Vincent Foulon
3295ff2c58 created LocalizationFragment + load localization sub directories 2020-12-31 12:32:16 +01:00
Vincent Foulon
924c24fa78 (PoC)(WIP) Convert single translation file to a folder 2020-12-31 12:32:15 +01:00
Joshua Barretto
a404707f87 Avoid div0 in shiny water shader 2020-12-30 22:18:19 +00:00
Nícolas Wildner
dc46618b4c Update pt_BR.ron 2020-12-27 00:09:12 +00:00
Sarra Kitty
e8eb2b3a6c new gliders 
added sandraptor glider

added sandraptor glider

stuff

working on other raptor gliders

adding file and placeholder model (copy of morpho) for monarch butterfly gliders

adding models for snow and wood raptor gliders

added a proper model for the monarch glider

adding crafting recipies for raptor gliders, and raptor feather item for the recipe. Made monarch and morpho rare drops in cave loot table

made raptors drop their feathers

fmt
 2020-12-24 02:54:18 +00:00
Justin Shipsey
be4d8a7138 Merge branch 'snowram/npcs-names-json-to-ron' into 'master' 
Converts npcs names file to ron

See merge request veloren/veloren!1659
 2020-12-23 07:43:57 +00:00
unknown
3c1e1c6733 Converts npcs names file to ron 2020-12-23 00:58:25 +01:00
Entropy
e62c77f452 i am stupid and forgot iron ingots, whoops. 2020-12-22 13:07:23 -08:00
Justin Shipsey
9af232c6e9 Merge branch 'entropy9s/BasicIngredients' into 'master' 
Basic Crafting Ingredients

See merge request veloren/veloren!1609
 2020-12-18 20:28:44 +00:00
Entropy
6f331e0435 changed sec count to be consistent w/ other foods 2020-12-17 12:43:33 -08:00
Monty
8b9db7b179 cleanup, changelog, small bugfixes 
fmt
fix rebase
fmt
 2020-12-14 21:52:24 +01:00
Monty Marz
b5a2104ca5 group member indicator visuals 
functional group member indicators
adjust visuals
z-comparison
 2020-12-14 21:16:13 +01:00
Joshua Barretto
985156fca4 Merge branch 'zesterer/gfx' into 'master' 
Made LoD water reflective

See merge request veloren/veloren!1632
 2020-12-14 18:49:59 +00:00
Snowram
834670a641 Merge branch 'snowram/objects-offsets-ron' into 'master' 
Put objects offsets into a .ron file

See merge request veloren/veloren!1627
 2020-12-14 18:00:07 +00:00
Joshua Barretto
49cabfae18 Made LoD water reflective 2020-12-14 16:52:33 +00:00
Snowram
96ed008348 Puts objects offsets into a .ron file 2020-12-14 02:43:49 +01:00
Samuel Keiffer
c3732a8a8c Merge branch 'nahua/replace_sceptre_m2_sound' into 'master' 
Issue 872: Replace explosion sound with heal bomb sound for sceptre M2

See merge request veloren/veloren!1618
 2020-12-13 23:18:30 +00:00
nahuakang
f3ed13ca09 Replace explosion sound with heal bomb sound for sceptre M2 2020-12-13 22:09:28 +01:00
Entropy
d533d08707 extraneous periods go away 2020-12-11 19:20:36 -08:00
Entropy
71d98d34fb Adding some basic consumable crafting ingredients 
more stuff being squashed in. tons of non-food items added
 2020-12-11 19:20:35 -08:00
Marcel
e54b4d5797 Merge branch 'DaforLynx/campfire-loading-tip' into 'master' 
Loading screen tip for campfire healing

See merge request veloren/veloren!1601
 2020-12-12 00:29:57 +00:00
DaforLynx
70814ee922 Loading screen tip for campfire healing 2020-12-12 00:29:57 +00:00
Marcel
9b1bc41f6e Merge branch 'jacki/german' into 'master' 
Updated de_DE translation

See merge request veloren/veloren!1572
 2020-12-11 23:51:00 +00:00
Tobias Frisch
23e3964059 Updated de_DE translation 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
 2020-12-11 23:51:00 +00:00
Vincent Foulon
2503d79567 Update French Translation 2020-12-11 23:29:44 +00:00
Monty Marz
f9d4d744a0 Better group frame placement 2020-12-10 21:31:19 +01:00
Snowram
ecdbd1c5d6 Makes consumables heal faster 2020-12-10 18:06:32 +01:00
Pfauenauge90
6d1bae67d0 adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes 2020-12-10 18:06:31 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Justin Shipsey
4bdd84ab46 Merge branch 'snowram/fishes' into 'master' 
Add fishes

See merge request veloren/veloren!1577
 2020-12-09 02:59:55 +00:00
Entropy
98688651b5 changed kickers to use 3 leather 2020-12-08 16:27:21 -08:00
Snowram
526d3bd035 Vacations are never over 2020-12-08 23:03:40 +01:00
Snowram
f94a4ec90d Improves fish_small, new npc 2020-12-08 23:03:39 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01:00
Sam
490915d384 Modified how most abilites that could scale were scaled. 2020-12-07 22:00:24 -06:00
Joshua Barretto
b37be14b86 Added cave mushrooms 2020-12-05 18:00:29 +00:00
Joshua Barretto
a5c37262dd Better aurora 2020-12-05 11:20:25 +00:00
Joshua Barretto
e413392694 Better mist access 2020-12-05 11:20:25 +00:00
James Melkonian
71303fecfd Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
iOddishGX
31e2e93786 Lowered the energy cost from 80 to 40 
Increased the healing multiplier
Lowered the damage output
Increased the radius
Made the projectile slightly faster
 2020-12-01 20:01:24 +00:00
Marcel
a431fe3fad Merge branch 'sam/dehardcode-energy' into 'master' 
Graying out skills with insufficient energy no longer dependent on hard-coded values

Closes #824

See merge request veloren/veloren!1560
 2020-11-27 16:27:09 +00:00
Samuel Keiffer
352917d9cb Graying out skills with insufficient energy no longer dependent on hard-coded values 2020-11-27 16:27:09 +00:00
Snowram
b316e9aa7c Updates ru_RU translation 2020-11-26 22:59:39 +01:00
Sam
6a6260daa1 Weapon combat fixes: 
- Modified energy and speed scaling of sword, axe, and hammer combo melees.
 - Nerfed bow basic attack knockback. Buffed bow damage and energy regen.
 - Corrected xp values for theropods. Removed unnecessary function for xp increase per level.
 - Guards no longer flee at low health.
 - Buffed sword spin.
 - Nerfed axe spin and sword dash moderately.
 - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.
 2020-11-26 09:15:45 +01:00
Marcel
103c2302b0 Merge branch 'azymohliad/add-ukrainian' into 'master' 
Added Ukrainian translation

See merge request veloren/veloren!1555
 2020-11-25 17:21:32 +00:00
Andrii Zymohliad
733a471090 Added Ukrainian translation 2020-11-25 17:21:32 +00:00
Monty Marz
e7d27a2c21 fmt 
cleanup
 2020-11-25 16:53:48 +00:00
Yusuf Bera Ertan
3c887315ae
update Turkish translations 2020-11-25 15:46:56 +03:00
DaforLynx
6783e13125 Added two new songs along with edits to the .ron 
comma
 2020-11-25 08:25:40 +00:00
Marcel
d1a9264a99 Merge branch 'angryanimals' into 'master' 
animal attacks

See merge request veloren/veloren!1542
 2020-11-25 01:33:20 +00:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
Sam
8ab2d2524a Changed default main and secondary tool from Some(empty) to None. 
weapon fixes
 2020-11-24 17:49:04 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work 
balance

Lavadrake AI tweaks

feedback tweaks
 2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jiminycrick
1337fdaa57 Generalize rotation time 2020-11-24 17:48:49 -06:00
jshipsey
a27b086401 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jiminycrick
a1aa3efd29 Moved hit timer to charged melee and adjusted for tail slap 2020-11-24 17:48:48 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jiminycrick
6b534729be Initial AI for quad low 2020-11-24 17:48:47 -06:00
jshipsey
c07d8df58b assigning weapons, building animations 
ability mapping
 2020-11-24 17:48:43 -06:00
jiminycrick
793d6095b3 Maneater AI 
Rebase fixes and maneater AI
 2020-11-24 17:48:38 -06:00
jshipsey
e3e513cc11 initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a Wolf attacks and ai. 
initial wolf dash testing

tool.rs

Wolf attack AI
 2020-11-24 17:48:20 -06:00
Joshua Barretto
46dc49bc0a Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00
Christof Petig
a3db20c9d6 Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
e770e88af5 Better town colour 2020-11-23 10:58:22 +00:00
Monty Marz
d069eb9a57 street lamp particles, ground fire bowl, misc fixes 2020-11-23 10:58:21 +00:00
Joshua Barretto
e461fbd951 Make chimneys glow 2020-11-23 10:58:21 +00:00
Joshua Barretto
4bb0da24b6 Addressed review comments 2020-11-23 10:57:57 +00:00
Snowram
0737c71749 Adds new cultist armors, defines loadouts for dungeons 2020-11-23 10:57:57 +00:00
Joshua Barretto
8fd2e4537d Addressed review comments 2020-11-23 10:57:57 +00:00
Monty Marz
8e18b26031 Update street_lamp.vox 2020-11-23 10:57:57 +00:00
Joshua Barretto
bb9e593a44 Fixed glow AO 2020-11-23 10:57:57 +00:00
Joshua Barretto
b4e3dbc719 Added glow tint 2020-11-23 10:57:57 +00:00
Joshua Barretto
d7bbceca2d Added light/glow map sample interpolation for entities 2020-11-23 10:57:56 +00:00