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
15,352 Commits 151 Branches 18 Tags 2.1 GiB
8e4e7b38dd
Commit Graph

2996 Commits

Author SHA1 Message Date
Monty Marz
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
jshipsey
855fe5da34 brazilianportugese 2020-05-15 19:19:14 -04:00
Marcel Märtens
39de4bd4fd swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Shane Handley
e852e0cfab - Update the stats of characters individually, reverting the change with 
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
 2020-05-13 09:14:09 +10:00
jshipsey
ef70949d5d cyclops 2020-05-11 21:44:21 -04:00
Justin Shipsey
78f3f2cc32 Merge branch 'snowram/dragon-animation' into 'master' 
dragon

See merge request veloren/veloren!969
 2020-05-10 18:39:29 +00:00
CapsizeGlimmer
8d3463e2f1 Update english welcome message 2020-05-09 22:54:15 -04:00
jshipsey
62bd79dba7 dragon and general animation cleanup 2020-05-09 18:10:24 -04:00
Snowram
5b77c74497 Add cockatrice 2020-05-09 18:09:27 -04:00
Snowram
0248c6a44e Cleanup 2020-05-09 18:09:27 -04:00
jshipsey
a6de8159f6 dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes 2020-05-09 18:09:06 -04:00
Snowram
9d2277ecd4 Better animations 2020-05-09 18:09:06 -04:00
jshipsey
e5a7086502 asset and manifest tweaks 2020-05-09 18:09:06 -04:00
Snowram
cd452cc715 New dragon model, added jaw, splitted head into upper/lower 2020-05-09 18:09:05 -04:00
Snowram
9027967fb7 Initial run animation work 2020-05-09 18:08:35 -04:00
Snowram
33f8a47cfa Symmetry of dragon skeleton 2020-05-09 18:08:35 -04:00
Robin Gilh
edcde84505 Dragon work 2 2020-05-09 18:07:31 -04:00
Robin Gilh
40360ff149 Dragon work 2020-05-09 18:07:31 -04:00
S Handley
5a13b54cbf - Load characters after login. 
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
 2020-05-09 15:41:25 +00:00
Monty Marz
89980284aa Merge branch 'CapsizeGlimmer/functional_lanterns' into 'master' 
Equipped lanterns now provide an illumination effect.

See merge request veloren/veloren!935
 2020-05-04 15:15:31 +00:00
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Julian
cf9820e204 Added new SFX and adjusted sfx.ron 
New SFX sounds.

add_item.wav (Better fitting pickup sound)
drop_item.wav (New sound for dropping items)
open_inventory.wav (The old pickup sound, can be used for opening the bag but needs to be implemented)
sword_in.wav (Better fitting sound)
sowrd_out.wav (Better fitting sound)

Fixed the drop sfx sound in sfx.ron
Its the drop_item sound instead of a grass moving step.
 2020-05-03 21:52:11 +02:00
Monty Marz
f5c2341167 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Monty Marz
c792cc05a9 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Joshua Barretto
1e91f7a0ab Added 1 extra bit per figure vertex position component, resolved char screen bug 2020-04-29 15:22:08 +01:00
Marcel Märtens
83af40a460 Allow for 0.5 offsets in figures 2020-04-29 14:10:46 +02:00
Justin Shipsey
171e865f57 new animals 2020-04-28 03:13:23 +00:00
Monty Marz
6d7cb8654d Merge branch 'pfau/ui-fixes' into 'master' 
UI Fixes

See merge request veloren/veloren!946
 2020-04-26 01:44:56 +00:00
Monty Marz
4521791591 UI Fixes 2020-04-26 01:44:56 +00:00
Justin Shipsey
6fa13bcb7e body/anim tweaks 2020-04-26 01:09:03 +00:00
Joshua Barretto
8e95444d85 Made GPU bone updates more conservative for moar fps 2020-04-25 21:44:23 +01:00
Joshua Barretto
7208b37dc5 Squashed figure vertices for better performance 2020-04-25 21:44:23 +01:00
Joshua Barretto
37301706d4 Reduced size of terrain sprite vertices 2020-04-25 21:44:23 +01:00
Joshua Barretto
c05f4fe009 Added configurable sprite view distance, minor bug fixes 2020-04-25 21:44:23 +01:00
Pfauenauge90
3421b3d8da sprites VD slider visuals 2020-04-25 21:44:23 +01:00
jshipsey
feca113c86 fix for hollow chests 2020-04-25 21:44:23 +01:00
Joshua Barretto
3e62f7edc3 Better LoD distance scaling 2020-04-25 21:44:23 +01:00
Songtronix
e10f27f480 fix: misspelling in english translation 2020-04-24 18:30:58 +02:00
Treeco
dd08def18f Add camera smoothing setting 2020-04-23 22:59:34 +00:00
Joshua Barretto
1c2f05ac51 Fully fixed sub-voxel noise issue 2020-04-23 22:05:14 +01:00
Joshua Barretto
c0bd0279fc Added sites to the map 2020-04-23 21:59:09 +01:00
Joshua Barretto
982886b3f8 Made players spawn in the nearest town to the centre of the world, delete object.zip 2020-04-23 18:19:41 +01:00
Joshua Barretto
444f2ecb45 Made /waypoint admin-only, MR cleanup 2020-04-23 18:19:41 +01:00
Joshua Barretto
1983fd8ec1 Cleanup, fixed clouds, removed 45-degree terrain sprites 2020-04-23 18:19:41 +01:00
Joshua Barretto
8d4f1da3a6 Improved path rendering on the map, removed ugly path noise 2020-04-23 18:19:41 +01:00
Joshua Barretto
a65dbc570a Returned to normal world size 2020-04-23 18:19:41 +01:00
Joshua Barretto
7edd0e701c Fixed sub-voxel noise flickering on NVIDIA cards 2020-04-23 18:19:41 +01:00
Joshua Barretto
cd925e8cea Faster sub-voxel noise function 2020-04-23 18:19:41 +01:00
Monty Marz
44c5002db3 Pfau/crops 2020-04-23 18:19:41 +01:00
Joshua Barretto
431e199731 Added correctly generating world paths, sub-voxel shader noise 2020-04-23 18:19:41 +01:00
Joshua Barretto
e242604a4c Further improved AO 2020-04-23 18:19:41 +01:00
Pfauenauge90
db5311189d scarecrow 2020-04-23 18:19:41 +01:00
jshipsey
729912d33b corrected villager empty weapon issue 2020-04-23 18:19:41 +01:00
Pfauenauge90
98704a4753 turnip and window blocks 2020-04-23 18:19:41 +01:00
Joshua Barretto
6448c17110 Fixed sprite AO, overhauled entity spawning, better enemy spawning in dungeons, made agents more skilled at combat 2020-04-23 18:19:41 +01:00
Monty Marz
0fb3a115da Add more crops 2020-04-23 18:19:41 +01:00
Joshua Barretto
e3ebdc56b3 Fixed figure AO (still need to do sprite AO), added more control over NPC spawning, loot in dungeons 2020-04-23 18:19:41 +01:00
Joshua Barretto
fd14223c33 Basic boss spawning in dungeons, better AO 2020-04-23 18:19:41 +01:00
Joshua Barretto
c4879e991d Enabled AO in darkness, better light attenuation 2020-04-23 18:19:41 +01:00
Joshua Barretto
525cba5029 Added dungeon rooms, corridors, mazes 2020-04-23 18:19:41 +01:00
Joshua Barretto
568a8ab87c Increased block rendering altitude range 2020-04-23 18:19:41 +01:00
Joshua Barretto
0125897117 Slightly better clouds 2020-04-23 18:19:41 +01:00
Pfauenauge90
4b72a07e22 sprites 2020-04-23 18:19:41 +01:00
Pfauenauge90
fd3ffdf28b pizza sprite 2020-04-23 18:19:40 +01:00
Pfauenauge
67f27ef970 ember sprite 2020-04-23 18:19:40 +01:00
Joshua Barretto
4830757bc9 Began adding building skeleton structure 2020-04-23 18:19:40 +01:00
Joshua Barretto
dde0319293 Lighting improvements, fixed NaN issue for agents 2020-04-23 18:19:40 +01:00
Joshua Barretto
d7385fd99b Fixed cheap shader 2020-04-23 18:19:40 +01:00
Joshua Barretto
16a175abe0 Nicer water shaders 2020-04-23 18:19:40 +01:00
Joshua Barretto
a0dae82a2b Added correctly allocated labours, fishing 2020-04-23 18:19:40 +01:00
Joshua Barretto
46190aa634 Began work on basic economic simulation 2020-04-23 18:19:40 +01:00
Joshua Barretto
b9cc0f387b Cleaner clouds, better movement 2020-04-23 18:19:40 +01:00
Joshua Barretto
df5aa93fd7 Better AO, fixed cloud pixelation 2020-04-23 18:19:40 +01:00
Joshua Barretto
d91d66027a Fixed cloud bugs, made pets run into you less 2020-04-23 18:19:40 +01:00
Joshua Barretto
5f2d0021a3 Reversed water draw order 2020-04-23 18:19:40 +01:00
Joshua Barretto
0021bd6452 Added new settlement generation to world, basic rendering 2020-04-23 18:19:40 +01:00
Justin Shipsey
7519e842e9 6 new music tracks 2020-04-23 17:16:45 +00:00
Artem
4aa176daec Update AppData manifest to conform guidelines 
https://github.com/flathub/flathub/wiki/AppData-Guidelines

