jshipsey
1bc03efa90
minor alignment fix
...
Former-commit-id: ecfa2eff0982e21d523a8a454890a1e6ed6d9bd7
2019-05-12 22:10:47 -04:00
jshipsey
e8c91f753e
Merge branch 'master' of https://gitlab.com/veloren/veloren
...
Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291
2019-05-12 21:52:44 -04:00
jshipsey
dec9632460
animation adjustments
...
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
2019-05-12 20:52:30 -04:00
Forest Anderson
413b67e6ad
Merge branch 'master' into 'master'
...
Fixes match pattern code that rendered an actionable branch unreachable.
See merge request veloren/veloren!120
Former-commit-id: 06bcf5a6caf32fa80576d56766571c7f9ce7d54d
2019-05-12 20:40:09 +00:00
Forest Anderson
b556135ca5
Merge branch 'Gitlab_CI_assets' into 'master'
...
fix the missing assets in artifact
See merge request veloren/veloren!123
Former-commit-id: 214e164e3a8c006e93e231c38d365b4c93f05085
2019-05-12 20:26:02 +00:00
Dominik Broński
d17609bd3d
fix the missing assets in artifact
...
Former-commit-id: a30253d7d624074e0e831a430bceb8f994e6dd20
2019-05-12 20:26:02 +00:00
Forest Anderson
5fbb8b257f
Merge branch 'clean-code-master' into 'master'
...
Cleaned code
See merge request veloren/veloren!129
Former-commit-id: d122fedbd72e2f94a4eeefe85487261923601acd
2019-05-12 20:21:45 +00:00
Forest
3d14d791cf
Cleaned code
...
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
2019-05-12 15:57:39 -04:00
Forest Anderson
49cdd95c84
Merge branch 'master' into 'master'
...
Changed build settings
See merge request veloren/veloren!127
Former-commit-id: bd2be2ac4ebf5a4d2705ffb31d2c696a48ffde44
2019-05-12 19:15:33 +00:00
Joshua Barretto
5df6b25d00
Added run.sh to gitignore
...
Former-commit-id: 1f13cd6f334f5702ab092f595139691b0ff96bd4
2019-05-12 19:01:29 +01:00
Joshua Barretto
a8981378bf
Improved performance and compilation speed for debug builds
...
Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3
2019-05-12 18:43:55 +01:00
Joshua Barretto
189f5f0fd9
Merge branch 'master' into 'master'
...
Rendering on character selection screen, minor raycasting fix and pets
See merge request veloren/veloren!126
Former-commit-id: a83b7c55dfda634a2e9d928135598bb1a461a32f
2019-05-12 13:50:59 +00:00
Joshua Barretto
d8f6025b68
Added rendering to character selection menu
...
Former-commit-id: 82992904639ec2f468c70f43f3f8fe721a98de51
2019-05-12 14:03:08 +01:00
Joshua Barretto
fc0f2f0801
Added option to not stop raycasting on error
...
Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2
2019-05-12 14:03:08 +01:00
Joshua Barretto
266101c90d
Added basic pets
...
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
2019-05-12 14:03:08 +01:00
Joshua Barretto
5d8a03896a
Merge branch 'char_win_ui_rebase' into 'master'
...
Char Window Visuals and assets
See merge request veloren/veloren!125
Former-commit-id: 5c8a80e5e01c13ac184a580e5feb49e64f5e4e1a
2019-05-12 13:01:46 +00:00
Pfauenauge90
66eceb3ca7
Added Grid to main and offhand
...
Former-commit-id: 6395ba9142d6da3e14c7363e0f38f4fc61de6b79
2019-05-12 14:52:43 +02:00
robojumper
ee9f54bacd
Move u_globals to shared included file
...
Former-commit-id: b6122177ce98cd52bc032e2d8414671d3bcb9b5c
2019-05-12 11:23:21 +02:00
Imbris
cec01c0d69
rustfmt
...
Former-commit-id: 227b7f5a55546c678617d157b739e61f15c4aa4b
2019-05-12 00:17:10 -04:00
Pfauenauge90
e7ab006db7
transparency
...
Former-commit-id: 5a0c0f7267347c3758a266ff49670b55c6e6cc0c
2019-05-11 22:35:19 -04:00
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
