jshipsey
dec9632460
animation adjustments
...
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
2019-05-12 20:52:30 -04:00
Forest Anderson
797c8f5bb7
Merge branch 'run-fmt' into 'master'
...
Ran fmt
See merge request veloren/veloren!118
Former-commit-id: 1b88b4cfd3c87f24baa109850a4020cca5af0773
2019-05-09 21:33:24 +00:00
Forest Anderson
cf22cb99e7
Ran fmt
...
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
2019-05-09 17:30:44 -04:00
Joshua Barretto
30c2972852
Merge branch 'master' into 'master'
...
Fixes to head animations
See merge request veloren/veloren!117
Former-commit-id: 72ebfcbca32f3c23358579abca0c1b4d4a63ae87
2019-05-09 21:13:20 +00:00
Joshua Barretto
89f9589cf0
Fixes to head animations
...
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
2019-05-09 20:18:13 +01:00
Joshua Barretto
6eba4e6afa
Merge branch 'master' into 'master'
...
Temporary networking issue fix
See merge request veloren/veloren!116
Former-commit-id: d733d6e7f57f83d48f3cce211b81be42aa25b5fa
2019-05-09 18:39:30 +00:00
Joshua Barretto
faf53ad5c9
Temporary networking issue fix
...
Former-commit-id: e6b47f7d8478c28d837e55b85f2f2d028e988737
2019-05-09 19:38:37 +01:00
Forest Anderson
119576562c
Merge branch 'master' into 'master'
...
A lot of small things
See merge request veloren/veloren!78
Former-commit-id: 6304aceeb8a8a7808658ca7f67de5f16ddf5f3e6
2019-05-09 18:03:48 +00:00
Joshua Barretto
54cc9e137a
fmt
...
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
2019-05-09 18:58:16 +01:00
Joshua Barretto
3b44bda43c
Secret feature
...
Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2
2019-05-09 18:57:47 +01:00
Joshua Barretto
cf4e02252a
Smartened up terrain generation
...
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
2019-05-09 18:57:47 +01:00
Joshua Barretto
94fd0b1a22
Fixed running animation, changed movement physics
...
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
2019-05-09 18:57:47 +01:00
Joshua Barretto
1e1b005cbb
Post-processing tests
...
Former-commit-id: 133d737a58d9de4fa0b41268cc2f88d2427d3637
2019-05-09 18:57:47 +01:00
jshipsey
ac78d322d6
animation orientation fix, first jump
...
Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
2019-05-09 18:57:47 +01:00
Joshua Barretto
6da495f0bd
Fixed window resizing
...
Former-commit-id: 81f2e18274aadb53b07704cf10c5c27efdccb032
2019-05-09 18:57:47 +01:00
Joshua Barretto
df9b64355a
Improved singleplayer error handling
...
Former-commit-id: 0e33493bbb588ab0cd5278ec92b5859712446f4b
2019-05-09 18:57:47 +01:00
Joshua Barretto
e5db851f30
Added FXAA to post-processing shader
...
Former-commit-id: 9cfdb3762b63688d1b59d65066c90355c7209c62
2019-05-09 18:57:47 +01:00
Joshua Barretto
c48a82e78d
Adjusted sun and added F16 render target
...
Former-commit-id: 5585e0038846ef34378933eeb9051714ffe2c100
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
871767ada0
Made single-player server start on random unused port
...
Former-commit-id: 95ec85b9be58d0fd348144c398004a69676eb6cd
2019-05-09 18:57:47 +01:00
Joshua Barretto
3705f9a871
Added anim_time to animations
...
Former-commit-id: 44ec8108c41a3cad74b6f3c0a2df02e5166a5487
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
Joshua Barretto
e6a40bbda2
Added jumping and Jump animation state
...
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
2019-05-09 18:57:47 +01:00
Joshua Barretto
5aa8a67800
Added jump button
...
Former-commit-id: 614614fbe0a8cfc29d28010084078d4441734307
2019-05-09 18:57:47 +01:00
Joshua Barretto
9ebe3c3e6f
Added a delta time cap to avoid missing important physics events
...
Former-commit-id: e9f14ddda0963537ae6593c2dacc6a877f88c824
2019-05-09 18:57:47 +01:00
Joshua Barretto
342ea6aa65
Significantly upped view distances
...
Former-commit-id: 4cd306ebfa1acd765cb68d4a6d5a026b43fafa2f
2019-05-09 18:57:47 +01:00
Joshua Barretto
3cd48ba468
Added lz4 compression to networking
...
Former-commit-id: 7910c933f110d595da70552716b6e8f0eb7544a1
2019-05-09 18:57:47 +01:00
Joshua Barretto
b8418c116f
Smaller worldgen range
...
Former-commit-id: 4c156376b5a835dadd5709b91a38ec8e00ab72fd
2019-05-09 18:57:47 +01:00
Joshua Barretto
bdf0e92e45
HAAAAAAAANDS
...
Former-commit-id: 88927242c21471888a00799110b6bc542e9e18a2
2019-05-09 18:57:47 +01:00
Joshua Barretto
33e93ef25f
Added basic byte XOR checksum
...
Former-commit-id: 2e8c23ce51038fd7442cc489d9cb45838f3378c3
2019-05-09 18:57:47 +01:00
Forest Anderson
87fab23dc8
Merge branch 'panic-clarity' into 'master'
...
Issue-83: Voxygen, main, extracting payload from PanicInfo
See merge request veloren/veloren!115
Former-commit-id: 459f40cd6a676a75e5e1eb84f73b8ac94dc8ddb5
2019-05-09 17:49:43 +00:00
Vsevolod Timchenko
af4192869d
whitespaces fmt fix
...
Former-commit-id: 1f9296d4f773f2da6e222a89f471f30c77b432fa
2019-05-09 20:27:07 +03:00
Imbris
3faf4855cc
Merge branch 'cursorgrab' into 'master'
...
Improve cursor grab
Closes #55
See merge request veloren/veloren!113
Former-commit-id: 56ade58e0a2f55f657f8b714a2216023659b161f
2019-05-09 17:02:24 +00:00
timokoesters
a58b5ceb3a
Fix bug when pressing ToggleMouse twice while grabbed
...
Former-commit-id: 9e01b71577fd3dbe570b7aca1e041c32e9a01c66
2019-05-09 18:55:13 +02:00
Timo Koesters
cd00bcdfa4
Merge branch 'mainmenu-assets' into 'master'
...
Use image_ids! and font_ids! in main menu and char selection menu
See merge request veloren/veloren!114
Former-commit-id: 06087f38f1646bcad9e029529932afe932e0bee2
2019-05-09 13:28:42 +00:00
timokoesters
e8cf815143
Force ungrab on Key::ToggleCursor
...
Former-commit-id: 222f5693363662d25cb065fdc104cd079e2c395d
2019-05-09 10:55:32 +02:00
timokoesters
a86dc3ae80
Remove unused code
...
Former-commit-id: 80eb4dcdea740323b510e11b6e08cd6e13709dff
2019-05-09 06:55:26 +02:00
Forest Anderson
8b4d998943
Merge branch 'fix-doc-test' into 'master'
...
Fix doc test
See merge request veloren/veloren!112
Former-commit-id: 7330a2022ac892a60a7c9df7ac42d7b054622301
2019-05-08 23:06:07 +00:00
timokoesters
2309ce599c
Move font_ids! into mod.rs
...
Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae
2019-05-08 22:25:15 +02:00
timokoesters
0e46b00a0c
Minor fixes
...
Former-commit-id: 9c5e90e2bad24e9b5c443bfb1509b18877adf2d6
2019-05-08 22:15:58 +02:00
Vsevolod Timchenko
1cfd0de2ba
Added unpacking
...
to panic messages, issue #83
Former-commit-id: 55b45773d049834a7a6cf43bbdf656cba7290f74
2019-05-08 23:01:02 +03:00
timokoesters
854271f321
Make use of image_ids! in char selection
...
Former-commit-id: 98a11ae94aa299a8eb9e5e4d69cb99c7753f626b
2019-05-08 20:40:34 +02:00
timokoesters
31ab734f90
Make use of image_ids! in the main menu
...
Former-commit-id: 30b040b0ff046d0ae63394a2331866a6aec6b25f
2019-05-08 20:19:57 +02:00
timokoesters
f6b27db6dd
Improve formatting
...
Former-commit-id: b2167cd982c37b3716fa74d3e75d27e5cf3c65ce
2019-05-08 20:19:38 +02:00
Forest Anderson
4d29dbdb18
Merge branch 'timo_assets_rebased' into 'master'
...
New asset system, split hud.rs, macros for img and font id structs (Timo)
See merge request veloren/veloren!111
Former-commit-id: 4765e936dd445d651348b2460707faacd5273d61
2019-05-08 02:31:22 +00:00
Imbris
470e63a691
Remove or uncomment commented code
...
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
2019-05-07 21:59:35 -04:00
Forest Anderson
23b76e95f9
Merge branch 'reusable-commit-build-job' into 'master'
...
Reusable commit build job for linux and windows.
See merge request veloren/veloren!104
Former-commit-id: 65896515ab1571917fc56e4d7f102c9452d43c91
2019-05-08 00:53:55 +00:00
timokoesters
a15532f81a
Improve cursor grab
...
Former-commit-id: c1a8b5383bf7682245e2294e5b1d62dae0beb329
2019-05-07 22:00:03 +02:00
timokoesters
24161d4521
Fix doc test
...
Former-commit-id: e08cb9fdfca5b3d12a34220ef4af042d6fb913e6
2019-05-07 20:59:06 +02:00
timokoesters
7132cfdf5b
Fix doc test
...
Former-commit-id: e347ad79dd229d72f70820189e6ae6011868c5ef
2019-05-07 20:36:07 +02:00