Fix desktop file
 2020-04-16 05:25:04 +00:00
Pfauenauge
25a9d5bf2f resolved comments 2020-04-12 21:45:19 +02:00
Pfauenauge90
cee1c2f85b cleanup, slot background, scaling 2020-04-12 18:41:10 +02:00
Imbris
b9a66a93b7 Add backgound to hotbar slots 2020-04-12 18:41:09 +02:00
jshipsey
d7e605e658 lantern visuals, random cape flutter 2020-04-12 18:41:08 +02:00
Imbris
2c4c006396 Lantern tweaks, remove unused bones 2020-04-12 18:41:07 +02:00
Imbris
c1c09dce1b Enable unequipping as well as equipping to specific slots 2020-04-12 18:41:06 +02:00
Pfauenauge90
66b283209b Update de_DE.ron 2020-04-12 18:41:04 +02:00
Pfauenauge90
88a938653b translation fix 2020-04-12 18:41:04 +02:00
Pfauenauge90
eb7ded989f 7 dwarf accessories 2020-04-12 18:41:03 +02:00
Pfauenauge90
f24ba71d94 hotbar keybindings 2020-04-12 18:41:03 +02:00
Pfauenauge90
2263b9be95 starter chest, removed unused key commands 2020-04-12 18:41:02 +02:00
Pfauenauge
479fcaa603 bag tooltips translation entries 2020-04-12 18:41:01 +02:00
Pfauenauge
9b2785aeae german translation update 2020-04-12 18:41:01 +02:00
Pfauenauge90
85f9f80024 starter equip 2020-04-12 18:41:00 +02:00
Pfauenauge
6dcdd80ec8 smarter code 2020-04-12 18:40:59 +02:00
Pfauenauge
d5128b751d png item images, fix map cursor 2020-04-12 18:40:59 +02:00
Pfauenauge90
039f7f9f14 item images 2020-04-12 18:40:58 +02:00
Pfauenauge90
ca667fd02b tooltips 2020-04-12 18:40:58 +02:00
Pfauenauge90
156b554023 item types 2020-04-12 18:40:57 +02:00
jshipsey
ea2c646df3 initial cape implementation 2020-04-12 18:40:57 +02:00
Pfauenauge90
f5a768dccf more armour types 2020-04-12 18:40:56 +02:00
Pfauenauge90
7f97fbac0b cape item 2020-04-12 18:40:56 +02:00
Pfauenauge90
771baaaae5 cape item 2020-04-12 18:40:55 +02:00
Pfauenauge
cac2321464 armor slot visuals 2020-04-12 18:40:53 +02:00
Carbonhell
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Capucho
8f6686adc1 Fix the problems of players walking over water with dithering 2020-04-07 22:50:01 +00:00
Monty Marz
07242644ca Small UI fixes 2020-04-04 21:51:06 +00:00
Capucho
a21ae27a77 Add player transparency and silhouette 2020-04-04 19:36:55 +00:00
Monty Marz
1af82604b5 German Translation 2020-04-04 14:39:54 +00:00
YuWeiWu
619ab8ba39
Reduce characters not supported by current font 2020-04-04 21:44:03 +08:00
YuWeiWu
62b765ebc5
Use license compatible font instead 2020-04-04 14:58:34 +08:00
YuWeiWu
3dbc268a76
Add font that is able to display Chinese/Japanese 2020-04-04 14:36:08 +08:00
YuWeiWu
169f50abb1
Roll back to current fonts 2020-04-04 14:36:08 +08:00
YuWeiWu
4c9680b073
Add Traditional Chinese translation 2020-04-04 14:36:08 +08:00
Yusuf Bera Ertan
d62770fd6e Update Turkish translation to include new strings 2020-04-02 16:46:59 +00:00
Imbris
97148cb6bb Merge branch 'master' into 'combat' 
# Conflicts:
#   CHANGELOG.md
 2020-04-01 20:42:27 +00:00
