sxv20_
20af0b6fd6
cache a chunk while cloning to increase performance (?)
...
Former-commit-id: 69c1fa67b13a8de49f2c73e9526f548779e988c1
2019-05-13 11:03:47 +01:00
sxv20_
3d94ca7617
fix TODO (unnecessary mpsc clone)
...
Former-commit-id: 6f6319fa6bf86ee4eec4778c6795f71beab21e89
2019-05-13 11:03:47 +01:00
sxv20_
340c0a442a
fix chunks not getting rendered once unloaded and reloaded, remove weightings
...
Former-commit-id: d98d1e9bb767d80173c531e8914163c1cc23d7fc
2019-05-13 11:03:47 +01:00
sxv20_
6e1685b16b
change remeshing queue from LinkedList to HashMap, add remesh weightings
...
Former-commit-id: 28f0826501539848ca97721aff5057ccb4599736
2019-05-13 11:03:47 +01:00
Forest Anderson
5676d3c5ad
Merge branch 'animation-changes' into 'master'
...
Animation changes
See merge request veloren/veloren!132
Former-commit-id: 13cd638c4a6dacea66fc64840df624a1e3405a1c
2019-05-13 02:45:46 +00:00
jshipsey
d6fc1c640a
pipeline fix
...
Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138
2019-05-12 22:39:16 -04:00
jshipsey
d8a9dc80df
minor alignment fix
...
Former-commit-id: ecfa2eff0982e21d523a8a454890a1e6ed6d9bd7
2019-05-12 22:10:47 -04:00
jshipsey
90ccc14c34
Merge branch 'master' of https://gitlab.com/veloren/veloren
...
Former-commit-id: 9306d50f9ba615dd6ca091753ff26688767b6291
2019-05-12 21:52:44 -04:00
jshipsey
6578fd09c3
animation adjustments
...
Former-commit-id: 8752caf0bdcac1c2938f048878a008e8f5cd18e0
2019-05-12 20:52:30 -04:00
Forest Anderson
3dd26fecc8
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
cdc1b662c5
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
28af57e499
fix the missing assets in artifact
...
Former-commit-id: a30253d7d624074e0e831a430bceb8f994e6dd20
2019-05-12 20:26:02 +00:00
Forest Anderson
4684737e67
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
b0105c8525
Cleaned code
...
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
2019-05-12 15:57:39 -04:00
Forest Anderson
31b7f389b1
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
ae073b9520
Added run.sh to gitignore
...
Former-commit-id: 1f13cd6f334f5702ab092f595139691b0ff96bd4
2019-05-12 19:01:29 +01:00
Joshua Barretto
c62f28c96d
Improved performance and compilation speed for debug builds
...
Former-commit-id: 5d8b1c27a8a2ebfe63797969ee2aba7452a09dd3
2019-05-12 18:43:55 +01:00
Joshua Barretto
5b6386b822
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
fe64d8c2a4
Added rendering to character selection menu
...
Former-commit-id: 82992904639ec2f468c70f43f3f8fe721a98de51
2019-05-12 14:03:08 +01:00
Joshua Barretto
bd0cd0b4e1
Added option to not stop raycasting on error
...
Former-commit-id: 6e094b6514bcda2fbcdfe44dbb90900b50e939c2
2019-05-12 14:03:08 +01:00
Joshua Barretto
c25d4ee9a3
Added basic pets
...
Former-commit-id: 1ef17505ecb11acb82541349343989128b78630f
2019-05-12 14:03:08 +01:00
Joshua Barretto
7ab814dfdf
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
6f36195302
Added Grid to main and offhand
...
Former-commit-id: 6395ba9142d6da3e14c7363e0f38f4fc61de6b79
2019-05-12 14:52:43 +02:00
robojumper
26b0c687c8
Move u_globals to shared included file
...
Former-commit-id: b6122177ce98cd52bc032e2d8414671d3bcb9b5c
2019-05-12 11:23:21 +02:00
Imbris
7dc3a8105a
rustfmt
...
Former-commit-id: 227b7f5a55546c678617d157b739e61f15c4aa4b
2019-05-12 00:17:10 -04:00
Pfauenauge90
565e663cbf
transparency
...
Former-commit-id: 5a0c0f7267347c3758a266ff49670b55c6e6cc0c
2019-05-11 22:35:19 -04:00
Imbris
7079f8faaf
rebase fix, re-arrange hud img_ids
...
Former-commit-id: a5cb82f74afca531995fceea3ddf7ff53616dd1b
2019-05-11 22:35:15 -04:00
Pfauenauge90
146f0ad069
CharWindow
...
Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd
2019-05-11 21:36:27 -04:00
Pfauenauge
5a1dec64e6
char window
...
Former-commit-id: 2624ddd883c0ff555fc86efce767fda602de52eb
2019-05-11 21:36:27 -04:00
Pfauenauge
3d9f89019a
Char Window
...
Former-commit-id: 0109555602ba39950f304bd0adc80df6175c3728
2019-05-11 21:36:27 -04:00
Pfauenauge
73641bcecb
positioning
...
Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5
2019-05-11 21:36:26 -04:00
Pfauenauge90
cdb793c2a5
Asset Update
...
Former-commit-id: d2278cb6cb877e6c33bad29d63b1b0d6b5d65eee
2019-05-11 21:35:53 -04:00
Pfauenauge
7e9bc685a8
positioning
...
Former-commit-id: 510fcaea11f0e9293e73ba98fb9ad79b5dbbadb5
2019-05-11 21:34:50 -04:00
Pfauenauge90
64b7911123
asset update and import
...
Former-commit-id: 43f616f166c3df87a19f0eca80a65f7a3c0e374c
2019-05-11 21:33:48 -04:00
Pfauenauge
aa60b509eb
char window
...
Former-commit-id: 0c15336583eeaf32f0d86ef10b16c47f46d4db7f
2019-05-11 21:32:38 -04:00
Pfauenauge
137c00f8cb
Char Window
...
Former-commit-id: c44ca056fe76b00e803d96825da69385cfecad39
2019-05-11 21:32:36 -04:00
Pfauenauge
5994aabca9
positioning
...
Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a
2019-05-11 21:32:34 -04:00
Pfauenauge90
33750b9bf5
Asset Update
...
Former-commit-id: 2f3e58679059c3c97cec9312c6fa436d5510b901
2019-05-11 21:32:30 -04:00
Pfauenauge
1723fe2672
positioning
...
Former-commit-id: 44e8406af9c2b6db60f78f7ff161b7c700f024fd
2019-05-11 21:31:17 -04:00
Pfauenauge90
4ea5598ebf
asset update and import
...
Former-commit-id: 455500aac3d82e2920bc02c6846ceb815122bb7d
2019-05-11 21:31:15 -04:00
Pfauenauge90
2f1b14cfe5
window frame black theme
...
Former-commit-id: 61c48814834620fdea961380e8d878706ad0c52c
2019-05-11 21:31:14 -04:00
Imbris
60eef0c130
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
431e30c6e2
Add TODO comment
...
Former-commit-id: fdc9e6d65d9d534e238a6ba2d1c2e66f194d975e
2019-05-11 21:48:05 +02:00
timokoesters
6fd933eccd
Temporary fix for falling into void
...
Former-commit-id: 8e3d9c0c34e897f13cc60d5968f390ed0107dd76
2019-05-11 21:38:05 +02:00
Forest Anderson
d10a28d6d4
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
75bfbf4cef
fix & remove some unused uses, cursor toggle tweak
...
Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f
2019-05-11 10:59:48 -04:00
Imbris
f4947e3637
add multisampling option to voxel graphics
...
Former-commit-id: d5ca47cd029226d1268c6d860516bfea6f9c5cf6
2019-05-11 10:25:15 -04:00
Imbris
78fd9da4ce
Stop recreating vertex buffers for ui
...
Former-commit-id: 6e9326d1bca942e4da70281e3d86b624f9d2504a
2019-05-11 10:22:20 -04:00
Imbris
a3d6e2eb90
multiply image color by supplied color
...
Former-commit-id: c5e4ccde88d7170db7aa4d3bfce3e0ba1cf5e8c9
2019-05-11 10:22:18 -04:00
Imbris
f6fb258f77
split up voxygen/src/ui/mod.rs
...
Former-commit-id: e220b1ce38f93fbb295c9aae3591e4b3899f57e4
2019-05-11 10:22:17 -04:00
