Imbris
|
52cf7c6f94
|
rebase fix, re-arrange hud img_ids
Former-commit-id: a5cb82f74afca531995fceea3ddf7ff53616dd1b
|
2019-05-11 22:35:15 -04:00 |
|
Pfauenauge90
|
fc4103561e
|
CharWindow
Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd
|
2019-05-11 21:36:27 -04:00 |
|
Pfauenauge
|
a59f0e57aa
|
char window
Former-commit-id: 2624ddd883c0ff555fc86efce767fda602de52eb
|
2019-05-11 21:36:27 -04:00 |
|
Pfauenauge
|
a6b792f930
|
Char Window
Former-commit-id: 0109555602ba39950f304bd0adc80df6175c3728
|
2019-05-11 21:36:27 -04:00 |
|
Pfauenauge
|
789e448aa3
|
positioning
Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5
|
2019-05-11 21:36:26 -04:00 |
|
Pfauenauge90
|
d772e2f8e4
|
Asset Update
Former-commit-id: d2278cb6cb877e6c33bad29d63b1b0d6b5d65eee
|
2019-05-11 21:35:53 -04:00 |
|
Pfauenauge
|
3f57ab4f2a
|
positioning
Former-commit-id: 510fcaea11f0e9293e73ba98fb9ad79b5dbbadb5
|
2019-05-11 21:34:50 -04:00 |
|
Pfauenauge90
|
657bba06e9
|
asset update and import
Former-commit-id: 43f616f166c3df87a19f0eca80a65f7a3c0e374c
|
2019-05-11 21:33:48 -04:00 |
|
Pfauenauge
|
bd23732c74
|
char window
Former-commit-id: 0c15336583eeaf32f0d86ef10b16c47f46d4db7f
|
2019-05-11 21:32:38 -04:00 |
|
Pfauenauge
|
5731484940
|
Char Window
Former-commit-id: c44ca056fe76b00e803d96825da69385cfecad39
|
2019-05-11 21:32:36 -04:00 |
|
Pfauenauge
|
5aa5e84a46
|
positioning
Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a
|
2019-05-11 21:32:34 -04:00 |
|
Pfauenauge90
|
757fbdd653
|
Asset Update
Former-commit-id: 2f3e58679059c3c97cec9312c6fa436d5510b901
|
2019-05-11 21:32:30 -04:00 |
|
Pfauenauge
|
15816bdf6d
|
positioning
Former-commit-id: 44e8406af9c2b6db60f78f7ff161b7c700f024fd
|
2019-05-11 21:31:17 -04:00 |
|
Pfauenauge90
|
0f6ec8dce3
|
asset update and import
Former-commit-id: 455500aac3d82e2920bc02c6846ceb815122bb7d
|
2019-05-11 21:31:15 -04:00 |
|
Pfauenauge90
|
750bf23c11
|
window frame black theme
Former-commit-id: 61c48814834620fdea961380e8d878706ad0c52c
|
2019-05-11 21:31:14 -04:00 |
|
Imbris
|
95a0c27d7d
|
Merge branch 'fix-fall-void' into 'master'
Temporary fix for falling into the void
See merge request veloren/veloren!122
Former-commit-id: ba8dc7b88bb06a0e9633475a40dbd58af53ecd69
|
2019-05-11 20:04:19 +00:00 |
|
timokoesters
|
bdf241bf24
|
Add TODO comment
Former-commit-id: fdc9e6d65d9d534e238a6ba2d1c2e66f194d975e
|
2019-05-11 21:48:05 +02:00 |
|
timokoesters
|
4ce1f9ee54
|
Temporary fix for falling into void
Former-commit-id: 8e3d9c0c34e897f13cc60d5968f390ed0107dd76
|
2019-05-11 21:38:05 +02:00 |
|
Forest Anderson
|
fbbdb8996b
|
Merge branch 'ui_fixes' into 'master'
Ui Fixes and Improvements (MS and Transparency)
See merge request veloren/veloren!121
Former-commit-id: 3dab489d2b185bdcfee05f87cee59cca54ead605
|
2019-05-11 15:35:42 +00:00 |
|
Imbris
|
1948bc6392
|
fix & remove some unused uses, cursor toggle tweak
Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f
|
2019-05-11 10:59:48 -04:00 |
|
Imbris
|
aed6750885
|
add multisampling option to voxel graphics
Former-commit-id: d5ca47cd029226d1268c6d860516bfea6f9c5cf6
|
2019-05-11 10:25:15 -04:00 |
|
Imbris
|
b99a8dea39
|
Stop recreating vertex buffers for ui
Former-commit-id: 6e9326d1bca942e4da70281e3d86b624f9d2504a
|
2019-05-11 10:22:20 -04:00 |
|
Imbris
|
9c07dcfcee
|
multiply image color by supplied color
Former-commit-id: c5e4ccde88d7170db7aa4d3bfce3e0ba1cf5e8c9
|
2019-05-11 10:22:18 -04:00 |
|
Imbris
|
89c06e8359
|
split up voxygen/src/ui/mod.rs
Former-commit-id: e220b1ce38f93fbb295c9aae3591e4b3899f57e4
|
2019-05-11 10:22:17 -04:00 |
|
Imbris
|
13350856db
|
small cleanup
Former-commit-id: 2996ce0cf33337bf52810f1e52b2c02d6eba5c7f
|
2019-05-11 10:22:16 -04:00 |
|
Imbris
|
caea30a34f
|
make ui ignore resize to <1.0 events
Former-commit-id: d4baa8234f6c25f2c28c07c1dbf06e6c191a4127
|
2019-05-11 10:22:16 -04:00 |
|
MidgeOnGithub
|
bbe971de7f
|
Fixes match pattern code that rendered an actionable branch unreachable.
Former-commit-id: 69f562bf54307ab7402dabe52e07a7a46ea4c4b1
|
2019-05-10 23:38:19 -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 |
|