Yusuf Bera Ertan
c5331cbabe Add Turkish (Turkey) translation file 2020-03-31 19:52:45 +02:00
Capucho
abc1a041fa Added a portuguese translation 2020-03-30 22:57:26 +02:00
Jack Rubino
bb293c4442 Add Italian translation 2020-03-29 13:40:57 +02:00
S Handley
1cb93b92ed Add Italian translation 2020-03-29 01:47:18 +00:00
Pfauenauge90
e3a5051b52 small fix 2020-03-28 18:06:00 +01:00
Imbris
d3b5b1e637 Remove None variant fromm armor types 2020-03-28 03:51:24 -04:00
Pfauenauge90
7d1f779c28 Update headband-0.vox 2020-03-27 20:00:16 +01:00
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
Pfauenauge90
0b3fb2dd3c fire bolt visuals 2020-03-27 18:31:45 +01:00
Pfauenauge90
c3a4f897da update help screen 2020-03-27 17:50:34 +01:00
Joshua Barretto
3a989f061f Better water shaders 2020-03-27 15:13:36 +00:00
Pfauenauge90
7a3ad54628 asset cleanup 2020-03-27 15:27:42 +01:00
Pfauenauge90
50b7206577 asset cleanup, map visuals 2020-03-27 04:06:27 +01:00
Shane Handley
362771be4b SFX and unit test fixes. 2020-03-27 12:06:25 +11:00
timokoesters
fe2aa7da7b Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
Capucho
03396eb77e Implement #505 2020-03-26 21:22:21 +00:00
Pfauenauge90
5f10cdf0c6 adjusted foot step sounds, inventory space above bag 2020-03-25 21:06:01 +01:00
Pfauenauge90
8b05dda1d9 assset cleanup, transparency, new icons 2020-03-25 16:47:48 +01:00
Pfauenauge90
550dd144bc new icon art 2020-03-25 01:41:43 +01:00
Pfauenauge90
060ebbc861 healing sceptre 2020-03-24 01:11:14 +01:00
timokoesters
fb16106960 Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
Pfauenauge90
1f363da248 small fixes, weapon models 2020-03-22 18:51:23 +01:00
Pfauenauge90
61e2a986f2 item images 2020-03-22 14:38:21 +01:00
Imbris
41c424ac13 Optimized uses of emitters, cleanup 2020-03-22 00:49:46 -04:00
Pfauenauge
f6731dc770 cloth armor 2020-03-22 00:21:11 +01:00
Imbris
f399085974 Flip models for hands, shoulders, and feet of humanoids 2020-03-21 18:48:21 -04:00
Pfauenauge90
7857f2ba27 27 new armor asset files 2020-03-21 20:23:22 +01:00
Pfauenauge90
4153df66ea stat icons, frame colours 2020-03-20 20:52:32 +01:00
Pfauenauge90
68192738ee placement fix 2020-03-20 14:55:31 +01:00
Pfauenauge90
4f1104a417 new loading screen bg 2020-03-20 13:01:31 +01:00
Pfauenauge90
6094e4b017 added chest drops 2020-03-20 01:11:02 +01:00
Pfauenauge90
3145b26cd6 item images 2020-03-19 22:36:40 +01:00
Pfauenauge90
d863e12235 swift leather armour parts 2020-03-19 14:17:53 +01:00
Pfauenauge90
509615c15b npc armour 2020-03-18 23:09:58 +01:00
timokoesters
038f655269 fix pfau's broken commit 2020-03-18 21:12:55 +01:00
Pfauenauge90
4d9327cef5 2 weapons 2020-03-18 21:05:20 +01:00
Pfauenauge90
1cb2022d35 UI visuals 2020-03-18 19:51:48 +01:00
Pfauenauge90
43bae55961 coin/currency visuals 2020-03-18 12:05:36 +01:00
Pfauenauge90
70511e0f4e background images 2020-03-18 01:43:55 +01:00
timokoesters
4741e41230 Add support for different models per weapon type 2020-03-17 18:28:07 +01:00
Pfauenauge90
431974cf8e test armor slot 2020-03-17 17:02:50 +01:00
Pfauenauge90
b9f6dfac77 fixes 2020-03-17 16:07:20 +01:00
Pfauenauge90
40910b28e4 unclothed parts 2020-03-17 15:39:29 +01:00
Joshua Barretto
3559252a5e Nicer point lights 2020-03-17 13:29:42 +00:00
Pfauenauge90
7ded921ecc more UI visuals 2020-03-16 22:58:19 +01:00
timokoesters
b040e18246 Fix body parts not changing 2020-03-16 22:06:23 +01:00
Pfauenauge90
11e4289f28 small fixes 2020-03-16 20:50:01 +01:00
Pfauenauge90
2e41b59282 removed character window and questlog 2020-03-16 19:56:15 +01:00
Pfauenauge90
b9f61d4e7a UI colourable in the code, stats window 2020-03-16 18:55:43 +01:00
Pfauenauge90
ab8b83f8d6 more bag parts 2020-03-16 18:55:31 +01:00
timokoesters
1279f70184 Add shield item 2020-03-16 13:40:14 +01:00
Pfauenauge90
db6099a62f reenabled inventory slots 2020-03-15 19:48:02 +01:00
Pfauenauge90
492db3ac5f minimap position 2020-03-15 16:53:28 +01:00
Pfauenauge90
19bcbbbd9a minimap assets 2020-03-15 16:53:28 +01:00
Pfauenauge90
7b77064539 mmap visuals 2020-03-15 16:52:38 +01:00
Pfauenauge90
db96930ad1 item images 2020-03-15 16:51:55 +01:00
Pfauenauge90
6e2015957a plate armour 2020-03-15 16:51:55 +01:00
Pfauenauge90
bc34a7cce8 more assa armour parts 2020-03-15 16:51:55 +01:00
Pfauenauge
077ae66281 new assassin shoulder armor 2020-03-15 16:51:55 +01:00
Pfauenauge90
2f3c67a76f more armour 2020-03-15 16:51:55 +01:00
Pfauenauge90
898150bd23 plate chest armour 2020-03-15 16:50:37 +01:00
Pfauenauge90
658b6465b2 assassin armour 2020-03-15 16:50:37 +01:00
Imbris
dc88e33a63 maybe fix hotreload panic 2020-03-15 16:50:37 +01:00
Pfauenauge90
caf4159463 UI changes 2020-03-15 16:50:37 +01:00
Pfauenauge90
3738fe45f7 better item desc 2020-03-15 16:42:09 +01:00
Pfauenauge90
bf1c46d596 item images 2020-03-15 16:42:09 +01:00
Pfauenauge90
913393963a plate armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
6cb68fabea more assa armour parts 2020-03-15 16:42:09 +01:00
Pfauenauge
0c49cd8596 new assassin shoulder armor 2020-03-15 16:42:09 +01:00
Pfauenauge
e7780e5f5b Update item_image_manifest.ron 2020-03-15 16:42:09 +01:00
Pfauenauge90
aa36082eed more armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
e80750bc53 plate chest armour 2020-03-15 15:53:51 +01:00
Pfauenauge90
5a962771d9 assassin armour 2020-03-15 15:53:51 +01:00
Imbris
6d0ec984c8 maybe fix hotreload panic 2020-03-15 15:53:51 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
S Handley
bc692c0101 Add audio and chat message feedback when the player attempts to collect something while thier inventory is full. 2020-03-11 10:30:59 +00:00
Songtronix
d2e12fd166 feat(auth): localisation of authentication errors 2020-03-08 22:58:43 +01:00
Acrimon
d4225cfb45 Auth error help message. 
main menu message about auth
 2020-03-08 22:57:09 +01:00
Snow
72b2334434 more eagle adjustements 2020-03-08 15:07:47 +00:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
Justin Shipsey
86e15695fc weapon control bone 2020-03-05 14:02:11 +00:00
S Handley
b0ca85069b Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it. 2020-03-04 10:09:48 +00:00
Artem Polishchuk
ce7b9a84b8 Add desktop file and AppData manifest 
Fix screenshot duplicate in appdata

Move .png icon to git lfs
 2020-02-27 16:25:07 -05:00
Shane Handley
0d2b26a3b8 SFX Fixes - Reinstate run, uncomment tests and make them pass, adjust 
config.
 2020-02-25 22:03:29 +09:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
Julian
7bc719e33f UpdatedSoundFX 
New souunds for Sword_in  and  Sword_out.
 2020-02-22 20:26:49 +01:00
