Forest Anderson
f3fd02836e
Add CONTRIBUTING
...
Former-commit-id: 00d6f8e20f539cbe0a631d5a5d600c0b73b4f203
2019-05-17 01:34:07 +00:00
Joshua Barretto
ba8c8cfdf3
Merge branch 'master' into 'master'
...
Stopped syncing time
See merge request veloren/veloren!141
Former-commit-id: 654d855682af6300e964955f2784ef0b8932aaca
2019-05-16 23:27:49 +00:00
Joshua Barretto
3940e73b31
Stopped syncing time
...
Former-commit-id: 8453a8f1c2361b1e6b5bb7f11470c33f2c0f910b
2019-05-17 00:26:18 +01:00
Joshua Barretto
dfb9e93052
Merge branch 'master' into 'master'
...
Colour in figure shader and sphynx update
See merge request veloren/veloren!134
Former-commit-id: a1682becf03294a30e96b15afbd5fdf2c3d24028
2019-05-16 23:14:59 +00:00
Joshua Barretto
db4be8e492
Updated sphynx
...
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
2019-05-17 00:05:46 +01:00
Joshua Barretto
6f984ca181
Added figure colour to shader and health component
...
Former-commit-id: e2c23e5132991cc436a678af43782e31ffc55516
2019-05-16 23:34:57 +01:00
Joshua Barretto
ef8daef828
Merge branch 'gliding' into 'master'
...
Gliding
See merge request veloren/veloren!140
Former-commit-id: 7e1471af2a250e28557d593944719954e6af4bbe
2019-05-16 22:18:12 +00:00
Joshua Barretto
04f83732e1
fmt
...
Former-commit-id: ba065e557c6309cfd7a743db5b52544ee57c3469
2019-05-16 22:04:16 +01:00
Joshua Barretto
7e8d8f4471
Fixed occasional chunk load failures
...
Former-commit-id: cf425a925cbcea4800f5e2ab82f8fb455cf96824
2019-05-16 21:18:48 +01:00
Joshua Barretto
7b09070fc8
fmt
...
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
2019-05-16 20:23:45 +01:00
Joshua Barretto
a0e685c03f
Improved falling glider physics
...
Former-commit-id: 752c1291c7d38282312446c5391c2fb4fa7cbf6e
2019-05-16 14:13:28 +01:00
Joshua Barretto
bb95f5bf78
Added correct gliding animation calculation
...
Former-commit-id: 625310820c9cf7a1d37401875db43b5b597eb590
2019-05-16 12:04:42 +01:00
jshipsey
6db00e371d
popup origin fix
...
Former-commit-id: 9a7ba69115e7b574bc2f3bf26afad71e3c682c38
2019-05-16 01:29:48 -04:00
jshipsey
50fa3cf098
glide anim
...
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
2019-05-16 00:40:35 -04:00
Joshua Barretto
5092df0e7f
Improved quadruped origin
...
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
2019-05-15 17:06:58 +01:00
Joshua Barretto
7ac973623f
Fixed friction
...
Former-commit-id: d9ac7fa7fb98c2ac829470fa8deeb314cc0f15f6
2019-05-15 13:26:14 +01:00
Joshua Barretto
5c57568d31
Fixed physics
...
Former-commit-id: b4b208754e38aba2150efe99d319638910f64904
2019-05-15 13:26:14 +01:00
Joshua Barretto
8ef8c178d7
Added test gliding
...
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
2019-05-15 13:26:14 +01:00
Joshua Barretto
8af606e348
Fixed singleplayer logout crash due to orphaned mesh worker
...
Former-commit-id: 2b8c5aa0c906223ac043db8137ad95a0e29407c5
2019-05-15 13:26:14 +01:00
Joshua Barretto
e8b6e120dc
Fixed pet spawning bug
...
Former-commit-id: 78dcd034940a4de1ce7d66a79d9134be6ee281f2
2019-05-15 13:26:14 +01:00
Joshua Barretto
1209f0393d
Added figure colour to shader and health component
...
Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96
2019-05-15 13:26:14 +01:00
Imbris
8b97ee14bc
add backtrace to panic hook
...
Former-commit-id: c831dfa85ebfa1ace05e5ffdec5cc68954394ae1
2019-05-15 13:24:32 +01:00
Louis Pearson
85e97e16d3
Change vec<u8> to BufReader
...
Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155
2019-05-15 13:24:32 +01:00
jshipsey
efc019f7a4
idle, run, jump animations
...
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
2019-05-15 00:24:36 -04:00
Joshua Barretto
49cc422dfa
Fixed quadruped animation selection
...
Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0
2019-05-14 12:37:05 +01:00
Joshua Barretto
090247c20c
Merge branch 'backtrace' into 'master'
...
Log backtrace in panic hook in Voxygen
See merge request veloren/veloren!139
Former-commit-id: 14c53ea6eaf57dbd2acf743f7b47a9916f3615fe
2019-05-14 08:01:08 +00:00
Imbris
3b5fec6630
add backtrace to panic hook
...
Former-commit-id: 3f66b4b72347a734779c1611814be88df4f8397b
2019-05-14 03:41:27 -04:00
jshipsey
2a2b873f56
added skeleton, needs animation fix
...
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
2019-05-13 22:24:34 -04:00
Joshua Barretto
cf487589e2
Made model cache handle non-humanoids
...
Former-commit-id: 4b3efb70ba24a8e4c8e1d933752e8ea28d3e8dd1
2019-05-14 01:02:37 +01:00
jshipsey
732c43ce11
first quadruped changes
...
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
2019-05-13 19:43:10 -04:00
Joshua Barretto
02890e723c
Merge branch 'asset_bufreader' into 'master'
...
Use bufreader for assets instead of vec<u8>
See merge request veloren/veloren!138
Former-commit-id: de3c1bd5b5bb7ae6fb24a3a8c5daa88f22e124ca
2019-05-13 23:39:39 +00:00
Louis Pearson
5d5042840e
Change vec<u8> to BufReader
...
Former-commit-id: 4ca814a93cf697f79512ea982d68044539092019
2019-05-13 17:28:17 -06:00
Imbris
3a0befee8c
Merge branch 'image_slider' into 'master'
...
Add ImageSlider widget
See merge request veloren/veloren!136
Former-commit-id: 8cba0b156b2ff9f65b6ed3479eab8756fe6aa4ba
2019-05-13 17:20:29 +00:00
Imbris
ca60b86f53
add ImageSlider widget
...
Former-commit-id: 218eb14090365f9ea3c6fb956fcdb989d51aaea2
2019-05-13 13:09:38 -04:00
Forest Anderson
d7266c286c
Merge branch 'fix-lfs-assets' into 'master'
...
Fix lfs assets
See merge request veloren/veloren!135
Former-commit-id: 4bc3537597581e69c64679d3a8fe19e53eacd910
2019-05-13 14:44:59 +00:00
Forest
3333987fcb
Only push on master
...
Former-commit-id: a252869ed2e3c6779411c8f571acf413de173a78
2019-05-13 10:43:06 -04:00
Forest
ac25e27718
Always pull LFS
...
Former-commit-id: 37f76cd968ad778e4e259cca9390e7b10179795d
2019-05-13 09:45:21 -04:00
Joshua Barretto
5c36aaf01f
Merge branch '79-glsl-include' into 'master'
...
Move u_globals to shared included file
See merge request veloren/veloren!124
Former-commit-id: 297d46cfe956881ae7a22528fc4c12b8c5ed5c56
2019-05-13 13:40:02 +00:00
Joshua Barretto
d56a47c0bb
Merge branch 'master' into 'master'
...
Massively increased efficiency of terrain meshing, chunks generate from centre
See merge request veloren/veloren!133
Former-commit-id: 71c0903b7e037fd087c06613e992cd77fc2d3f96
2019-05-13 12:33:39 +00:00
Joshua Barretto
67241fec31
Massively increased efficiency of terrain meshing, chunks generate from centre
...
Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a
2019-05-13 13:08:17 +01:00
Joshua Barretto
a8d356e710
Merge branch 'master' into 'master'
...
Switch to actor system, terrain performance improvements
See merge request veloren/veloren!131
Former-commit-id: 363bd800e2bd068e8ef7b1ef167c3a3cee01cf4d
2019-05-13 10:47:47 +00:00
Joshua Barretto
ee380782fb
fmt
...
Former-commit-id: 140f1e4f1809b70881a51a3bd943e1697a9dc0a2
2019-05-13 11:29:35 +01:00
Joshua Barretto
4f53be633e
sync
...
Former-commit-id: 708f80eabb9dc4052d35ed03875ef7ae485d6170
2019-05-13 11:15:03 +01:00
Joshua Barretto
0b1ea359fa
Adjustments to VolMap
...
Former-commit-id: 53ba7185102e7ff17825891d02bd0e26e5fe1076
2019-05-13 11:06:59 +01:00
Joshua Barretto
edfd2290eb
Massively sped up VolMap offset calculations
...
Former-commit-id: 8f3cdf57a77691ca60c0921bc86a79c8cfe36539
2019-05-13 11:06:58 +01:00
Joshua Barretto
216819ca92
fmt
...
Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a
2019-05-13 11:06:58 +01:00
Joshua Barretto
761c6e9cf8
Switched to actor system
...
Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc
2019-05-13 11:06:58 +01:00
robojumper
ba10ca38ba
Fix chunk meshing
...
Former-commit-id: d3a53602e4b480ab9db0a2a98e25cbba5081b624
2019-05-13 11:03:47 +01:00
sxv20_
f600eca072
start fixing chunk rendering, noticed stack overflow crash
...
Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf
2019-05-13 11:03:47 +01:00
sxv20_
592477752e
move sample() to returning VolMap, incomplete VolMap meshing code
...
Former-commit-id: 77d3db6c3bf28364089647802f83d2d00f3a152d
2019-05-13 11:03:47 +01:00
