883 Commits

Author SHA1 Message Date
Imbris
3988daed39 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
Imbris
35d490bc1e Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
Acrimon
dc1e4d1ae8 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
Piotr Korgól
28c47663d0 Give singleplayer its own server settings 2019-08-14 17:51:59 +02:00
Geno
e8342cd4a3 added first person switch 2019-08-13 17:54:13 +00:00
Acrimon
7c8487ed76 Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
058ecb8ada Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
Joshua Barretto
66db9a6f09 Merge branch 'telastrus/auth' into 'master'
Server-side authentication

See merge request veloren/veloren!419
2019-08-09 01:37:44 +00:00
telastrus
35c89a5aaf fixed the silent kick, made it actually proper 2019-08-08 17:58:36 -04:00
telastrus
62df0d3503 actually removed printlns 2019-08-08 12:09:14 -04:00
telastrus
7e4e132307 ran cargo fmt 2019-08-08 12:05:38 -04:00
telastrus
12a3258ee2 auth done, no popup yet 2019-08-08 12:01:15 -04:00
telastrus
2f7648b9a6 90% there 2019-08-08 11:23:58 -04:00
telastrus
25726babac velocity fix 2019-08-08 10:42:23 -04:00
telastrus
608deba238 still compiles 2019-08-07 23:56:02 -04:00
telastrus
74b42160ee laying the groundwork 2019-08-07 15:42:44 -04:00
Monty Marz
2101f27ffb Part 1 of implementing the social window 2019-08-07 13:14:26 +00:00
telastrus
b05f99d809 undo unnecessary pub mod
fixed comments

fixed other comment
2019-08-06 22:46:25 -04:00
telastrus
687a042cfa fall damage + velocity debug 2019-08-06 17:51:13 -04:00
Joshua Barretto
c8ce4459e8 Collision fixes, better camera in build mode 2019-08-06 16:00:14 +01:00
Marcel
17aae64bf5 Merge branch 'timo-cleanup' into 'master'
Implement specifier syntax and cleanup

See merge request veloren/veloren!413
2019-08-06 06:52:24 +00:00
timokoesters
a6691a3f58 Implement specifier syntax and cleanup 2019-08-06 08:31:48 +02:00
telastrus
423d990132 reverted some unnecessary changes
corrected typo

ran cargo fmt
2019-08-05 19:41:31 -04:00
telastrus
fe06ae6510 Added adjustable FOV slider 2019-08-05 12:37:52 -04:00
Joshua Barretto
a82ae863f3 Improved orientation slerping 2019-08-04 15:51:17 +01:00
Joshua Barretto
da7c3020a2 Stopped stars appearing in the day 2019-08-04 15:30:45 +01:00
Piotr Korgól
9637bb89aa Change the version number to 0.3 2019-08-04 13:53:59 +02:00
Joshua Barretto
744f69e271 Reverted parenthesis removal 2019-08-04 12:35:03 +01:00
Joshua Barretto
5aed7db800 Reverted sun diffuse change 2019-08-04 12:25:15 +01:00
Tesseract
01fc0c44e4 Reverted to old star shader 2019-08-04 12:25:15 +01:00
Tesseract
451bcd2649 Optimised fragment and vertex shaders. Framebuffer depth target changed from DEPTH24_STENCIL8 to DEPTH24 for faster depth writing and reading (no bitwise operations needed). 2019-08-04 12:25:15 +01:00
Monty Marz
f83092a03c New Female Danari and Elf models, Airblocks for tower ruins and witch house 2019-08-04 11:23:01 +00:00
Joshua Barretto
8a07cd96bf Merge branch 'timo-kill-xp' into 'master'
Give xp depending on max hp and lvl of entity killed

See merge request veloren/veloren!400
2019-08-03 20:57:06 +00:00
timokoesters
656d881c6c Give xp depending on max hp and lvl of entity killed 2019-08-03 21:30:01 +02:00
Joshua Barretto
9cde590574 Made nametag position change with scale 2019-08-03 19:40:20 +01:00
Joshua Barretto
96029f6614 Merge branch 'animation-tweaks' into 'master'
animation and movement tweaks

See merge request veloren/veloren!389
2019-08-03 12:09:38 +00:00
timokoesters
5288ae2fcf Fix combat animations for non humanoids 2019-08-03 12:53:39 +01:00
Joshua Barretto
867978dd1d Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01:00
jshipsey
e38a930f99 improved animations and movement 2019-08-01 23:57:26 -04:00
Dominik Broński
48a4377bf8 Revert "Merge branch 'imbris/upgrade_specs' into 'master'"
This reverts merge request !375
2019-08-01 23:32:33 +00:00
Imbris
bafea1884f Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00
Monty Marz
e6196aa325 0.3. login bg 2019-08-01 17:53:34 +00:00
Piotr Korgól
597483e4e0 Add a health bonus for level ups, fix pets 2019-08-01 18:56:08 +02:00
Joshua Barretto
e86e469b6d Fixed absolute darkness 2019-08-01 09:12:00 +01:00
Joshua Barretto
ac16ee945f Added entity pickup, changed item model 2019-08-01 09:12:00 +01:00
Joshua Barretto
7a40346096 Altered Item structure 2019-08-01 09:12:00 +01:00
Joshua Barretto
ae1eaabcaa Added better item manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
75b83a39c7 Clickthrough on items 2019-08-01 09:09:26 +01:00
Pfauenauge90
91d7cdcd71 fixed UI layering leading to unresponsive slots 2019-08-01 09:09:26 +01:00
Joshua Barretto
757f96ea4a Started work on inventory manipulation 2019-08-01 09:09:26 +01:00