S Handley
9ab2833056 Add weapon wield/unwield sfx support 2020-02-21 02:56:54 +00:00
Monty Marz
2180040f70 Orc hairstyles, several tiny UI fixes, fixed beard warnings 2020-02-20 10:32:03 +00:00
Monty Marz
18f46a6f83 Fix Fonts 2020-02-17 16:22:49 +00:00
Treeco
abe47d8621 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
aaf1de9f9b Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Rémy PHELIPOT
98c37d0b28 [i18n] Configurable fonts 
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
 2020-02-16 16:02:38 +01:00
Monty Marz
90680d5490 Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
Joshua Yanovski
e524e86090 Merge branch 'sharp/zoom-minimap' into 'master' 
Minimap rotation, zoom, orientation indicator, Mainmap changes & indicator

See merge request veloren/veloren!784
 2020-02-06 17:34:32 +00:00
Monty Marz
93d7c67cdc Hack to allow minimap rotation. 
Currently it just always rotates towards the camera, but it wouldn't be
hard to create a config option that swaps out the rotation of the
indicator and the map.
 2020-02-06 17:34:32 +00:00
Joshua Barretto
e520712077 Minor performance improvements 2020-02-04 22:58:56 +00:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
S Handley
b7ce91fead Move music under audio 
Also add some blank time after each track so that we get some silence
between tracks.
 2020-02-03 11:55:32 +00:00
Vechro
377433c2fc Get abs value of maxd and mind 2020-01-31 12:12:57 +02:00
Joshua Barretto
faa86226c7 Collars 2020-01-29 12:01:28 +00:00
Justin Shipsey
908e099aa5 minor anim tweaks 2020-01-29 06:38:08 +00:00
Rémy PHELIPOT
ce54f27531 Add missing translations 2020-01-27 20:34:36 +01:00
Rémy PHELIPOT
69cc30343a Fix disclaimer text 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
c7271d43f1 Improve French translation 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
8946ed8d82 Add missing translations in voxygen 
Fix #436
 2020-01-27 19:59:17 +01:00
Joshua Barretto
8aa1970fdf Merge branch 'treeco/fix-zoom' into 'master' 
Made depths behave nicer when zoomed really far out

See merge request veloren/veloren!766
 2020-01-27 16:48:16 +00:00
Treeco
6ada176e54 Bumped up the numbers further, behaves nicer still 2020-01-27 14:28:20 +00:00
Justin Shipsey
53e57cb5dc quad_medium animation 2020-01-27 14:16:23 +00:00
Treeco
7334f9782c Made depths behave nicer when zoomed really far out 2020-01-27 12:12:38 +00:00
Joshua Barretto
4eb5b76d5f Added point light ambiance 2020-01-27 10:58:33 +00:00
Monty Marz
80bf0d5698 Change desert sprite colours to fit the ground better 2020-01-27 10:41:07 +00:00
Joshua Barretto
e45d46ddf7 Merge branch 'zesterer/small-fixes' into 'master' 
Star fixes

See merge request veloren/veloren!762
 2020-01-27 02:29:05 +00:00
Joshua Barretto
d2e0445b34 Added point light ambiance 2020-01-27 01:47:23 +00:00
Joshua Barretto
115ecf15d3 Made stars spin with sun and moon 2020-01-27 01:22:07 +00:00
Joshua Barretto
966a61ad42 Stopped stars popping into existence 2020-01-27 01:03:55 +00:00
Monty Marz
981b55837a fix typo in en.ron, fixed unfinished weapons dropping from chests 2020-01-26 22:57:06 +00:00
Pfauenauge90
9ee72eb810 changed death message 2020-01-26 12:52:32 +00:00
Joshua Barretto
11193a692a Better neutral AI, initial waypoint objects 2020-01-26 12:52:28 +00:00
Joshua Barretto
7167320c92 Fixed shadows, better pathfinding cap 2020-01-26 12:52:28 +00:00
Monty Marz
49071400d2 Fix: Healthbars size 2020-01-26 01:19:36 +00:00
Justin Shipsey
64690279af new mobs 
alligators
 2020-01-26 00:22:48 +00:00
Monty Marz
b583f60326 35 new ground sprites, UI fixes 2020-01-25 11:14:02 +00:00
Imbris
166aba61f0 Make nametages etc fixed size and only display within limited range 2020-01-24 22:09:45 -05:00
Joshua Yanovski
3383e991e7 Erosion cleanup, part 1. 
Covers all files touched by MR that are not in world/src/sim.
 2020-01-23 18:18:17 +01:00
Joshua Yanovski
2a6ed4351d Revert to master for main background. 2020-01-23 18:18:13 +01:00
flyingfryingpan
a98d4adc27 forsharp 2020-01-23 18:18:07 +01:00
Monty Marz
bfee0a6f9e Character stats displayed in char window, pulsating active slot in inventory 2020-01-23 17:14:02 +00:00
Monty Marz
1365abae99 Clean up unused UI assets 2020-01-22 21:56:03 +00:00
Monty Marz
e2707ff24a start menu text 2020-01-21 22:04:39 +00:00
Joshua Barretto
34c88708af Adjusted cloud fuzz factor 2020-01-21 13:14:25 +00:00
Joshua Barretto
8e7a8aa4f9 Shader optimisations 2020-01-21 12:58:20 +00:00
Treeco
49262c6a80 Fixes Hair Style & Color labels 2020-01-21 12:27:34 +00:00
Rémy PHELIPOT
a6f9f533a5 Localization system for Voxygen 
- Added a localization system in voxygen
- Support English and French languages
- Added a configuration option in the interface settings to change
  the language
 2020-01-20 21:07:25 +01:00
S Handley
b44955ba30 Remove currently unused audio assets 
This clears out about 56MB of unused audio files.

There were also some unused methods in the audio modules which
referenced a file, which has also been removed.
 2020-01-20 15:07:30 +00:00
Pfauenauge90
885e698e5a charge icon update 2020-01-19 22:39:19 +01:00
Pfauenauge90
6a32845e58 various fixes 2020-01-19 22:39:19 +01:00
Imbris
9d6bf66a32 Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
Joshua Barretto
54773b57b6 Fixed water normals 2020-01-19 18:39:20 +00:00
Joshua Barretto
020c57ec4a Fixed terrain normal decoding 2020-01-19 18:27:03 +00:00
Joshua Barretto
21069a48dd Made clouds bigger, more performant and prettier 2020-01-19 18:06:34 +00:00
Monty Marz
cb5976b9de create character button position change 2020-01-18 15:42:21 +00:00
Adam Whitehurst
7353ab3432 Undo sfx changes 2020-01-18 05:13:25 -08:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
Adam Whitehurst
5959d2a5c7 Fix SFX and Assets 2020-01-16 05:28:45 -08:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Monty Marz
f6dfb74b3e fix 
slightly lower trigger velocity

slighty more transp map image
 2020-01-12 19:01:02 +00:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
fd9cc76786 Reimplement #210 2020-01-07 18:40:45 +03:00
S Handley
2644e29484 Refactor and Rename for clarity 
Implements a potential structure for splitting the SFX event mapping
into smaller individual files for maintainability.

- Remove inventory events for now: For a later commit.
- No longer panic when there is a failure parsing the sfx file: log the error and not play sfx.
 2020-01-01 02:55:48 +00:00
