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
5,575 Commits 151 Branches 18 Tags 2.1 GiB
7aa3de35c9
Commit Graph

968 Commits

Author SHA1 Message Date
Snowram
f9383e4dd8 Add roshwalr npc 2020-10-19 16:20:59 +02:00
Snowram
c9985e14cb Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
65df398672 werewolf work 2020-10-19 16:20:58 +02:00
Snowram
6c54e6d8fe Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee Add treant npc 2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad More bipedlarge anim work 2020-10-19 16:20:58 +02:00
unknown
94cbe3faf4 Better bipedlarge weild, charge and shoot anims 2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
jshipsey
0e628ef67f rebase fix 2020-10-19 16:20:58 +02:00
Snowram
0a9ec848a7 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
f4a068c422 Initial bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
204fa50de9 Add werewolf npc 2020-10-19 16:20:57 +02:00
Sam
14e4af7ab6 Addressed playtesting feedback. 2020-10-14 21:06:52 -05:00
jshipsey
6a744eed82 anims 2020-10-14 21:06:32 -05:00
Monty Marz
4b2eba71e7 new staff skill icons 2020-10-14 20:56:58 -05:00
Sam
7ef73f5981 Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second. 2020-10-14 20:56:22 -05:00
Sam
cbb72363af Reworked explosions. Tweaked staff fireball. 2020-10-14 20:56:21 -05:00
Sam
04dcd012da Flamethrower particles. 2020-10-14 20:56:21 -05:00
Sam
c80f16ae74 Started to add particles. 2020-10-14 20:56:20 -05:00
jiminycrick
512d881cd2 Fixed clippy errors and added SFX 2020-10-14 15:30:58 -07:00
jiminycrick
95c36cc3fb Skill icons with proper rotation 2020-10-14 12:50:33 -07:00
jiminycrick
04175bab09 Add skillbar stuff for 3rd skills 2020-10-14 12:50:32 -07:00
Monty Marz
e1a77d040d loot table adjustments 
- decrease blue glider drop rate
- decrease cloth scaprs drop rate from villagers
- add crafting mats to crates instead
 2020-10-11 16:25:35 +00:00
Imbris
a3ee5a4006 Rename model_col -> highligh_col to better reflect its usage 2020-10-10 02:10:32 -04:00
Imbris
ef74d395a6 Improve figure and sprite highlighting 2020-10-10 02:10:31 -04:00
Monty Marz
2b800a2b63 make clippy happy 
Delete glider.ron
 2020-10-07 02:23:20 +00:00
Marcel
613b3b103f Merge branch 'undefined' into 'master' 
Correction of errors

See merge request veloren/veloren!1421
 2020-10-05 22:54:49 +00:00
Sam
e501235265 Loot table fix 2020-10-04 08:52:19 -05:00
pablo saavedra soler
90e795fd9f I have corrected many errors in Spanish grammar and dialect in Latin America 2020-10-04 06:41:35 +00:00
Sam
47abf49751 Addressed comments 2020-09-29 20:48:23 -05:00
Sam
207586cfab Beam particles fixed/tweaked. 2020-09-29 19:48:17 -05:00
Sam
0b80257aa3 Add migration 2020-09-29 19:48:15 -05:00
Sam
56d2afc0dc Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
37fcfb8b6f Created manifest for database to filepath for items. 2020-09-29 19:48:12 -05:00
Sam
3d6c26a3c7 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Sam
3e2e06f2f8 Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies. 2020-09-29 19:48:11 -05:00
Sam
de45784596 Addressed round of testing feedback. 2020-09-29 19:48:09 -05:00
Monty Marz
13d9b814ab separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre 
remove firebolt from starting sceptre
 2020-09-29 19:48:07 -05:00
Sam
6bb680f372 M1 now only regens stamina when healing allies if they are not at full health. 2020-09-29 19:48:02 -05:00
Monty Marz
2b8d1e6fb9 test values 2020-09-29 19:48:00 -05:00
Monty Marz
387f2cb60c color adjustments 2020-09-29 19:47:59 -05:00
Sam
6b23af6e0b Tweaked particles. Added skill icons. 2020-09-29 19:47:58 -05:00
Sam
8b9202710f New sceptre M2 is functional. 2020-09-29 19:47:57 -05:00
Sam
921d224ef6 Lifesteal now works. Added particles to healing beam. 2020-09-29 19:47:57 -05:00
Nícolas Wildner
5329b4c54b Update pt_BR.ron 2020-09-26 19:13:45 +00:00
Nícolas Wildner
55865dfb06 Update pt_BR.ron 2020-09-26 18:46:37 +00:00
Nícolas Wildner
855631feda Update pt_BR.ron 2020-09-26 18:20:59 +00:00
Nícolas Wildner
738688ea60 Update pt_BR.ron 2020-09-26 18:10:22 +00:00
jshipsey
4f0faf4c56 small corrections 2020-09-21 23:57:10 -04:00
Sam
8ab0d5e5e0 Added icon for skillbar ability of sword. 2020-09-21 17:40:20 -05:00
Sam
fe70b7fbce Addressed second round of feedback. 2020-09-21 17:38:53 -05:00
Sam
b06ab250cc Addressed first round of feedback on sword overhaul. 2020-09-21 17:38:52 -05:00
Sam
cf573a42bd Initial implementation of combo melee attack. 2020-09-21 17:38:41 -05:00
Joshua Barretto
1e900e8c6a Removed unused sprite manifests 2020-09-21 16:07:38 +01:00
Sam
99aba78422 Added healing healthsource logic to shockwave system. 2020-09-19 14:40:19 -05:00
Sam
6a1acd47a1 Added maximum vertical angle for shockwave. 2020-09-19 14:40:19 -05:00
Sam
819fb8ee77 Changed boss from cyclops to stone golem. Added ai specific for boss. 
Tweaked shockwave.

