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
|
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 |
|
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 |
|
Imbris
|
fb95abcee8
|
small cleanup
Former-commit-id: 2996ce0cf33337bf52810f1e52b2c02d6eba5c7f
|
2019-05-11 10:22:16 -04:00 |
|
Imbris
|
83277475f6
|
make ui ignore resize to <1.0 events
Former-commit-id: d4baa8234f6c25f2c28c07c1dbf06e6c191a4127
|
2019-05-11 10:22:16 -04:00 |
|
Forest Anderson
|
4dac3e9a8b
|
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
|
bf7600eac8
|
Ran fmt
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
|
2019-05-09 17:30:44 -04:00 |
|
Joshua Barretto
|
347a3342b6
|
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
|
fa6516cfb2
|
Fixes to head animations
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
|
2019-05-09 20:18:13 +01:00 |
|
Joshua Barretto
|
7b84fb394d
|
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
|
2376d1900b
|
Temporary networking issue fix
Former-commit-id: e6b47f7d8478c28d837e55b85f2f2d028e988737
|
2019-05-09 19:38:37 +01:00 |
|
Forest Anderson
|
8894b403b8
|
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
|
ff2a02a6da
|
fmt
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
|
2019-05-09 18:58:16 +01:00 |
|
Joshua Barretto
|
c564f7deca
|
Secret feature
Former-commit-id: 254581d14d272f77b2d047dd8a740a458270c0b2
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
2397a4c5b2
|
Smartened up terrain generation
Former-commit-id: d85448e5171bd27b04530da8e1ca927554136ebf
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
4f17f6fa2b
|
Fixed running animation, changed movement physics
Former-commit-id: 1b4c1f63701668074874aa6efc65f883f29e2cc1
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
b3ec293a68
|
Post-processing tests
Former-commit-id: 133d737a58d9de4fa0b41268cc2f88d2427d3637
|
2019-05-09 18:57:47 +01:00 |
|
jshipsey
|
38dc806946
|
animation orientation fix, first jump
Former-commit-id: e4653bbdc553e496edfe011bf5aa2f97a4cf3b90
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
85618bdb72
|
Fixed window resizing
Former-commit-id: 81f2e18274aadb53b07704cf10c5c27efdccb032
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
7d18191a80
|
Improved singleplayer error handling
Former-commit-id: 0e33493bbb588ab0cd5278ec92b5859712446f4b
|
2019-05-09 18:57:47 +01:00 |
|