Monty Marz
8aff5faa83 assets update 
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
 2019-12-30 12:16:35 +00:00
AdamWhitehurst
9c6ce9babd Begin implementing combat actions 2019-12-29 15:47:42 -08:00
S Handley
8c5320d20f Update title music and temporarily remove attack sfx 
- Updated title music with a version provided by aeronic which fades out
more gracefully
- Removed attack SFX as it was included in the movement processing, but
will return later as part of a similar chunk of code which processes
combat sfx independent of movement.
 2019-12-20 04:04:05 +00:00
S Handley
11dd6b8090 Update footsteps SFX 2019-12-08 10:03:40 +00:00
Monty Marz
d0b7891a34 Set overflow checks to 'false' for release builds in order to bandaid fix recent master error 2019-11-28 13:32:38 +00:00
Monty Marz
040e1a7535 Fix map being inverted and indicator positioning 2019-11-26 22:39:07 +00:00
S Handley
ea2e0d17de SFX system 
This is an event based approach to SFX sounds. There is a specific
character sound event mapper which determines sfx to play based on
character or NPC state, as well as emitting sfx events for
non-character-triggers such as levelling up.
 2019-11-23 08:26:39 +00:00
Monty Marz
370e94b1ad Loading Screen with pulsating text, 2 new hairstyles 2019-11-23 00:51:18 +00:00
Joshua Barretto
3a5c69a314 Prevented chunk load popping with smooth view distance growth 2019-11-20 10:38:11 +00:00
Joshua Barretto
8745d0a3af Non-linear depth buffer 2019-11-20 09:59:27 +00:00
Joshua Barretto
c60799de3d Stronger moonlight 2019-11-19 20:43:41 +00:00
Joshua Barretto
9993a4c81a Smoother water at distance, fixed warnings 2019-11-19 19:22:56 +00:00
Joshua Barretto
7ad22c647d Fixed cloud shader banding issue 2019-11-19 19:09:22 +00:00
Joshua Barretto
5cb6f691dc Fixed dense cloud void issue 2019-11-19 19:09:22 +00:00
Joshua Barretto
28e625635f Split terrain rendering to avoid redrawing skybox 2019-11-19 19:09:22 +00:00
Joshua Barretto
bca3817163 Massive performance boost for clouds, fixed reflection misprojection bug 2019-11-19 19:09:22 +00:00
Joshua Barretto
39d686961e Removed cloud sampler early return 2019-11-19 19:09:22 +00:00
Joshua Barretto
651bc8a9a3 Fixed close cloud precision noise 2019-11-19 19:09:22 +00:00
Joshua Barretto
eeec7df7d3 Fixed passthrough reduction curve 2019-11-19 19:09:22 +00:00
Joshua Barretto
fa4e68c165 Cleanup and speedup 2019-11-19 19:09:22 +00:00
Joshua Barretto
559106ff2c Better passthrough calculation 2019-11-19 19:09:22 +00:00
Joshua Barretto
4ccd8ac72a Improved cloud precision from internal perspective 2019-11-19 19:09:22 +00:00
Joshua Barretto
b7e59dfcc2 Better precision cloud sampling and moon halo highlight 2019-11-19 19:09:22 +00:00
Joshua Barretto
2c2dd49aed Made clouds render over terrain 2019-11-19 19:09:22 +00:00
Joshua Barretto
9d48cc8fb7 Better water transparency 2019-11-19 19:09:22 +00:00
Joshua Barretto
fd2c9e8cde Prevent sun/moon terrain overlap 2019-11-19 19:09:22 +00:00
Joshua Barretto
f80f303a18 Prevented cloud overlap on terrain 2019-11-19 19:09:22 +00:00
Joshua Barretto
0f37bfa829 Fixed hill colour blending 2019-11-19 19:09:22 +00:00
Joshua Barretto
337383feaa Faster cloud reflections 2019-11-19 19:09:22 +00:00
Joshua Barretto
7375c2c207 Faster clouds, better water 2019-11-19 19:09:22 +00:00
Joshua Barretto
5162256e45 Faster and more visually pleasing clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
aa111d34e5 Added clouds 2019-11-19 19:09:22 +00:00
Joshua Barretto
18ec6dbbec Prevented the moon rising/setting too early/late 2019-11-19 19:09:22 +00:00
Joshua Barretto
68502b22c1 Better moonlight 2019-11-19 19:09:22 +00:00
Joshua Barretto
10ce8b45e7 Added moon 2019-11-19 19:09:22 +00:00
Joshua Barretto
eb7b55d3ad Merge branch 'zesterer/better-water' into 'master' 
Better water

See merge request veloren/veloren!643
 2019-11-12 14:55:54 +00:00
Monty Marz
c38447a264 assets update 
map image
human male hairstyles
elf male hairstyle
potion item
cheese item
removed admin items from inventory
 2019-11-09 13:42:42 +00:00
Joshua Barretto
2134bf87a7 Smaller water details 2019-11-05 15:45:01 +00:00
Joshua Barretto
671313a523 Overhauled water shaders 2019-11-05 15:45:01 +00:00
Joshua Barretto
6d8d06ff7c Smoother water 2019-11-05 15:45:01 +00:00
Joshua Barretto
7ecfde2925 Better water 2019-11-05 15:45:01 +00:00
Monty Marz
240b620c13 login info text 2019-11-01 20:53:52 +00:00
Monty Marz
a0a8011d7e Updated: Help Window, Map, Item Descriptions 2019-10-27 22:22:40 +00:00
jshipsey
2b5fd372c5 streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally. 2019-10-25 21:50:14 -04:00
jshipsey
644939810f added dragon skeleton 2019-10-25 21:33:59 -04:00
jshipsey
54fc712076 fish_medium and bird_medium skelingtons 2019-10-25 21:33:02 -04:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool 
This way all items that can be held in a hand are tools
 2019-10-24 23:55:24 +02:00
Monty Marz
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Vechro
c9787846d5 Fix MSAA x16 2019-10-21 21:55:49 +03:00
Imbris
39656e92be Merge branch '276-hotloading-armor' into 'master' 
Resolve "Enable hotloading of different offsets for armors/weapons"

Closes #276

See merge request veloren/veloren!545
 2019-10-18 00:29:09 +00:00
Adam Fogle
c41627d75f Removed the recolor property from the armor ron files. 2019-10-17 19:45:29 -04:00
Monty Marz
fdfab6a807 refactor: create_projectile doesn't take a light 
It returns a builder so the caller can just do it
 2019-10-17 20:59:36 +00:00
Joshua Barretto
dcf8655202 Fixed srgb normal bug 2019-10-17 17:35:17 +01:00
Joshua Barretto
04c64dc122 Better (and faster) water shaders 2019-10-17 17:11:55 +01:00
Joshua Barretto
3279a278b7 Move computations to terrain fragment shaders 2019-10-16 15:05:45 +01:00
Joshua Barretto
c01e19fc05 Don't render water that isn't there, improved chunk render order 2019-10-16 12:40:18 +01:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation. 
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
 2019-10-16 11:39:41 +00:00
