Commit Graph

635 Commits

Author SHA1 Message Date
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
Joshua Yanovski
50c90e1cde Merge branch 'master' of gitlab.com:veloren/veloren into sharp/jungle 2019-08-19 11:04:09 +02:00
Joshua Yanovski
d8c864cf3a Making jungles work. 2019-08-19 01:52:26 +02: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
Vechro
71710fb091 Dungeon fixes 2019-08-18 10:33:18 +01:00
Vechro
6cf5b99857 Add water-based dungeons 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
Vechro
595f9ac3d2 Add a new dungeon, fixes for existing ones 2019-08-06 12:51:14 +03: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
Joshua Barretto
7c6479a1fa More dungeons 2019-08-04 10:09:51 +01:00
Joshua Barretto
8b9a92b30e Added dungeons 2019-08-03 22:15:23 +01: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
Joshua Barretto
e7dd151833 Added fruit trees 2019-07-09 17:08:43 +01:00
Joshua Barretto
879789ecc4 Fixed acacia colours 2019-07-08 20:28:48 +01:00
Joshua Barretto
6b415c1b87 Added large ribcages in deserts 2019-07-08 17:57:41 +01:00
Joshua Barretto
14ba09f96b Added acacia trees, desert bones, fixed minor worldgen issues 2019-07-08 17:41:20 +01:00
Joshua Barretto
c2a11ed6b2 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
Joshua Barretto
44b5473a82 Added rare structures, totally refactored structure spawning 2019-07-08 00:50:36 +01:00
jshipsey
5cd1bfb3d2 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
Pfauenauge90
a56747b555 acacia trees 2019-07-07 16:19:20 +02: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
Joshua Barretto
0734529ef6 Made postprocessing brighter 2019-06-26 19:14:12 +01:00
Joshua Barretto
b94c0ace8c Removed RefCell from column cache 2019-06-26 19:14:12 +01:00
Pfauenauge90
d75160e2f8 oak size changes 2019-06-26 19:14:12 +01:00
Pfauenauge90
b5d529f824 changes restore 2019-06-26 19:14:12 +01:00
Joshua Barretto
b987bda9ce Stronger shadows, fewer cliffs in oceans 2019-06-26 19:14:12 +01:00
Monty Marz
9f5fe0231f palette changes 2019-06-13 11:59:05 +01:00
Pfauenauge90
e7649e1db4 small fixes 2019-06-13 11:59:05 +01:00
Pfauenauge90
43ca660e63 tree stumps, shorter pines 2019-06-13 11:59:05 +01:00
Monty Marz
bac7bad9f7 Tree fixes 2019-06-13 11:59:05 +01:00
Forest Anderson
4548ec3bf9 Merge branch 'randomized-npc-names' into 'master'
Added randomized NPC names veloren/veloren#133

Closes #133

See merge request veloren/veloren!207
2019-06-04 05:23:25 +00:00
scorpion9979
7bfd9464c9 Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
7919442d3d Implemented asset system for caching json data 2019-06-04 01:10:59 -04: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
Joshua Barretto
e618e97b1f Improved cave noise 2019-06-03 22:50:47 +01:00
Pfauenauge90
455b99ed37 human house assets 2019-06-03 22:50:47 +01:00
Pfauenauge90
ce6a9ac32d Roots added
fmt

asset fix
2019-06-03 22:50:27 +01: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
53ffc50242 Even more assets with offsets 2019-05-31 18:05:56 +02:00
Pfauenauge90
17b8dafd65 changed chest and pants colours 2019-05-31 18:05:55 +02:00
Pfauenauge90
47e4c297d8 more assets, offsets for temperate trees 2019-05-31 18:05:55 +02:00
Pfauenauge90
04ec381715 Asset path change 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
Joshua Barretto
c919f6fc83 Better tree spawning, more trees
Former-commit-id: abf4ff8a2eb005c2cd1832f5a3ae7182c4fc31f6
2019-05-25 06:38:40 +01:00
Joshua Barretto
c8ba5d9f89 Basic pine tree spawning
Former-commit-id: e58374724f6c9cb4a54ae96abd3420b02207fd30
2019-05-25 05:51:45 +01: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