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
2,258 Commits 151 Branches 18 Tags 2.1 GiB
bdf74cf151
Commit Graph

194 Commits

Author SHA1 Message Date
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
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