Adam Fogle
3a4c307d38 Code cleanup, formatting changes, and fixed the cloth belt's offset. 2019-10-16 00:42:57 -04:00
Joshua Barretto
4bbc340f52 Faster meshing, better dusk 2019-10-14 10:48:40 +01:00
Adam Fogle
8f7b4afafd Manifest file is now used to load armor. 
Redid how pants renders so they can use underlying skin model/coloring,
same as chest armor.
Redid how belts render so they can use the underly skin color,
same as shoulder or foot.
Converted a manifest variable name to snake case.
 2019-10-12 08:31:42 -04:00
Adam Fogle
a5db28113f Redid the mainfest files to remove race/gender. 
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
 2019-10-12 08:31:42 -04:00
Adam Fogle
da54cf76bc Armor names now end with left/right. 
Armor names no longer include their armor part.
This should be inferred from their folder.
 2019-10-12 08:31:42 -04:00
Adam Fogle
be53492e69 Added manifest files per armor type using the existing vox names. 2019-10-12 08:31:42 -04:00
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
Joshua Barretto
889fd678c6 More opaque water surface 2019-10-08 12:21:05 +01:00
Joshua Barretto
087bfffc8a Proper tree colour variation 2019-10-07 09:05:18 +01:00
Monty Marz
b3862278af Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Timo Koesters
f3787879d3 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
timokoesters
5a1052a1a6
Fix fonts 2019-10-04 21:30:32 +02:00
Pfauenauge90
e404ea0d4f
assets, rotation, offset changes 2019-10-04 21:02:42 +02:00
Pfauenauge90
39e5530d45
made bow available in char selection 2019-10-04 21:02:40 +02:00
Pfauenauge
b5180320fb
bow position 2019-10-04 21:02:40 +02:00
timokoesters
d46f1e1859
Initial bow & arrow implementation 2019-10-04 21:02:39 +02:00
Monty Marz
4c1eba1f3e Assets update, aesthetics, minor fixes 2019-10-04 18:27:12 +00:00
Songtronix
bced3cb638 feat(voxygen): add logo for windows executable 2019-10-02 16:57:08 +02:00
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Monty Marz
11a022abb3 Better stepping sounds (and minor voxel model fixes) 2019-09-27 16:04:22 +00:00
Imbris
a3daa6065a Add aa modes, with ui interface to switch 2019-09-26 23:14:27 -04:00
Imbris
432e828517 Add MSAAx4 2019-09-26 23:14:27 -04:00
Joshua Barretto
bef4f11536 Added sprite selection 2019-09-26 11:43:03 +01:00
Joshua Barretto
e22fe81a2f Added velorite 2019-09-26 00:15:07 +01:00
Joshua Barretto
7e6eede740 Better sun halo colours 2019-09-26 00:15:07 +01:00
Joshua Barretto
6dbeda3267 Better light attenuation 2019-09-26 00:15:07 +01:00
Joshua Barretto
499344ccab Added entity shadows 2019-09-26 00:15:07 +01:00
Joshua Barretto
899a7c56ab Dark water 2019-09-26 00:15:07 +01:00
Joshua Barretto
207568a012 Better day/night cycle, less intense sun 2019-09-26 00:15:07 +01:00
Joshua Barretto
71247f3e5d Fractional FXAA scaling 2019-09-26 00:15:07 +01:00
Joshua Barretto
dfcdd5656b Added persistent ambiance back 2019-09-26 00:15:07 +01:00
Joshua Barretto
46fdc87014 Animated chunk loading 2019-09-26 00:15:07 +01:00
Joshua Barretto
3979dddbc1 Faster meshing, better AO, colour correction 2019-09-26 00:15:07 +01:00
Joshua Barretto
f1d590464f Added colour smoothing 2019-09-26 00:15:07 +01:00
Imbris
34221a0f1d Disable AO 2019-09-26 00:15:07 +01:00
Joshua Barretto
a432cef263 Better colour correction 2019-09-26 00:15:07 +01:00
Monty Marz
11244bc182 Delete char window visuals, small scrolling fix for char creation background 2019-09-20 12:59:23 +00:00
Monty Marz
3a0131306f Character assets Part 1 2019-09-18 16:46:12 +00:00
Joshua Barretto
3f2e22f039 Exponential interpolation for linear damping 
With an additional approximation to allow for the same size jumps given different framerates.
 2019-09-09 19:11:40 +00:00
Joshua Barretto
f574b1748a Merge branch 'desttinghim/sound-effects' into 'master' 
Sound Effects

Closes #163 and #97

See merge request veloren/veloren!473
 2019-09-06 11:19:32 +00:00
Monty Marz
943495c0c5 Pixel art for axe and flying rod, shadow for zone names and death message 2019-09-05 17:28:33 +00:00
Louis Pearson
ad3bd0b2ce Add footstep sounds, implement crude footstep sounding 
Sounds are played every tick, which is not good.
 2019-09-05 03:08:09 -06:00