Fix rebasing errors.
 2020-09-19 14:40:16 -05:00
scott-c
1f2ed53c42 Tweak particle effects 2020-09-19 14:40:15 -05:00
Sam
0c48efd445 Added particles dedicated for shockwave. 2020-09-19 14:40:15 -05:00
Sam
66b0fee3c7 Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it. 2020-09-19 14:29:04 -05:00
Joshua Yanovski
b2dc95239d Merge branch 'martin-t/dust' into 'master' 
Fix typo: velorite dusk->dust

See merge request veloren/veloren!1390
 2020-09-18 23:54:17 +00:00
Monty Marz
5fe79e1c6a new loading screen bgs (part 1) 
Add a basic random feature to char creation

loading screen bg (part 2)

loading screen changes, random button graphics
Random appearance also pick a random npc name
 2020-09-18 23:17:47 +00:00
Martin Taibr
a9756607a3 fix typo: velorite dusk->dust 2020-09-19 00:43:29 +02:00
jshipsey
90e5bbaac0 rebase 2020-09-17 22:41:40 -04:00
jshipsey
fff6a6fb0a finish odonto 2020-09-17 22:32:11 -04:00
jshipsey
5bb45a4861 spawn tweaks, improved odonto 2020-09-17 22:32:11 -04:00
Snowram
fecc40ad8e Better quadmed legs/feet ratio 2020-09-17 22:32:11 -04:00
jshipsey
8a43cba3b6 quadsmall manifest changes 2020-09-17 22:32:11 -04:00
Snowram
62f6a5799a Initial quadmed feed animation 2020-09-17 22:32:10 -04:00
jshipsey
03b7320b4b general housekeeping 2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072 species specific improvement 2020-09-17 22:32:10 -04:00
Snowram
6a16268ff0 Quadmed run anim tweaks and deers offsets tweaks 2020-09-17 22:32:10 -04:00
jshipsey
2589c0cfc6 thropod manifest changes 2020-09-17 22:32:10 -04:00
Snowram
9308cabeb8 add deer, beaver and porcupine npcs 2020-09-17 22:32:10 -04:00
Snowram
ee95550355 Tweak offsets for theropods 2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
jshipsey
ecae71c016 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
412495e5fc assets/manifests 2020-09-17 22:18:49 -04:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation 
* Added migrations for entity ID changes to existing tables
 2020-09-17 23:02:14 +00:00
tylerlowrey
30c3146682 Added main menu kick message with kick reason after player is kicked 2020-09-14 07:52:31 +02:00
tylerlowrey
fee79720ee Added ban message with reason when banned user attempts to login to server 2020-09-14 07:52:31 +02:00
TheThirdSpartan
7fd673ecb2 Added localization config options for new death messages 2020-09-09 20:26:20 +00:00
Raiyan Sayeed
906da2f0c7 added option for borderless fullscreen in setting -> graphics menu 2020-09-07 05:12:15 +00:00
TheThirdSpartan
6dbd1bc132 adding feature requested in issue #153 - displaying your alias in game as 'you' 2020-09-06 19:42:32 +00:00
Joshua Barretto
0adc57e487 Made particle code more rugged 2020-09-04 11:49:49 +01:00
Joshua Barretto
70f52d876a Improved lighting 2020-09-04 11:48:57 +01:00
Monty Marz
8a25ad91df reed models 2020-09-04 11:48:57 +01:00
Joshua Barretto
032ec9ef41 Added bee hives 2020-09-04 11:48:56 +01:00
Joshua Barretto
88add8456f Added fireflies, reeds near rivers 2020-09-04 11:48:56 +01:00
Joshua Barretto
4405227ffb Made light attenuation nicer, fixed campfire light offset 2020-09-04 11:48:54 +01:00
Marcel
e512578ef5 Merge branch 'intel-gpu-fix' into 'master' 
Fix a crash and model/shadow issues on Intel Gen7/7.5 GPUs.

See merge request veloren/veloren!1349
 2020-09-03 09:11:19 +00:00
Marcel
5d1f7d7a0a Merge branch 'update-zh' into 'master' 
update the Simplified Chinese translation

See merge request veloren/veloren!1350
 2020-09-02 08:07:28 +00:00
law4x
87c8351890 update the Simplified Chinese translation 2020-09-02 08:07:27 +00:00
scott-c
69e0bf2023 fix missing firework particle rng & adjust firework colors 2020-09-01 20:33:17 +08:00
Lippy13
7c33e7d714 Work around an issue with Intel Gen7/7.5 GPUs where matrices default to being row major if they are not directly assigned to a matrix that has a column major layout. 2020-08-31 19:50:45 +01:00
Lippy13
7efa3373f6 Fix crash on Intel Gen7 GPUs caused by having two return statements in the same branch of code. 2020-08-31 19:49:01 +01:00
Marcel
62427cb01f Merge branch 'vzikl/add-zh-translation' into 'master' 
Update to OpenSource Font - WQY-ZenHei & add zh_CN

See merge request veloren/veloren!1304
 2020-08-30 20:40:01 +00:00
VZIKL
cc55e71a5d Update to OpenSource Font - WQY-ZenHei & add zh_CN 2020-08-30 20:40:01 +00:00
black silence
2587a38f6f fix several DE translations 2020-08-28 20:37:28 +02:00
Joshua Yanovski
8be3648a4d Move sprite data to a config file. 2020-08-28 09:23:43 +02:00