Louis Pearson
5a04e98725
Change asset paths to be relative
...
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
2019-05-18 13:37:44 -06:00
Louis Pearson
d55e803ab5
Use PathBuf to load files
...
Former-commit-id: b72084fab1b8faeabc47eee927654f963643bb78
2019-05-18 13:30:52 -06:00
Joshua Barretto
14b28a4a17
Merge branch 'Char-Selection' into 'master'
...
Char selection
Closes #38
See merge request veloren/veloren!137
Former-commit-id: 9004df2856e00255167d639c051e46c2adc9785e
2019-05-18 19:03:13 +00:00
Forest Anderson
2e7984ebc3
Char selection
...
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
2019-05-18 19:03:13 +00:00
Joshua Barretto
db2b823fe1
Merge branch 'master' into 'master'
...
Colour adjustment and server crash fix
See merge request veloren/veloren!148
Former-commit-id: b0a42340d22980ec25162255bf41855337a8be0b
2019-05-18 17:32:56 +00:00
Joshua Barretto
7f857daa91
Colour adjustment and server crash fix
...
Former-commit-id: 7a1f6dcccc9869472f6044407d063ea86bb12dd3
2019-05-18 17:47:55 +01:00
Joshua Barretto
119abb92c9
Merge branch 'inventory' into 'master'
...
Create a skeleton for the Inventory system and Item system
See merge request veloren/veloren!147
Former-commit-id: 714d743ca466066c84cf408c81310b77cac0208f
2019-05-18 16:46:14 +00:00
Piotr Korgól
0e2b09a5f8
Create a skeleton for the Inventory system and Item system
...
Former-commit-id: 2579b70257ee9faa6d8614c33677ad0fc3c77a0d
2019-05-18 16:46:14 +00:00
Joshua Barretto
03502c1bac
Merge branch 'language-fixes' into 'master'
...
Pedantic comment and language fixes.
See merge request veloren/veloren!145
Former-commit-id: fe4867a506f2822c243b0bee433ffa85805ced87
2019-05-17 22:40:42 +00:00
Cody
6b09fd7c53
Pedantic comment and language fixes.
...
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
2019-05-17 18:32:07 -04:00
Imbris
96cdbdb881
Merge branch 'chonks' into 'master'
...
Chonks!
See merge request veloren/veloren!144
Former-commit-id: ec1b239237f63479886add6a5722b6e9e76761e1
2019-05-17 22:01:28 +00:00
Joshua Barretto
5a2c7a7813
Removed accidental println
...
Former-commit-id: a203e8105cd42463b9a72245e1623dde68874571
2019-05-17 22:55:50 +01:00
Joshua Barretto
7174830279
fmt
...
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7
Added chonks
...
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
2019-05-17 18:44:30 +01:00
Joshua Barretto
fa052a22b7
More lenient max deltatime to avoid physics lag
...
Former-commit-id: bdd4a9d634f9aa1e52ab3885e5b8a49348011760
2019-05-17 13:39:40 +01:00
Joshua Barretto
babb5ff0cd
Merge branch 'fix_minimize_and_cleanup' into 'master'
...
Fix minimize crash and cleanup
See merge request veloren/veloren!142
Former-commit-id: b2b8524e1dffee097c3ca4f47ca48b6fc4bbfc01
2019-05-17 08:26:58 +00:00
Imbris
8e0c1b1abd
cleanup some warnings, pretty crash string literal
...
Former-commit-id: 43492866f624c12c87762a94188c6c193e5bb90c
2019-05-17 03:55:51 -04:00
Imbris
c780b85f24
Stop crash when minimizing
...
Former-commit-id: ca52ae2520bf5616d24f27d98244a470966f3573
2019-05-17 01:13:14 -04:00
Forest Anderson
ee83fb4268
Merge branch 'add-contributing-instructions' into 'master'
...
Add CONTRIBUTING
See merge request veloren/veloren!130
Former-commit-id: eb66685558ac696ef4996dc37abfc048395e977e
2019-05-17 01:34:07 +00:00
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