Imbris
8a994ada8e Remove derpy eyes :( , fix undead eye indices, fmt 2019-09-03 23:06:15 -04:00
jshipsey
ca4da22c7d fixing eyes, cleanup on offsets 2019-09-03 23:06:13 -04:00
jshipsey
178657c871 tweaked hair colors, head offsets, skin colors 2019-09-03 23:06:11 -04:00
Imbris
cc331c10b6 Remove use of empty.vox 2019-09-03 23:06:09 -04:00
Imbris
074eee06e6 Add pants coloring, chest and pants sliders 2019-09-03 23:06:06 -04:00
Pfauenauge90
bdb95be5cc hair and skin colours 2019-09-03 23:05:59 -04:00
Imbris
c4999f5e9d adjust how figure head coloring is done 2019-09-03 23:05:58 -04:00
Pfauenauge90
9654262938 model changes 2019-09-03 23:05:57 -04:00
jshipsey
a826eb76ec proper head offsets, more options 2019-09-03 23:05:56 -04:00
jshipsey
98175ffbce added more races with head/hair/eye offsets 2019-09-03 23:05:55 -04:00
Imbris
fd251c4d3a Fix sliders, remove uneeded method, fix aspect ratio in character creation 2019-09-03 23:05:54 -04:00
Imbris
7bebffb2af Add ron file for head offsets, segment unionizer 2019-09-03 23:05:52 -04:00
Imbris
ab34377309 Add basic segment combination 2019-09-03 23:05:50 -04:00
Imbris
e9bedf529d Pixel perfection, vox orientation, image rotation 2019-09-01 15:34:20 -04:00
Monty Marz
f53904b534 More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
Joshua Barretto
5a677b9c1e Added modular building generation 2019-08-31 11:44:52 +01:00
Pfauenauge90
50c4764588
changed debug wand visuals, added icons for 2h sword main and alt attack 2019-08-29 19:44:29 +02:00
timokoesters
6e1c78e5d5
Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
Pfauenauge90
8654622bfa colour tweaks 2019-08-21 20:43:38 +02:00
Monty Marz
fade04d44e Pfauenauge/plants grass 2019-08-21 17:22:05 +00:00
Joshua Barretto
55350d8f5f Better wind waving, improved sun ambiance 2019-08-21 17:03:03 +01:00
Joshua Barretto
0fcb3a174d Random terrain sprite orientations 2019-08-21 16:22:49 +01:00
Joshua Barretto
75e1ee3cd7 Added per-instance transformation matrix, variable wind swaying 2019-08-21 13:47:29 +01:00
Joshua Barretto
6a0be5dc35 Better sunset colours, stars no longer reflect in water 2019-08-20 16:26:12 +01:00
Joshua Barretto
4ed21a2e59 Sprite render distance tweaks and optimisations 2019-08-20 11:05:01 +01:00
Joshua Barretto
245c9af2e8 Patchier plants, wind swaying 2019-08-20 11:05:01 +01:00
Demonic
74c3eef352 Update flowers.vox 
made sunflowers smaller
 2019-08-19 20:09:48 -04:00
Joshua Barretto
29ea5ba20b Switched to singular flower 2019-08-20 00:53:22 +01:00
Demonic
886a289ab3 Seperated Flowers 2019-08-19 19:44:44 -04:00
Joshua Barretto
5f09ab3a4f Added multiple sprite block kind support 2019-08-20 00:31:11 +01:00
Joshua Barretto
7960e6ea6d Sprite distance fading, grass 2019-08-19 22:54:16 +01:00
Joshua Barretto
b31cca4bb3 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Monty Marz
29f6186139 hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
Joshua Barretto
749ec15bf9 Cleanup, comments 2019-08-18 10:33:18 +01:00
Joshua Barretto
75dbebbd05 More interesting waves 2019-08-18 10:33:18 +01:00
Joshua Barretto
f0e52e6002 Better reflections and water fog 2019-08-18 10:33:18 +01:00
Joshua Barretto
825d8bb632 Fixed water in caves, made water reflection vary with lighting 2019-08-18 10:33:18 +01:00
Joshua Barretto
5d4079b165 Better reflection calculations 2019-08-18 10:33:18 +01:00
Joshua Barretto
d65bacbea1 Better waves 2019-08-18 10:33:18 +01:00
Joshua Barretto
fa6825f13b Better fluid meshing, disabled fluid backface culling and depth buffer writing 2019-08-18 10:33:18 +01:00
Joshua Barretto
42237a84e4 Added translucent meshing pass, water reflections 2019-08-18 10:33:18 +01:00
Imbris
d89fff1499 Fix typo, move shaders back out of subfolders 2019-08-15 23:59:10 -04:00
Imbris
d99a4f8d39 Lighter 2019-08-15 23:59:09 -04:00
Imbris
6a477d6b69 Tweak lighting 2019-08-15 23:59:09 -04:00
Imbris
be0e0e52a8 Improve colors 2019-08-15 23:59:09 -04:00
Imbris
bdd7b2c22d move conversion to fragment shader 2019-08-15 23:56:14 -04:00
Imbris
c09eb77149 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
Imbris
cb25c45dec Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
Monty Marz
aac53f9311 Part 1 of implementing the social window 2019-08-07 13:14:26 +00:00
Monty Marz
ad5608b3f5 Fixes voxel errors in the human female hair 2019-08-04 18:55:20 +00:00
Monty Marz
8c1d244bf8 New Female Danari and Elf models, Airblocks for tower ruins and witch house 2019-08-04 11:23:01 +00:00
Monty Marz
a5926eb40a 0.3. login bg 2019-08-01 17:53:34 +00:00
Joshua Barretto
39fc1d6b71 Added entity pickup, changed item model 2019-08-01 09:12:00 +01:00
Monty Marz
5cfc60da50 Small chat fixes 2019-07-29 14:40:46 +00:00
Imbris
ff518a4a23 Ui scaling interface tweaks 2019-07-28 16:54:32 -04:00
Monty Marz
33565b9480 added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself 2019-07-28 09:21:17 +00:00
Pfauenauge90
7a141ad111 More objects 2019-07-24 02:50:19 +02:00
Vechro
f3c5ece983 Add tent 2019-07-24 02:50:19 +02:00
Pfauenauge90
215a2640f4 Update lantern_ground.vox 2019-07-24 02:50:19 +02:00
Vechro
81f66457de Add cauldron 2019-07-24 02:50:19 +02:00
Monty Marz
7a4ad099ff Crosshair variations 2019-07-23 01:02:57 +00:00
Monty Marz
ae4c569fc9 Static entities: Per model offsets, more models 2019-07-21 23:54:31 +00:00
Pfauenauge90
56433f0b40 pumpkin model 2019-07-21 19:22:49 +01:00
Pfauenauge90
bc61a6e759 added bomb, chest and scarecrow models 2019-07-21 19:22:49 +01:00
Monty Marz
ff6a72bc40 New orc head models 2019-07-14 14:34:47 +00:00
jshipsey
5cd1bfb3d2 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
Pfauenauge90
3be2951029 crosshair correction 2019-07-07 16:19:19 +02:00
Pfauenauge90
7455155198 more test items 2019-07-07 16:19:18 +02:00
Pfauenauge90
b99bd4a20a Bag window expands with available space 2019-07-07 16:19:17 +02:00
Pfauenauge
e66419b396 smaller border for available slots, item image size changed 2019-07-07 16:19:17 +02:00
Pfauenauge90
f4499e26af added visual test item 2019-07-07 16:19:15 +02:00
Piotr Korgól
7cf299503d Add crosshair 2019-07-03 21:28:07 +02:00
jshipsey
2ce5c5881e combat run/jump/idle animation states 2019-06-30 18:53:44 -04:00
Monty Marz
cef52a0440 Char fixes 2019-06-28 14:45:02 +00:00
Justin Shipsey
4ac7307f8f minor main menu changes 
made the settings button's text grey and removed hover/press image as long as it's not functional

changed server list placement and spacing
 2019-06-28 08:24:13 +00:00
Pfauenauge90
b5d529f824 changes restore 2019-06-26 19:14:12 +01:00
Joshua Barretto
3a1221068f Merge branch 'voxel-shadows' into 'master' 
Shadows, deserts, snow, caves

See merge request veloren/veloren!198
 2019-06-03 22:13:10 +00:00
Monty Marz
112f0515bd Button added 
Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f
 2019-06-02 02:17:36 +00:00
Cody
b05eb2b861
Changes asset filenames for consistencies. 2019-05-31 16:36:24 -04:00
Pfauenauge90
17b8dafd65 changed chest and pants colours 2019-05-31 18:05:55 +02:00
Louis Pearson
a3dafde081 Add better version of Snowtop 
Former-commit-id: ea47207ec7651d8c7eedea14f77399e96c3546b6
 2019-05-28 15:01:10 -06:00
jshipsey
5f22c4e26f swing animation 
Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c
 2019-05-27 18:54:09 -04:00
Monty Marz
8a3b308224 Wolf model assets update 
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
 2019-05-26 19:12:32 +00:00
jshipsey
26da091b0b add wolf 
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
 2019-05-26 10:39:57 -04:00
jshipsey
98630b3692 attack state 
Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df
 2019-05-24 18:42:22 -04:00
Monty Marz
70033245cc New Background image (.png) 
Former-commit-id: 35912f0ecb432f54a74daa076ff2b192aa100778
 2019-05-24 19:41:18 +00:00
Imbris
e9683ba639 Link player stats, remove self name tag 
Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7
 2019-05-24 02:31:03 -04:00
Monty Marz
cc9b028bf1 Disclaimer 
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
 2019-05-23 22:45:48 +00:00
Louis Pearson
7cfd3ad1cd Add field_grazing.ogg 
Former-commit-id: 36a5bf4a9af2d89e9acd8dd7404c0b4eb1836f5b
 2019-05-21 16:44:51 -06:00
Louis Pearson
315767f19f Add code to ignore jack as an audio device 
Former-commit-id: 1dbaa796f82f2e9be26a3648e9aaca81f3348134
 2019-05-18 13:53:57 -06:00
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
jshipsey
50fa3cf098 glide anim 
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
 2019-05-16 00:40:35 -04:00
jshipsey
efc019f7a4 idle, run, jump animations 
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
 2019-05-15 00:24:36 -04:00
jshipsey
732c43ce11 first quadruped changes 
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
 2019-05-13 19:43:10 -04:00
jshipsey
e8c91f753e Merge branch 'master' of https://gitlab.com/veloren/veloren 
Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291
 2019-05-12 21:52:44 -04:00
jshipsey
dec9632460 animation adjustments 
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
 2019-05-12 20:52:30 -04:00
Pfauenauge90
fc4103561e CharWindow 
Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd
 2019-05-11 21:36:27 -04:00
Pfauenauge
789e448aa3 positioning 
Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5
 2019-05-11 21:36:26 -04:00
Pfauenauge90
d772e2f8e4 Asset Update 
Former-commit-id: d2278cb6cb877e6c33bad29d63b1b0d6b5d65eee
 2019-05-11 21:35:53 -04:00
Pfauenauge
3f57ab4f2a positioning 
Former-commit-id: 510fcaea11f0e9293e73ba98fb9ad79b5dbbadb5
 2019-05-11 21:34:50 -04:00
Pfauenauge90
657bba06e9 asset update and import 
Former-commit-id: 43f616f166c3df87a19f0eca80a65f7a3c0e374c
 2019-05-11 21:33:48 -04:00
Pfauenauge
5aa5e84a46 positioning 
Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a
 2019-05-11 21:32:34 -04:00
Pfauenauge90
757fbdd653 Asset Update 
Former-commit-id: 2f3e58679059c3c97cec9312c6fa436d5510b901
 2019-05-11 21:32:30 -04:00
Pfauenauge
15816bdf6d positioning 
Former-commit-id: 44e8406af9c2b6db60f78f7ff161b7c700f024fd
 2019-05-11 21:31:17 -04:00
Pfauenauge90
0f6ec8dce3 asset update and import 
Former-commit-id: 455500aac3d82e2920bc02c6846ceb815122bb7d
 2019-05-11 21:31:15 -04:00
Pfauenauge90
750bf23c11 window frame black theme 
Former-commit-id: 61c48814834620fdea961380e8d878706ad0c52c
 2019-05-11 21:31:14 -04:00
jshipsey
ac78d322d6 animation orientation fix, first jump 
Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
 2019-05-09 18:57:47 +01:00
Joshua Barretto
d645af7d6a Re-added license 
Former-commit-id: 0d715123f3dc5f0ad4e46b28bba7b08253fc59c1
 2019-05-09 18:57:47 +01:00
Joshua Barretto
2e3288cc29 Adjusted view distance and worldgen 
Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452
 2019-05-09 18:57:47 +01:00
Forest
315ce93225 Add lfs files 
Former-commit-id: 6f7f0a40fa2fa1aee1f0276ec36466af80d15aa2
 2019-05-03 22:33:56 -04:00
Forest
7e84f0171d Rm assets folder 
Former-commit-id: 884896ec20991bd293c6ad4b2150c23a98a823a7
 2019-05-03 22:32:22 -04:00
Pfauenauge
f346acfb04 asset update 
Former-commit-id: 58b9a630dbf5d1b584d0df01c0ff5ca407a2f762
 2019-05-03 13:48:56 +02:00
Pfauenauge
c45494e70f textbox visuals 
Former-commit-id: 4ae65bb009a1e461143b3dbf3f3e52344148fa7c
 2019-05-03 13:48:56 +02:00
Pfauenauge
8240997f8c New Buttons and Input Frame 
Former-commit-id: cf05992eca9e6a75cedda8c873ef268e4bbaade8
 2019-05-03 13:48:55 +02:00
Pfauenauge90
116e13534c control window 
Former-commit-id: 478826a92ed7c86dfa926cc82da0afde96d44b63
 2019-05-03 13:48:54 +02:00
Pfauenauge90
9869e11d3a asset update 
Former-commit-id: 79d7f652f2ae7a150b66cc0612fb6a19b1bfcc79
 2019-05-03 13:48:53 +02:00
Imbris
93dcf434b1 point to latest asset commit 
Former-commit-id: 844f4c00d09b19ae3870565bb88fe184c6e8cccf
 2019-05-01 08:59:23 -04:00
Pfauenauge
3773653072 Closable minimap 
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
 2019-04-28 15:56:40 +02:00
Pfauenauge90
33515bd04c removed test_assets in voxygen 
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
 2019-04-28 13:18:00 +02:00
timokoesters
0bb35fe232 Update assets 
Former-commit-id: c3692838320a5da02525d9675de3f55249a39100
 2019-04-25 10:50:56 +02:00
jshipsey
a04ddf67f6 quadruped testing 
Former-commit-id: 07f4fb4484f26dae0e8503ddec32a17f2fa312b5
 2019-04-20 19:13:38 -04:00
Joshua Barretto
f69ad40bd5 Fixed aspect on scene start, added more information to post errors 
Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1
 2019-04-14 16:05:51 +01:00
Imbris
fb83c836a1 make to_server() blocking, post fixes & cleanup, use server address 
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
 2019-04-14 15:04:44 +02:00
RustyBamboo
3c3bf88d05 SUBMODULE: Update assets submodule 
Former-commit-id: 4a684ce74a65185b7734821a24323d4bc842d650
 2019-04-10 18:11:17 -04:00
Joshua Barretto
9bd97b5176 Updated asset submodule 
Former-commit-id: 2e14e80ecfee8eb939680c101b45311e96a93cf9
 2019-04-05 23:33:23 +01:00
Imbris
ca454d0c8b make chat arrow only appear when scrolled up and enable it 
Former-commit-id: 72bf830acea7fa273d90b996ce7bcf88f215d1bf
 2019-03-29 22:59:31 -04:00
Imbris
087f27b1e8 renamed some images 
Former-commit-id: 4d946fb640159a9a7db5600f54f43866794272d4
 2019-03-29 20:48:48 -04:00
Imbris
b619a2945b add chat arrow to asset repo 
Former-commit-id: 495fefe1766c59e6a0e48ca9b4deb121dc113c7f
 2019-03-29 20:32:39 -04:00
Pfauenauge
702e8321b1 Added chat arrow 
Former-commit-id: 387bf73af19e23678a9048ab3870665c88ff47b9
 2019-03-30 01:11:10 +01:00
Imbris
8c94b0fa2c updated assets 
Former-commit-id: ed8815d4afaadd37f8009895cae713324adfcd71
 2019-03-29 03:20:23 -04:00
Imbris
b579c0f34e assets submodule 
Former-commit-id: cf7cd4997f68c0c4f6902b14a4ee57fdcf6f26b2
 2019-03-29 02:59:08 -04:00
Joshua Barretto
18870ce03a Added voxygen submodule 
Former-commit-id: f830900201159f1338d83b3a1d0fb9f2b8786f23
 2019-03-04 20:31:38 +00:00