Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,349 Commits 151 Branches 18 Tags 2.1 GiB
5361705ca7
Commit Graph

1454 Commits

Author SHA1 Message Date
Joshua Barretto
b31cca4bb3 Added wheat and sprite rendering 2019-08-19 21:09:35 +01:00
Joshua Barretto
6f35786b84 Added Instances construct 2019-08-19 18:23:47 +01:00
Joshua Barretto
e2082088c8 Added sprite pipeline 2019-08-19 18:01:23 +01:00
Acrimon
a41cf1a83d Disabled unsafe using lint level. 2019-08-19 14:39:23 +02:00
Monty Marz
7168850f05 Fix low fps 2019-08-19 08:03:19 +00:00
Monty Marz
29f6186139 hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
Joshua Barretto
75dbebbd05 More interesting waves 2019-08-18 10:33:18 +01:00
Joshua Barretto
f0e52e6002 Better reflections and water fog 2019-08-18 10:33:18 +01:00
Joshua Barretto
825d8bb632 Fixed water in caves, made water reflection vary with lighting 2019-08-18 10:33:18 +01:00
Joshua Barretto
fa6825f13b Better fluid meshing, disabled fluid backface culling and depth buffer writing 2019-08-18 10:33:18 +01:00
Joshua Barretto
42237a84e4 Added translucent meshing pass, water reflections 2019-08-18 10:33:18 +01:00
Luc Fauvel
4a29900914 Copying terrain pipeline and shaders for fluids 2019-08-18 10:33:18 +01:00
jshipsey
2ca81323d5 added shoulder movement and fixed placement 2019-08-18 02:35:27 -04:00
Imbris
f12821db35 Merge branch 'imbris/srgb' into 'master' 
Handle srgb values more accurately, Load shaders at runtime + hotloading

Closes #79

See merge request veloren/veloren!412
 2019-08-16 22:44:14 +00:00
Joshua Barretto
e9fc2789d1 Merge branch 'scott-c/cull-entities-outside-viewport' into 'master' 
Scott c/cull entities outside viewport

Closes #207

See merge request veloren/veloren!442
 2019-08-16 16:47:02 +00:00
scott-c
fce74c6218 cargo fmt 2019-08-17 00:11:06 +08:00
scott-c
2fabdfe0eb unwrap_or instead of map_or 2019-08-17 00:08:09 +08:00
scott-c
dc73e4ffb7 use entity scale as hitbox for frustrum culling 2019-08-16 23:39:07 +08:00
scott-c
f312299e62 Replace view distance culling with frustum culling 2019-08-16 21:45:10 +08:00
Imbris
d89fff1499 Fix typo, move shaders back out of subfolders 2019-08-15 23:59:10 -04:00
Imbris
be0e0e52a8 Improve colors 2019-08-15 23:59:09 -04:00
Imbris
c09eb77149 Add srgb converion in shaders 2019-08-15 23:56:14 -04:00
Imbris
cb25c45dec Move shaders, start asset reloading system 2019-08-15 23:56:12 -04:00
Acrimon
fda47fc322 [Voxygen] Switch mutexes to parking_lot and channels to crossbeam. 2019-08-16 00:07:09 +02:00
Piotr Korgól
0221de484e Give singleplayer its own server settings 2019-08-14 17:51:59 +02:00
Geno
a9f20148a4 added first person switch 2019-08-13 17:54:13 +00:00
Acrimon
b4a46f3e6e Finished switch to hashbrown. 2019-08-11 22:38:28 +02:00
Acrimon
0bbef0d851 Use hashbrown in voxygen instead of a billion different shitty maps. 2019-08-11 21:52:23 +02:00
Joshua Barretto
2191921721 Merge branch 'telastrus/auth' into 'master' 
Server-side authentication

See merge request veloren/veloren!419
 2019-08-09 01:37:44 +00:00
telastrus
07d3384b01 fixed the silent kick, made it actually proper 2019-08-08 17:58:36 -04:00
telastrus
66e254db7f actually removed printlns 2019-08-08 12:09:14 -04:00
telastrus
35a3f67e19 ran cargo fmt 2019-08-08 12:05:38 -04:00
telastrus
de2082469d auth done, no popup yet 2019-08-08 12:01:15 -04:00
telastrus
f2ed2870c6 90% there 2019-08-08 11:23:58 -04:00
telastrus
09b15e5278 velocity fix 2019-08-08 10:42:23 -04:00
telastrus
6d94d43021 still compiles 2019-08-07 23:56:02 -04:00
telastrus
157c4816b3 laying the groundwork 2019-08-07 15:42:44 -04:00
Monty Marz
aac53f9311 Part 1 of implementing the social window 2019-08-07 13:14:26 +00:00
telastrus
e4f2c73b85 undo unnecessary pub mod 
fixed comments

fixed other comment
 2019-08-06 22:46:25 -04:00
telastrus
0eafd42c0f fall damage + velocity debug 2019-08-06 17:51:13 -04:00
Joshua Barretto
73a44d0fb1 Collision fixes, better camera in build mode 2019-08-06 16:00:14 +01:00
Marcel
86be3fccfc Merge branch 'timo-cleanup' into 'master' 
Implement specifier syntax and cleanup

See merge request veloren/veloren!413
 2019-08-06 06:52:24 +00:00
timokoesters
1227596406 Implement specifier syntax and cleanup 2019-08-06 08:31:48 +02:00
telastrus
4dcb53bdb8 reverted some unnecessary changes 
corrected typo

ran cargo fmt
 2019-08-05 19:41:31 -04:00
telastrus
c098a5efd7 Added adjustable FOV slider 2019-08-05 12:37:52 -04:00
Joshua Barretto
a324f01a1d Improved orientation slerping 2019-08-04 15:51:17 +01:00
Joshua Barretto
e5bcc8912e Stopped stars appearing in the day 2019-08-04 15:30:45 +01:00
Piotr Korgól
d3f2ca69a4 Change the version number to 0.3 2019-08-04 13:53:59 +02:00
Joshua Barretto
783e8dbfc0 Reverted parenthesis removal 2019-08-04 12:35:03 +01:00
Joshua Barretto
8abfd2e10f Reverted sun diffuse change 2019-08-04 12:25:15 +01:00
Tesseract
c36c78252c Reverted to old star shader 2019-08-04 12:25:15 +01:00
Tesseract
ec34fcf9c8 Optimised fragment and vertex shaders. Framebuffer depth target changed from DEPTH24_STENCIL8 to DEPTH24 for faster depth writing and reading (no bitwise operations needed). 2019-08-04 12:25:15 +01:00
Monty Marz
8c1d244bf8 New Female Danari and Elf models, Airblocks for tower ruins and witch house 2019-08-04 11:23:01 +00:00
Joshua Barretto
c9f1a793db Merge branch 'timo-kill-xp' into 'master' 
Give xp depending on max hp and lvl of entity killed

See merge request veloren/veloren!400
 2019-08-03 20:57:06 +00:00
timokoesters
7365dbe9e6 Give xp depending on max hp and lvl of entity killed 2019-08-03 21:30:01 +02:00
Joshua Barretto
fe0097c085 Made nametag position change with scale 2019-08-03 19:40:20 +01:00
Joshua Barretto
51fa4f3cfc Merge branch 'animation-tweaks' into 'master' 
animation and movement tweaks

See merge request veloren/veloren!389
 2019-08-03 12:09:38 +00:00
timokoesters
6f598681fb Fix combat animations for non humanoids 2019-08-03 12:53:39 +01:00
Joshua Barretto
677c5781ba Added bosses, improved secret object spawn rates 2019-08-02 20:10:52 +01:00
jshipsey
13310ab9ca improved animations and movement 2019-08-01 23:57:26 -04:00
Dominik Broński
f644b6ab89 Revert "Merge branch 'imbris/upgrade_specs' into 'master'" 
This reverts merge request !375
 2019-08-01 23:32:33 +00:00
Imbris
5f56657f6c Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00
Monty Marz
a5926eb40a 0.3. login bg 2019-08-01 17:53:34 +00:00
Piotr Korgól
ec550620ad Add a health bonus for level ups, fix pets 2019-08-01 18:56:08 +02:00
Joshua Barretto
cb8e3b9805 Fixed absolute darkness 2019-08-01 09:12:00 +01:00
Joshua Barretto
39fc1d6b71 Added entity pickup, changed item model 2019-08-01 09:12:00 +01:00
Joshua Barretto
331b6c8b3a Altered Item structure 2019-08-01 09:12:00 +01:00
Joshua Barretto
b3cae2f3dd Added better item manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
fc49293874 Clickthrough on items 2019-08-01 09:09:26 +01:00
Pfauenauge90
37ee5b2802 fixed UI layering leading to unresponsive slots 2019-08-01 09:09:26 +01:00
Joshua Barretto
31f8794c39 Started work on inventory manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
123a78552a Fixed block-hopping on edges, added correct inventory slots 2019-08-01 09:09:26 +01:00
Monty Marz
5cfc60da50 Small chat fixes 2019-07-29 14:40:46 +00:00
Monty Marz
96b677a2b0 Tooltips 2019-07-29 14:06:13 +00:00
Acrimon
ee49ebe807 Update rand, log and scan_fmt 2019-07-29 13:42:26 +00:00
Joshua Barretto
4a198ca626 Numerous minor lighting fixes 2019-07-29 13:01:39 +01:00
Imbris
ff518a4a23 Ui scaling interface tweaks 2019-07-28 16:54:32 -04:00
Pfauenauge90
8e15117be7 set min and max values 2019-07-28 16:54:32 -04:00
Pfauenauge90
d33bbf26ad aligned value position to crosshair transp. value 2019-07-28 16:54:32 -04:00
Pfauenauge90
e15c4eb40b changed displayed value for scale 2019-07-28 16:54:31 -04:00
Pfauenauge90
1567c63421 checkboxes functionality 2019-07-28 16:54:31 -04:00
Pfauenauge90
7ce71dda02 visuals change 2019-07-28 16:54:31 -04:00
Imbris
4ad42c57e4 Add ui scale setting and slider 2019-07-28 16:54:30 -04:00
timokoesters
5aa864ee58
Update most dependencies 2019-07-28 22:47:23 +02:00
Monty Marz
33565b9480 added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself 2019-07-28 09:21:17 +00:00
Piotr Korgól
198d532e38 Show level and xp on character menu 2019-07-27 15:04:34 +02:00
Piotr Korgól
5c84508015 Get EXP for killing NPCs and Players, properly show EXP bar 2019-07-26 20:51:40 +02:00
Piotr Korgól
b1aace0110 Add Level and Exp component 2019-07-26 16:44:59 +02:00
tommy
95b5f4acfb Added private, broadcast, and game_state messages 2019-07-26 07:29:37 -04:00
tommy
cc6aa6f33d Adds colour to tells in chat box #194 2019-07-26 07:29:37 -04:00
Nero
53086cb3b2 Nero/light offsets 2019-07-25 20:51:20 +00:00
Piotr Korgól
46f19c8f64 Fix build mode inaccuracy 2019-07-25 15:00:17 +02:00
Piotr Korgól
4f73cc921b Properly hide the player character 2019-07-24 16:45:27 +02:00
Piotr Korgól
fd841cdd33 An attempt at hiding the player in first person mode 2019-07-24 16:09:16 +02:00
Piotr Korgól
e33deac740 Change FP Mode distance to 0.1 to fix building 2019-07-24 15:04:12 +02:00
Piotr Korgól
00f490c3bf Zoom out the camera when entering third person mode 2019-07-24 15:04:12 +02:00
Piotr Korgól
36948890a3 Add camera modes 2019-07-24 15:04:12 +02:00
Pfauenauge90
7aef8b10cd offsets 2019-07-24 03:01:35 +02:00
Pfauenauge90
7a141ad111 More objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
9fd2849c6c chat warning for unknown objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
85281e7e54 spawn objects by name 2019-07-24 02:50:19 +02:00
Vechro
f3c5ece983 Add tent 2019-07-24 02:50:19 +02:00
Vechro
81f66457de Add cauldron 2019-07-24 02:50:19 +02:00
Acrimon
551433f03a Hook the tracking allocator into binaries. Doesn't do any monitoring/logging. Just provides the data when you want it. 2019-07-24 02:18:50 +02:00
Sheldon Knuth
c2fa8bd615 [FIX] Callback hell of AudioDevice construction while opening audio settings window. 2019-07-23 09:54:41 +00:00
Monty Marz
7a4ad099ff Crosshair variations 2019-07-23 01:02:57 +00:00
Monty Marz
ae4c569fc9 Static entities: Per model offsets, more models 2019-07-21 23:54:31 +00:00
Joshua Barretto
1cf8383eba Moved lighting uniforms into light.glsl 2019-07-21 19:22:49 +01:00
Joshua Barretto
5cdfb26e0d Added LightEmitter component 2019-07-21 19:22:49 +01:00
Joshua Barretto
16c8ecec66 Fixed light cap 2019-07-21 19:22:49 +01:00
Joshua Barretto
b34d22565e Added point lights 2019-07-21 19:22:49 +01:00
Joshua Barretto
1dc654dde7 Added object entities 2019-07-21 19:22:49 +01:00
Tom Watson
cd456b6e2d Revert "Add server name to char selection screen" 
This reverts commit a4a9b97273.
 2019-07-21 18:13:17 +00:00
Songtronix
de2dbcef45 add global git hash constant 2019-07-21 17:45:31 +00:00
Joshua Barretto
215a09005e Only change entity orientation when on the ground 2019-07-21 00:18:03 +01:00
Joshua Barretto
ce327445a7 Send block diffs instead of entire chunks on block change 2019-07-20 16:41:03 +01:00
Marcel Märtens
98b0a40a22 Change default port of veloren from 59003 to 14004 
TCP and UDP Ports for applications should lie in a range between 1024-49151
the ports below are used for privileged services
the ports above should be dynamicly assigned.
Port 14004 seems to be used by no other service and i like it personally, so we choose it.

Also deactivate the workaround for the secondary veloren server again
 2019-07-20 13:59:35 +02:00
Joshua Barretto
44b3f67347 Merge branch 'zesterer/better_voxygen_errors' into 'master' 
Switched to Debug trait object for backend errors

See merge request veloren/veloren!344
 2019-07-20 11:14:29 +00:00
Tom Watson
3a1ae1b361 Send commands on client launch, closes #190 2019-07-18 22:50:46 +00:00
Joshua Barretto
752eca07b8 Switched to Debug trait object for backend errors 2019-07-18 16:42:31 +01:00
Forest Anderson
4ffe60f8e3 Merge branch '187_persist_default_server' into 'master' 
Save the server index when it changes, closes #187

Closes #187

See merge request veloren/veloren!332
 2019-07-17 17:35:21 +00:00
Songtronix
b6c8bdc223 add configurable max player count 2019-07-17 18:32:01 +02:00
Songtronix
bbb024224d add configureable server info 2019-07-17 18:32:01 +02:00
Songtronix
1213d9844b add customizable port and worldseed 2019-07-17 18:32:00 +02:00
Marcel Märtens
242cdbe6e5 Change the default port for the veloren server because the original server is unanvailable for a few days and the secondary server cannot use the default veloren port 2019-07-15 19:42:13 +02:00
Monty Marz
ff6a72bc40 New orc head models 2019-07-14 14:34:47 +00:00
tommy
19ff836676 Remove TODO 2019-07-13 08:41:50 -04:00
tommy
f15194b6f8 Save the server index when it changes #187 2019-07-12 20:26:17 -04:00
Acrimon
20ac81a986 Fixed some misses. 2019-07-12 20:51:22 +02:00
Joshua Barretto
92d4b4dfbe Smoothed world borders 2019-07-09 21:42:27 +01:00
Joshua Barretto
bb50bb8c81 Improved sunset shaders 2019-07-08 22:38:31 +01:00
Joshua Barretto
d79f7d9714 Colour improvements 2019-07-08 22:10:48 +01:00
Joshua Barretto
c2a11ed6b2 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
Joshua Barretto
44b5473a82 Added rare structures, totally refactored structure spawning 2019-07-08 00:50:36 +01:00
jshipsey
529281e2c3 removed weapon_id attribs, replaced with matches 2019-07-07 19:24:20 -04:00
jshipsey
12667b9172 fmt 2019-07-07 18:06:29 -04:00
jshipsey
5cd1bfb3d2 adds support for animation substates, animates run/idle/jump for hammer 2019-07-07 18:04:27 -04:00
Forest Anderson
d45acdc645 Merge branch 'inventory-items' into 'master' 
crosshair changes (WIP!), inventory visuals, camera changes, savannah trees

See merge request veloren/veloren!317
 2019-07-07 15:42:50 +00:00
Pfauenauge90
0cc3c76542 fmt 2019-07-07 17:31:34 +02:00
Pfauenauge90
7f45d274a8 clean up 2019-07-07 16:19:20 +02:00
Pfauenauge90
f3bda57e67 fmt 2019-07-07 16:19:20 +02:00
Pfauenauge90
70f8fe9002 ui scaling relative to window size 2019-07-07 16:19:20 +02:00
Pfauenauge90
c27d55db6c less numbers for the indicator text 2019-07-07 16:19:20 +02:00
Pfauenauge90
ff6d7206a3 fix 2019-07-07 16:19:19 +02:00
Pfauenauge90
94acd0f437 Crosshair transp slider 2019-07-07 16:19:19 +02:00
Pfauenauge90
3be2951029 crosshair correction 2019-07-07 16:19:19 +02:00
Pfauenauge90
de1cf1371c colour and camera corrections 2019-07-07 16:19:19 +02:00
Pfauenauge90
d4a6f0c202 camera changes and nametag colour 2019-07-07 16:19:18 +02:00
Pfauenauge
bd94baa125 Added crosshair TODO 2019-07-07 16:19:18 +02:00
Pfauenauge
d186c4031e Sharp crosshair (no multisampling) 2019-07-07 16:19:18 +02:00
Pfauenauge90
7455155198 more test items 2019-07-07 16:19:18 +02:00
Pfauenauge90
89cadf27be fix fonts 2019-07-07 16:19:18 +02:00
Pfauenauge90
50e15333cd set the inventory space test button to false by default and increased the starting inventory size to 10 2019-07-07 16:19:17 +02:00
Pfauenauge90
b99bd4a20a Bag window expands with available space 2019-07-07 16:19:17 +02:00
Pfauenauge90
381b9cabd1 fmt 2019-07-07 16:19:17 +02:00
Pfauenauge
e66419b396 smaller border for available slots, item image size changed 2019-07-07 16:19:17 +02:00
Pfauenauge
991e4b15e5 fmt 2019-07-07 16:19:16 +02:00
Pfauenauge
03894cb2ab Comments on example item, removed printing of available inventory space No. 2019-07-07 16:19:16 +02:00
Pfauenauge90
3ab01bd86b added visual test item 2019-07-07 16:19:16 +02:00
Pfauenauge90
ff7fb032a4 fixed scaling of the slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
be64662b14 added active inventory slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
f4499e26af added visual test item 2019-07-07 16:19:15 +02:00
Pfauenauge90
626978213f fixed scaling of the slots 2019-07-07 16:19:15 +02:00
Pfauenauge90
12e7d749ec added active inventory slots 2019-07-07 16:19:15 +02:00
Songtronix
07754b0a79 fmt 2019-07-07 16:16:07 +02:00
Songtronix
b4fe69be22 Fix warnings 2019-07-07 16:16:07 +02:00
Songtronix
8220564fa6 Fix rebasing issues 2019-07-07 16:16:07 +02:00
Songtronix
6fa086b964 remove expects, warnings, code duplication 2019-07-07 16:16:06 +02:00
Songtronix
2338084af0 Add Linux support 2019-07-07 16:16:06 +02:00
Songtronix
5ea624674d add comment and logging error 2019-07-07 16:16:06 +02:00
Songtronix
1be8f5e422 Update status according the play state 2019-07-07 16:16:05 +02:00
Songtronix
1e40bd09ba working discord presence 2019-07-07 16:16:05 +02:00
Songtronix
60500d9235 add discord feature with dependencies 2019-07-07 16:16:05 +02:00
Songtronix
9007f4aa5a Adjust volume on startup 2019-07-07 14:12:28 +00:00
Forest Anderson
0ed35d3ef4 Fix rustc warning 2019-07-07 04:37:22 +00:00
Forest Anderson
5442bbfe62 Force CI to block on rustc warnings 2019-07-07 03:24:22 +00:00
Joshua Barretto
6a484ce162 fmt 2019-07-06 20:00:17 +01:00
Joshua Barretto
33b7e729c9 Added block picking 2019-07-06 20:00:17 +01:00
Joshua Barretto
d2ccbafe59 Made mesh scheduling fairer 2019-07-06 20:00:17 +01:00
Joshua Barretto
0c9843999b fmt 2019-07-06 20:00:17 +01:00
Joshua Barretto
51ad1f1995 Improved remeshing performance 2019-07-06 20:00:17 +01:00
Joshua Barretto
6709b18cb6 Made shadows darker 2019-07-06 20:00:17 +01:00
Joshua Barretto
ef973faadf Throttled mesh scheduling to improve remesh performance 2019-07-06 20:00:17 +01:00
Joshua Barretto
6fc2096dae Reenabled towns, lighter days 2019-07-06 20:00:17 +01:00
Joshua Barretto
1641c4f788 Added mesh worker queue limit to prevent throttling of meshing queue 2019-07-06 20:00:17 +01:00
timokoesters
215693137b
Implement chat command key 2019-07-05 18:21:11 +02:00
timokoesters
203b3d4e76
Fix attacking bug 2019-07-04 20:14:14 +02:00
Piotr Korgól
e267ac7ed4 Resolve discussion 2019-07-04 19:33:59 +02:00
Piotr Korgól
356f5cb47a Fix not being able to respawn in build mode 2019-07-04 19:25:09 +02:00
jshipsey
02ac56d84d clearing animation warnings 2019-07-04 10:58:59 -04:00
Songtronix
61d0474e6c comment out unused structs/functions in voxygen/audio 2019-07-04 14:27:28 +00:00
timokoesters
d7c159a4e1
Fix warnings all around voxygen 2019-07-04 14:08:01 +02:00
timokoesters
c2f7f69a69
Clean up ui 2019-07-04 13:24:44 +02:00
Piotr Korgól
04d3c077d0 Remove printlns 2019-07-03 22:38:28 +02:00
Piotr Korgól
e79f763226 Small cleanup to block placing and breaking 2019-07-03 22:28:13 +02:00
Piotr Korgól
42a4cc8095 Add block breaking 2019-07-03 21:56:54 +02:00
timokoesters
a702f7258a Fix building 2019-07-03 21:28:07 +02:00
Piotr Korgól
fbdc1d954a Handle block placing. 2019-07-03 21:28:07 +02:00
Piotr Korgól
e212d4d6f9 Fix comment 2019-07-03 21:28:07 +02:00
Piotr Korgól
7cf299503d Add crosshair 2019-07-03 21:28:07 +02:00
Louis Pearson
67bfc6c4cf Add field to turn off audio in settings 2019-07-03 13:13:38 -06:00
Sheldon Knuth
6d624e96a6 fix the missing set_playing(true) in AudioPlayer::load() to prevent infinity thread loop & adopt std::sync::{Mutex, Condvar} for accurate thread blocking. 2019-07-03 17:23:24 +00:00
Imbris
d2f8c47361 Pass BufReader to Asset::load() 2019-07-03 05:02:01 -04:00
Imbris
ce33a6e1f8 Remove warnings 2019-07-02 23:09:37 -04:00
Imbris
cff79eadc9 Add glyph cache resizing, move when resize occurs 2019-07-02 22:31:20 -04:00
Imbris
b5ed35fd27 Smaller graphics cache that removes unused items 2019-07-02 21:21:36 -04:00
Songtronix
0c0e93a61f clean voxygen rs files 2019-07-02 21:29:38 +00:00
Songtronix
0c3d693561 clean warnings from voxygen/hud 2019-07-02 21:25:07 +00:00
Sheldon Knuth
c3671590e9 Loading no-audio mode from the game start without rodio crate initialisation completely 2019-07-02 18:35:40 +00:00
timokoesters
f5da167ce5
Fix warnings and clippy recommendations in common 2019-07-02 15:48:25 +02:00
Joshua Barretto
6dae0c8cd2 Revamped asset loading system 2019-07-02 14:15:53 +01:00
Sheldon Knuth
0ec240ea8e Revamping the audio system for Voxygen from #163 2019-07-02 13:52:51 +01:00
Sheldon Knuth
de9d05999d Removed send_msg in Action::Load(path) => ... due to non-existed receiver. 2019-07-02 20:04:24 +08:00
Sheldon Knuth
cdda20a1e8 hotfix on assets_folder issue by increasing the depth to 3. 2019-07-02 19:43:38 +08:00
Sheldon Knuth
ee32f752a6 add no-audio feature while constructing AudioFrontend with no_audio(). 2019-07-02 11:45:28 +08:00
Sheldon Knuth
7f7d35fe7f fix audio thread by removing PopError but use customised block function instead. 2019-07-02 11:29:00 +08:00
Sheldon Knuth
d75d632279 Add mpmc support to audio-base. 2019-07-02 11:29:00 +08:00
Joshua Barretto
631df59083 Merge branch 'zesterer/small-fixes' into 'master' 
Fixed chonk memory usage bug, added block manipulation

See merge request veloren/veloren!278
 2019-07-01 15:22:04 +00:00
Joshua Barretto
489f5f6b2a fmt 2019-07-01 14:38:45 +01:00
Joshua Barretto
586b62ea28 Fixed remesh data race 2019-07-01 14:38:38 +01:00
Joshua Barretto
90566243ca Removed debug printing 2019-07-01 14:37:32 +01:00
Joshua Barretto
c8a2e4722c Fixed chonk memory usage bug, added block manipulation 2019-07-01 14:36:45 +01:00
jshipsey
cc548eb669 glider animation fix 2019-06-30 18:53:45 -04:00
jshipsey
e9bbe0e800 rebase 2019-06-30 18:53:45 -04:00
jshipsey
aea0d0002b head position fixes 2019-06-30 18:53:45 -04:00
jshipsey
2ce5c5881e combat run/jump/idle animation states 2019-06-30 18:53:44 -04:00
timokoesters
370e7db1ee
Fix death 2019-06-30 22:29:00 +02:00
Joshua Barretto
45e30d0c84 Merge branch 'issue_109' into 'master' 
Configured GameInput::Glide to be managed like the rest of events that stop on key release

See merge request veloren/veloren!274
 2019-06-30 18:52:19 +00:00
J. R. Vidal F
e2b4b5106a Configured GameInput::Glide to be managed like the rest of events that stop on key release 2019-06-30 20:44:52 +02:00
Timo Koesters
96a2dfc15d Merge branch 'timo-actor-body' into 'master' 
Remove Actor and use Body instead

See merge request veloren/veloren!270
 2019-06-30 17:55:23 +00:00
timokoesters
14400f6380
Remove Actor and use Body instead 2019-06-30 18:57:24 +02:00
J. R. Vidal F
fca9590cee Fixed Issue #109 and some related problems that took place while holding shortcut keys 2019-06-30 06:20:50 +02:00
Joshua Barretto
f2df3a9d18 Block-hopping fix, better dusk shaders 2019-06-29 22:47:24 +01:00
Joshua Barretto
f1ba97ae7a Merge branch 'timo-rolling-fix' into 'master' 
Rolling bugs + NPC bugs + "Impossible" bug

See merge request veloren/veloren!265
 2019-06-29 21:47:05 +00:00
timokoesters
d235374d8e
Fix npc and death bug 2019-06-29 22:43:44 +02:00
Joshua Barretto
324de39bfe fmt 2019-06-29 16:48:43 +01:00
Joshua Barretto
0f386bbedb Made days less blue and nights less light 2019-06-29 16:48:43 +01:00
Joshua Barretto
61e7da4f85 Added light tinting based on time of day 2019-06-29 16:48:43 +01:00
Joshua Barretto
0c918c835f Prevented invalid username usage 2019-06-29 16:48:43 +01:00
Joshua Barretto
dd82fc24a8 Prevented UI resets when toggling HUD 2019-06-29 16:48:43 +01:00
Joshua Barretto
b5648f736d Fixed day horizon bug 2019-06-29 16:48:43 +01:00
timokoesters
af52cfea6a
Show cursor when unfocussing the window 2019-06-29 03:43:35 +02:00
timokoesters
fe6f627d42
Clean up ecs actor body components 2019-06-29 01:49:33 +02:00
Mckol
b5db5b8d3d Added error logging 2019-06-28 20:22:43 +02:00
Mckol
f1b1c41d92 Added catching audio panics 
You can still make it panic by poisoning some variable if you try to change the audio device in settings after launch`
 2019-06-28 20:22:43 +02:00
Monty Marz
cef52a0440 Char fixes 2019-06-28 14:45:02 +00:00
Songtronix
eb28ba94f6 add git commit hash to debug window 2019-06-28 12:08:12 +00:00
Justin Shipsey
4ac7307f8f minor main menu changes 
made the settings button's text grey and removed hover/press image as long as it's not functional

changed server list placement and spacing
 2019-06-28 08:24:13 +00:00
Joshua Barretto
d4beeacc88 Interp fix 2019-06-26 21:57:39 +01:00
Joshua Barretto
cfe7b0d8b6 Attempted voxygen interpolation dt fix 2019-06-26 21:57:39 +01:00
Joshua Barretto
f781aca8e9 fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
397c909bd4 Denser stars 2019-06-26 19:14:12 +01:00
Joshua Barretto
ad2bc635f8 Rewrote sky shaders, added stars 2019-06-26 19:14:12 +01:00
Joshua Barretto
325fa41d7e Grass improvements 2019-06-26 19:14:12 +01:00
Joshua Barretto
0734529ef6 Made postprocessing brighter 2019-06-26 19:14:12 +01:00
Joshua Barretto
b94c0ace8c Removed RefCell from column cache 2019-06-26 19:14:12 +01:00
Pfauenauge90
b5d529f824 changes restore 2019-06-26 19:14:12 +01:00
Pfauenauge
1dfc85a75b char selection time freeze to prevent it from being dark 2019-06-26 19:14:12 +01:00
Joshua Barretto
b987bda9ce Stronger shadows, fewer cliffs in oceans 2019-06-26 19:14:12 +01:00
Joshua Barretto
d0b38e9875 Worldgen performance improvements, better sun 2019-06-26 19:14:12 +01:00
Joshua Barretto
9279611d6d Added longer day/night cycle, /time command 2019-06-26 19:14:12 +01:00
Joshua Barretto
fffef7c739 Better rivers, rewrote cliffs 2019-06-26 19:14:12 +01:00
Piotr Korgól
5f09e75541 Stop printing out chunk location 2019-06-26 19:14:12 +01:00
Piotr Korgól
4644199f1b Make minimap title show location names 2019-06-26 19:14:12 +01:00
Pfauenauge90
ab2c0ad085 mid name parts 2019-06-26 19:14:12 +01:00
Joshua Barretto
04893338cd Lowered horizon 2019-06-26 19:14:12 +01:00
Joshua Barretto
5e96e29ff1 AO improvements, day/night cycle 2019-06-26 19:14:12 +01:00
Joshua Barretto
d10ef37528 Fixed AO lighting issue 2019-06-26 19:14:12 +01:00
Joshua Barretto
451bbe9921 Basic region generation 2019-06-26 19:14:12 +01:00
Joshua Barretto
bc7cee1846 Lighting fixes 2019-06-26 19:14:12 +01:00
Joshua Barretto
bf5b1cb4ad Calculate delta time properly, fix low fps collision issues by decreasing max dt 2019-06-26 19:14:12 +01:00
Joshua Barretto
25b48b9cf6 Removed dt debugging in animation code 2019-06-26 17:22:28 +01:00
Joshua Barretto
6c83edfc27 Don't fetch dt in figure.rs 2019-06-26 11:55:31 +01:00
Joshua Barretto
7b7d843d0f Comments and fmt 2019-06-26 11:53:43 +01:00
Joshua Barretto
4a340f69b5 Camera clipping and block-hop fix 2019-06-26 11:53:43 +01:00
Joshua Barretto
692fa3f28d Above-ground spawn point, better figure dt scaling 2019-06-26 11:53:43 +01:00
Joshua Barretto
d2b8f592df Fixed dt figure interpolation scaling 2019-06-26 11:53:43 +01:00
Joshua Barretto
c2c5b9f5e7 Better camera interpolation 2019-06-26 11:53:43 +01:00
Joshua Barretto
af432ec510 Calculate delta time properly, fix low fps collision issues by decreasing max dt 2019-06-26 11:53:43 +01:00
Joshua Barretto
2c24ba7776 Fixed block-hopping, block-snapping, added interpolation to figures 2019-06-26 11:52:36 +01:00
Joshua Barretto
285cf2f973 Added proper 3D collisions 2019-06-26 11:52:36 +01:00
timokoesters
7fc53db328
Fix fps dependent animation interpolation by using dt 2019-06-25 21:43:45 +02:00
Imbris
16e5b6bafd circular view distance 2019-06-23 15:49:15 -04:00
jshipsey
8dd1e46883
run tweaks 2019-06-16 19:59:15 +02:00
jshipsey
ed2773fbca
changed hand motion on run animation 2019-06-16 19:59:15 +02:00
jshipsey
8e019cdbec
lowered roll duration 2019-06-16 19:59:14 +02:00
jshipsey
0c534efddd
adjusted v-tilt, roll speed, run animation tempo 2019-06-16 19:59:13 +02:00
jshipsey
e066d98762
slight roll tweak, altered speeds in physics 2019-06-16 19:59:13 +02:00
jshipsey
ecf0d9647c
added roll physics, improved anims for roll, glide, run, attached hands to torso 2019-06-16 19:59:12 +02:00
timokoesters
7deb3da1af
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
timokoesters
955c20fa61
Remove crun and cidle components and inputs 2019-06-16 19:57:04 +02:00
timokoesters
e2c81dd036
Fixes for .maybe() and animation 2019-06-16 19:57:04 +02:00
jshipsey
4de5489367
groundwork for role, crun, cidle 2019-06-16 19:57:04 +02:00
timokoesters
69cb2ed84f
Revamp control system 2019-06-16 19:57:03 +02:00
Joshua Barretto
76344d142e Added clouds 2019-06-15 18:23:01 +01:00
Joshua Barretto
73e999af87 Stopped printing chunk location every frame 2019-06-15 13:44:50 +01:00
Joshua Barretto
a9d30bbfb6 Adjusted tree colour variation 2019-06-15 11:36:26 +01:00
Joshua Barretto
9fed2c1534 Merged stumps, adjusted scale code 2019-06-13 11:59:05 +01:00
Joshua Barretto
fa8f3a4b49 Tweaked lighting and AO 2019-06-13 11:59:05 +01:00
Joshua Barretto
e671d8473c Bluer snow, altered rock colour 2019-06-13 11:59:05 +01:00
Joshua Barretto
8071670a37 More trees, adjusted camera tilt 2019-06-13 11:59:05 +01:00
Joshua Barretto
38c836d6c5 Simpler cliffs, camera tilt 2019-06-13 11:59:05 +01:00
Joshua Barretto
581c4d0e3b Fixed frustum culling efficiency bug 2019-06-13 11:59:05 +01:00
jshipsey
99b4406d79 cleared out unused animation variables 2019-06-13 00:14:06 -04:00
Marcel
9783ff56e8 Merge branch 'midge/mouse-sensitivity' into 'master' 
Better Settings

Closes #142 and #132

See merge request veloren/veloren!216
 2019-06-12 13:12:46 +00:00
Timo Koesters
99a1f153fb Merge branch 'timo-cleanup' into 'master' 
Cleanup

See merge request veloren/veloren!226
 2019-06-11 07:00:46 +00:00
timokoesters
2ca0c62654
Cleanup 2019-06-10 22:44:03 +02:00
Songtronix
2f1021f955 Replace texture2D with texture to fix MacOS crash 2019-06-09 20:20:29 +02:00
Cody
b180f89104
Enhances deserialization so settings which are missing are added with default values. 2019-06-08 19:35:23 -04:00
Cody
026ac32972
Amends the suggested 1 FPS option to 15 to prevent accidental session crashes. 2019-06-08 12:23:58 -04:00
Cody
e18947eed1
Changes the fallback slider value to a safe one. 2019-06-08 12:23:58 -04:00
Cody
24f7323d04
Allows selection of an unstable 1 FPS option. 2019-06-08 12:23:58 -04:00
Cody
527f33a778
Adds an FPS setting and slider. 2019-06-08 12:23:58 -04:00
Monty Marz
8a19a6f2a3
Configurable max fps 2019-06-08 12:23:57 -04:00
Cody
41f3cd5803
Changes setting type to u32, enforces live in-game updates to setting. 2019-06-08 12:23:57 -04:00
Cody
a90d073c22
Adds mouse sensitivity sliders that update settings file. 2019-06-08 12:23:45 -04:00
timokoesters
037fcfe5da
Ungrab mouse when closing settings with X 2019-06-07 22:23:06 +02:00
Cody
14ac5babd4 Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Joshua Barretto
afd983f6f8 Lighting fix 2019-06-06 12:25:06 +01:00
Joshua Barretto
427339cc9a Smoothed fog VD opening 2019-06-06 11:09:25 +01:00
Joshua Barretto
8da46b48ac Added frustum culling for chunks 2019-06-06 10:04:37 +01:00
Joshua Barretto
66cd8de0e1 Only draw chunks outside of fog boundary, reduce fog strength 2019-06-06 08:13:58 +01:00
Joshua Barretto
eb2d1f3278 Comment cleanup 2019-06-06 06:46:02 +01:00
Joshua Barretto
4ada144164 Changed debug flag in client 2019-06-05 20:52:51 +01:00
Joshua Barretto
d663da27b5 Made character the centre of the fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
76dca0b0cf Added dynamic fog growth 2019-06-05 20:52:51 +01:00
Joshua Barretto
9da2d82197 Added proper VD fog 2019-06-05 20:52:51 +01:00
Joshua Barretto
cd630b0816 Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Joshua Barretto
9a8552d5fb Added rocks 2019-06-05 20:52:51 +01:00
Joshua Barretto
478cc24c91 Deferred normal unpacking to the terrain fragment shader 2019-06-05 20:52:51 +01:00
Joshua Barretto
92f2d36b0c Optimised sub-terrain chonk storage, fixed hash chunk bug, altered terrain base 2019-06-05 20:52:51 +01:00
Louis Pearson
3723649d39 Update cpal 2019-06-05 13:17:19 -04:00
Joshua Barretto
3a1221068f Merge branch 'voxel-shadows' into 'master' 
Shadows, deserts, snow, caves

See merge request veloren/veloren!198
 2019-06-03 22:13:10 +00:00
Joshua Barretto
c3cd3b9a69 Compressed vertex data even more 2019-06-04 00:09:49 +02:00
Joshua Barretto
8d04b9297e disabled temporarily point light 2019-06-04 00:08:58 +02:00
Joshua Barretto
e2182b1a68 Added basic light 2019-06-03 22:50:47 +01:00
Pfauenauge90
ce6a9ac32d Roots added 
fmt

asset fix
 2019-06-03 22:50:27 +01:00
Timo Koesters
930bc91174 Merge branch 'fix-server-info' into 'master' 
Add server info and player list to client

See merge request veloren/veloren!197
 2019-06-02 14:45:41 +00:00
Monty Marz
112f0515bd Button added 
Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f
 2019-06-02 02:17:36 +00:00
Cody
04d4dc1da5
Reverts one erroneous change, further corrects another comment. 2019-06-01 00:52:20 -04:00
Cody
609742f8fa
Makes some quick in-game menu fixes. 2019-05-31 16:36:25 -04:00
Cody
75ca605f5d
Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names. 2019-05-31 16:36:24 -04:00
Cody
b05eb2b861
Changes asset filenames for consistencies. 2019-05-31 16:36:24 -04:00
Cody
6c76667356
Addresses more naming schemes and typos. 2019-05-31 16:36:24 -04:00
Cody
b9377b5c33
cargo fmt 2019-05-31 16:36:23 -04:00
Cody
a258be7aac
Fixes some typos, comment inconsistencies, and incorrect naming conventions. 2019-05-31 16:36:16 -04:00
Louis Pearson
70b503868e Add fix for headphone and invalid device params 2019-05-31 14:24:33 -06:00
Louis Pearson
64d38e687b Move to latest version of cpal 2019-05-31 13:19:32 -06:00
Joshua Barretto
024afb9b4a Added desert and snowy areas 
Former-commit-id: 220e404de8f64e35d9f54f2b0eeff3fe90c33802
 2019-05-29 22:24:47 +01:00
Joshua Barretto
f49796dcef Basic cave test 
Former-commit-id: 5b56bb882aca37d7fee1ee9c5e100ad2bf97834e
 2019-05-29 14:49:27 +01:00
Joshua Barretto
1e2f130ad6 Added voxel shadows 
Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c
 2019-05-29 12:01:02 +01:00
Imbris
061ab9f45e limit ingame element size 
Former-commit-id: b60e297096ad354cae77482fe84aca88bb9a8f3e
 2019-05-28 20:47:03 -04:00
Imbris
c41fc026a8 fmt 
Former-commit-id: 288b2b5d5872aebd255e464c921521c0b8b864fa
 2019-05-28 20:47:03 -04:00
Imbris
e3e8afd99b Stop drawing entities outside the vd 
Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf
 2019-05-28 20:47:01 -04:00
timokoesters
59967c603c Save settings when the game closes 
Former-commit-id: 0190f45ddbd87ec6ae2e4d4d959672d22e560907
 2019-05-28 19:16:07 -04:00
Imbris
38416ef37c Show disclaimer once 
Former-commit-id: f4937dba2caca207b02deb18ad209a8435e65b61
 2019-05-28 19:16:07 -04:00
Imbris
045f41dae7 Use vd setting when creating client 
Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410
 2019-05-28 19:16:06 -04:00
Joshua Barretto
ec3176a471 Merge branch 'audio-error-1' into 'master' 
Fix game crashing when trying to start audio

Closes #112

See merge request veloren/veloren!187

Former-commit-id: e2c62779efae0a91edf1ad546fe1f077ddc5227e
 2019-05-28 22:16:03 +00:00
Louis Pearson
a3dafde081 Add better version of Snowtop 
Former-commit-id: ea47207ec7651d8c7eedea14f77399e96c3546b6
 2019-05-28 15:01:10 -06:00
Louis Pearson
4502def070 Fix game crashing when trying to start audio 
Former-commit-id: fa24d352f3d8721406fbeda9785689d681d42d27
 2019-05-28 15:01:10 -06:00
Joshua Barretto
5b5cd7d341 Merge branch 'healthbar-rendering-when-less-than-full' into 'master' 
Only render other player's healthbars when less than 100% full

Closes #123

See merge request veloren/veloren!195

Former-commit-id: 70607acd77d14b911574d328332f341e5f395b24
 2019-05-28 20:37:37 +00:00
timokoesters
3d21cd7402 Get player count and calculate ping time 
Former-commit-id: 99da086195e301f1e6cba3ebe7fa5b745b86502a
 2019-05-28 21:55:05 +02:00
JMS
e3902ea134 Fix debug coordinates window crashing when player has no Pos component yet 
Closes #136


Former-commit-id: eb7b2a4c525a4b2771a9ca168e566b24bd23c7b8
 2019-05-28 15:40:50 -04:00
JMS
b5976b567e Only render other player's healthbars when less than 100% full 
Implements part of #123


Former-commit-id: d927d153a39b016d029587351eeb5fa87ccb5197
 2019-05-28 15:26:11 -04:00
JMS
4fcb6cd025 Add player coordinates to debug window 
Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7
 2019-05-28 14:23:24 -04:00
Marcel
b5b61462ee Merge branch 'event-chat-messages' into 'master' 
Event chat messages

See merge request veloren/veloren!188

Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7
 2019-05-28 10:45:24 +00:00
Marcel
7cbc4dbfdb Merge branch 'easy-run' into 'master' 
Add default-run to allow compiling with just `cargo run`

See merge request veloren/veloren!189

Former-commit-id: e520b72762accce00e275a48d70bbec31f2dbd83
 2019-05-28 10:27:45 +00:00
jshipsey
6cb1a75b93 speed tweak 
Former-commit-id: a3938ec59032794c7135facddecbf7131fb5262e
 2019-05-27 19:48:44 -04:00
jshipsey
f9e2828de5 swing animation changes 
Former-commit-id: 1bc70090e938c12d6e133683932b470be102aecd
 2019-05-27 19:03:52 -04:00
jshipsey
5f22c4e26f swing animation 
Former-commit-id: 19e2c32aa36e3890e35df87f01bb0aec4cc8cf9c
 2019-05-27 18:54:09 -04:00
timokoesters
7ced54ba54 Add default run to allow compiling with just cargo run 
Former-commit-id: 88c41361bda4b77c13d52217024e286cb7c0a565
 2019-05-27 22:51:42 +02:00
timokoesters
2008400169 Implement killer name in chat 
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
 2019-05-27 21:47:19 +02:00
timokoesters
a6439984be Add connect, disconnect and kill messages 
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
 2019-05-27 19:45:43 +02:00
Monty Marz
8a3b308224 Wolf model assets update 
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
 2019-05-26 19:12:32 +00:00
Imbris
ec4bf7279a Add check for typing 
Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02
 2019-05-26 12:23:24 -04:00
Imbris
8754ea1661 Fix hud handle_event() match arm order 
Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041
 2019-05-26 12:12:10 -04:00
Timo Koesters
48a905ba86 Merge branch 'attack' into 'master' 
Attack fixes

See merge request veloren/veloren!179

Former-commit-id: 97f1e109dcbcbf7f1d860cf3aebae871f93884cf
 2019-05-26 16:07:08 +00:00
timokoesters
a7faa82aad Fix invisibility 
Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011
 2019-05-26 18:01:55 +02:00
timokoesters
4ebf2e13a5 Fix wolf red and dead velocity 
Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d
 2019-05-26 17:34:00 +02:00
Imbris
3c7f463330 Don't create Consts if they are not needed 
Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4
 2019-05-26 11:24:26 -04:00
Imbris
4a8e85ef64 restore lost changes 
Former-commit-id: a94c52677287131e02c88748694dfbcaf90b531a
 2019-05-26 11:24:25 -04:00
jshipsey
d179ccbd92 rebase fix 
Former-commit-id: b1a1136942ec37647401dfa28682f2ee33b760a2
 2019-05-26 11:11:14 -04:00
jshipsey
b4e9359e3f Merge branch 'pets' of https://gitlab.com/veloren/veloren into pets 
Former-commit-id: f6ab802ebcb24a6c9c5d1c4343ce6b4d68cf942d
 2019-05-26 11:04:11 -04:00
jshipsey
7aab509701 rebase with combat merge 
Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1
 2019-05-26 11:02:01 -04:00
jshipsey
c342a7136b tweaking quadrupedmedium 
Former-commit-id: 61dac48095caa4c7f0fe92ff7badf360b1a1402d
 2019-05-26 10:39:57 -04:00
jshipsey
cd4e36e32a pipeline adjustment 
Former-commit-id: 9b263baee41e1701532aa09ed3cde51da42bd9de
 2019-05-26 10:39:57 -04:00
jshipsey
51b54a0252 cleanup 
Former-commit-id: 62237741afd6d2f6a22030a378a612c3b62dc0ae
 2019-05-26 10:39:57 -04:00
jshipsey
26da091b0b add wolf 
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
 2019-05-26 10:39:57 -04:00
jshipsey
fa07323083 tweaking quadrupedmedium 
Former-commit-id: 3e06337cd99ced44a786c55666764a8c54bc8b90
 2019-05-26 10:25:56 -04:00
jshipsey
9a4e663ef9 pipeline adjustment 
Former-commit-id: 8f42b9971cb6a0f3fa9b7852fb52f4710acdcf12
 2019-05-26 10:18:50 -04:00
timokoesters
f0397f1a32 log::error instead of panic 
Former-commit-id: 802f81425869698a95654d423fef93136617cb5f
 2019-05-26 16:11:30 +02:00
timokoesters
64b00f41f4 Fix invisible chars 
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
 2019-05-26 16:04:44 +02:00
timokoesters
cda253c3cf Make Failed to tick go back to the main screen and move to ron 
Former-commit-id: 14d4ab3cb9d964805a2f275b932e93cef9b72d38
 2019-05-26 12:58:43 +02:00
jshipsey
eddffb9d91 cleanup 
Former-commit-id: c4cad9ddce3d58bfb08a13959fe9bb97d44fd986
 2019-05-26 00:43:16 -04:00
jshipsey
b7cbe1e67c add wolf 
Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41
 2019-05-25 23:31:49 -04:00
timokoesters
a18a8e0d15 Fix nametags showing on dead players (maybe) 
Former-commit-id: 94548e131ee7c94fc5546fa7410fc9694d1db68e
 2019-05-26 00:34:24 +02:00
timokoesters
79a0edad85 Fix glider 
Former-commit-id: dbcdfef19b3cd428736e77176a958f128b7fe7ad
 2019-05-26 00:04:40 +02:00
timokoesters
746e286b5b Fixes 
Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578
 2019-05-26 00:00:38 +02:00
timokoesters
4696cd2c8b Add better inputs, input validation and more 
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
 2019-05-25 23:46:56 +02:00
timokoesters
3c0121538b Make key binds work with mouse events 
Former-commit-id: 77421b44e92d7c60c39ebcb3f94a406ef7f027ff
 2019-05-25 23:46:52 +02:00
timokoesters
075c0d9e11 Use type MouseButton instead of glutin::MouseButton 
Former-commit-id: 7fc8b2f3f42ed45455feaa4a36e225a981b768ac
 2019-05-25 23:21:40 +02:00
timokoesters
f4434013db Fix clear_terrain not changing Changes 
Former-commit-id: da7b02939d6d0bc7dbef7d923fb880081f6e08aa
 2019-05-25 23:21:40 +02:00
timokoesters
525af4c201 Add Constant for damage fade 
Former-commit-id: 4b0e2ff6249ebcf814b036ba11c57ad094811e30
 2019-05-25 23:21:40 +02:00
timokoesters
15d1a789d6 Better formatting 
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
 2019-05-25 23:21:39 +02:00
timokoesters
3697c47e33 Change client_state_pending to ClientState::Pending 
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
 2019-05-25 23:21:39 +02:00
timokoesters
1826a2b4f9 Implement fast respawn 
Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd
 2019-05-25 23:21:39 +02:00
timokoesters
0344f3eba8 Implement hit time delay 
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
 2019-05-25 23:21:39 +02:00
timokoesters
e34a47d0d7 Fix chunk loading delay 
Former-commit-id: b287ab5be22ae6e4d0b10b5010e592a7a514cacb
 2019-05-25 23:21:39 +02:00
timokoesters
f5751d65b1 Fix terrain not loading 
Former-commit-id: f9279878ab051c6083c4a1f5125531fe79151fb8
 2019-05-25 23:21:39 +02:00
timokoesters
a0918d11b6 Fix red effect 
Former-commit-id: 1fd90a40aaaccb98aeb34715ee7cad5c0b3b3de7
 2019-05-25 23:21:38 +02:00
timokoesters
ad5dcb4158 Make use of states in char-selection 
Former-commit-id: f74d4811bebb0e60093a96d70feeedaae8bc6c04
 2019-05-25 23:21:38 +02:00
timokoesters
449b717777 Go back to char selection on death 
Former-commit-id: a8b5ee42f432ff2da8385225b17be654420f17d1
 2019-05-25 23:21:37 +02:00
timokoesters
b3e4ca0a5d Implement killing 
Change animation history to animation
Add attack input event
Implement killing with ecs systems for damage and death
Sync attack properly
Sync deaths


Former-commit-id: 72b5be7d65d9d3fcbef50d4836a6f06ec218d69e
 2019-05-25 23:21:37 +02:00
Joshua Barretto
242a23658c Switched to pop_front 
Former-commit-id: 2653d3bb0fc5e9dd9c50eeb7b012d3cd4e94b439
 2019-05-25 21:03:56 +01:00
Joshua Barretto
3534804697 Limited total messages 
Former-commit-id: 7c8e4a3f9e1d36731579300f7662a324566de6fb
 2019-05-25 20:16:38 +01:00
Imbris
9edcabc679 Fix difficult grabbing after closing via button 
Former-commit-id: 2649d9e210d375f19d2970f15614be23d5173c67
 2019-05-25 08:59:58 -04:00
Imbris
3daec2cb17 Don't take mouse events from an unfocused window 
Former-commit-id: 99b60171c86109606318c6f39b45370105e3a7d9
 2019-05-25 08:59:58 -04:00
Imbris
a09c3691db add pan and zoom sensitivity settings 
Former-commit-id: 26d2becc17cc3b9fce77e27f91834b0caf3ea77a
 2019-05-25 08:59:58 -04:00
Imbris
25dbc54961 set player alias as nametag if default char name 
Former-commit-id: 0c6053842028b2b2743746267bb65a34a6581d71
 2019-05-25 08:59:57 -04:00
Joshua Barretto
86bb277116 Added snow to mountains, fixed hash sub-chunk allocation failure 
Former-commit-id: 45bb3063172b980f7cd7aa5bd2b50a1a53480120
 2019-05-25 05:51:45 +01:00
jshipsey
e84d19b5c8 fmt 
Former-commit-id: d4c800b8c2e7667bb635de23c0f334bddd4b7a0d
 2019-05-24 19:01:10 -04:00
jshipsey
8e896cc3c4 rotation simplification 
Former-commit-id: d6ddc514d76dee88477964a7cf053122e39a67a8
 2019-05-24 18:43:49 -04:00
jshipsey
98630b3692 attack state 
Former-commit-id: 6d8a6b68aff7ae2439eb42b2cee017cec99d96df
 2019-05-24 18:42:22 -04:00
jshipsey
ac41a2241c laying groundwork for combat anims, untangling skeleton 
Former-commit-id: 442e7059ce0e62429c263fd0b95ee98b7d8bc0d2
 2019-05-24 18:33:56 -04:00
jshipsey
a65d6e733f rotation simplification 
Former-commit-id: 991b5710d14c27af8f34745caeef95df47be0bb0
 2019-05-24 18:33:55 -04:00
jshipsey
5049b9a2ae attack state 
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
 2019-05-24 18:33:55 -04:00
Joshua Barretto
9101889aa5 Remove msgbox dependency 
The messagebox denedency was causing conflicts when trying to build on
my workstation.  Removing this dependency resolved the problem
immediately.  Will work to replace this functionality before sending
upstream.


Former-commit-id: aeb4255e9c046c5c721316ec408497a7eeca0a5a
 2019-05-24 21:26:25 +00:00
Joshua Barretto
4f2b27c338 fmt 
Former-commit-id: 2d9b4f53438a3849381d8723d0ab48b4015cd35c
 2019-05-24 13:43:03 +01:00
Imbris
265e8f243c small fixes 
Former-commit-id: 0ac2c4e058340d99709843b52fed4a06498ab500
 2019-05-24 02:32:39 -04:00
Imbris
dd607ba9a4 add key to toggle ingame ui elements 
Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6
 2019-05-24 02:31:05 -04:00
Imbris
1d5bf26491 Round resolution scaling to powers of 2 
Former-commit-id: c4ae59271076e1402eb1012257b6e40f082faf06
 2019-05-24 02:31:04 -04:00
Imbris
24a14b083f Scaling of ingame text rasterization to match final size 
Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87
 2019-05-24 02:31:04 -04:00
Imbris
a128abc925 Simplify ingame.rs, fix adding new entities 
Former-commit-id: b5fbf1a0155e8cb2cb7837004b3c0e43ca2ae92e
 2019-05-24 02:31:04 -04:00
Imbris
db910855df Simplify ingame.rs, fix adding new entities 
Former-commit-id: 3e92c4c8c1c580e2b2d95eecd213ac42cf0dd0bc
 2019-05-24 02:31:03 -04:00
Imbris
e9683ba639 Link player stats, remove self name tag 
Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7
 2019-05-24 02:31:03 -04:00
Imbris
45bea22727 Add healthbars, rebase fixes, warning fixes 
Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba
 2019-05-24 02:31:03 -04:00
Imbris
93ec66a8b1 Add ability to position tuples of widgets ingame 
Former-commit-id: e2958a37e7062132d6a7b6d5ad61bd4002768532
 2019-05-24 02:31:02 -04:00
Imbris
b828bffba9 Make name labels work 
Former-commit-id: 633905535d2842b320d347e368a28ac967a8469a
 2019-05-24 02:31:02 -04:00
Joshua Barretto
8c4c14f749 Fixed UI shader 
Former-commit-id: 12851d800a5435d25573e1deadb10b8103d40ac7
 2019-05-24 02:31:02 -04:00
Imbris
7fd3854093 ingame_ui 
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
 2019-05-24 02:31:01 -04:00
Monty Marz
cc9b028bf1 Disclaimer 
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
 2019-05-23 22:45:48 +00:00
sxv20_
3e49c37a08 fix crash on view distance change related to borrows 
Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef
 2019-05-23 10:30:46 +01:00
sxv20_
894b4339ca move debug info DebugInfo struct 
Former-commit-id: 88bded303575ad742416d0299dc19d70dcc81c31
 2019-05-23 10:30:00 +01:00
Algorhythm
6456198b38 Add ping indicator to debug HUD 
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
 2019-05-23 08:18:25 +00:00
Joshua Barretto
3963d4a3ef fmt 
Former-commit-id: b76defa253e555cd381ab6ccf66c8e7f3e816433
 2019-05-22 19:49:06 +01:00
Joshua Barretto
1684013138 Improved GPU memory usage by ~5x by compressing vertex data 
Former-commit-id: b657ae88e44c6ecbede8073ffe17991ba3a99886
 2019-05-22 19:32:33 +01:00
Louis Pearson
e78ae4fefc Remove hacks, clean up crufty code 
Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5
 2019-05-22 05:29:38 -06:00
Louis Pearson
affa5c081e Temporarily remove Ruination 
Former-commit-id: a63df9eaf187f7786b9a2a0e50194c3a7866edbe
 2019-05-22 03:00:16 -06:00
Louis Pearson
eeceef12ef Prevent framerate drop when accessing settings menu 
Former-commit-id: f51d1b700cd328b8156c7df97d6524277cc0718b
 2019-05-21 16:44:51 -06:00
Louis Pearson
4dfebb779e Use global_state for accessing settings in hud 
This has led to a performance regression. For some reason when the menu opens
FPS drops to about 20.


Former-commit-id: 84cdbec5ef40cf6189e544eba6b87981bb9514fe
 2019-05-21 16:44:51 -06:00
Louis Pearson
9f1c70792f Move to using only global_state for settings menu 
Former-commit-id: bb86c851f51c02af1a25d57f2be95d1947b330ad
 2019-05-21 16:44:51 -06:00
Louis Pearson
f52954971d Save view distance, volume, and audio device to settings when changed 
Former-commit-id: ac7db47520c6524b3f2d7a788907daabb73ad237
 2019-05-21 16:44:51 -06:00
Louis Pearson
c8928587dd Allow user to change audio device in the settings menu 
Former-commit-id: 645b91182509da70075bb57f8ea6f9cd638c0d8e
 2019-05-21 16:44:51 -06:00
Louis Pearson
0437f88601 Prevent audio crashes by blocking jack by default 
Former-commit-id: 61243a38667f64d1c8f106b1191ae876fc652c63
 2019-05-21 16:44:51 -06:00
Louis Pearson
ee6ec2d299 Continue implementing audio device selection 
Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf
 2019-05-21 16:44:51 -06:00
Louis Pearson
8dc35b8609 Add audio to settings 
Former-commit-id: 6e18b95bb3460a3b6d971b89c767045dcdbe7344
 2019-05-21 16:44:51 -06:00
Louis Pearson
50fc7549b9 Add baby steps for audio device choice support 
Former-commit-id: 8c1d623b2a28997e7705ba2775b382b38e9a34ed
 2019-05-21 16:44:51 -06:00
Louis Pearson
7cfd3ad1cd Add field_grazing.ogg 
Former-commit-id: 36a5bf4a9af2d89e9acd8dd7404c0b4eb1836f5b
 2019-05-21 16:44:51 -06:00
Joshua Barretto
fc25dc8c7f fmt 
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
 2019-05-21 23:31:38 +01:00
Joshua Barretto
a696847f67 Fixed singleplayer failure caused by worldgen 
Former-commit-id: a2fdb56682922694b32e4d25890afa7a90c5b923
 2019-05-21 23:31:17 +01:00
Joshua Barretto
dcd2b4392d Added rocks, improved hills 
Former-commit-id: c8f3d8fb550186bd87d0de953098971050fd1e03
 2019-05-21 22:51:41 +01:00
Joshua Barretto
feece604be Restarted worldgen 
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
 2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d Basic worldgen 
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
 2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen 
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
 2019-05-21 22:51:41 +01:00
Louis Pearson
7dc087fe93 Create config dir if needed 
Former-commit-id: 280e49f428207d5dc9a88607252df4b9f155d018
 2019-05-20 15:32:16 -06:00
Louis Pearson
8de6d5ad3d Stop saving singleplayer settings to network settings 
Former-commit-id: 06d43eda771e03b6b30d4bdc8ab01d2b3cd6efc2
 2019-05-20 15:05:09 -06:00
Imbris
39caf7e51b Don't allow negative volumes 
Former-commit-id: 35a52235fa4194d40ffc0d8d3243d0653dcca0a5
 2019-05-19 17:50:20 -04:00
Imbris
888bd65036 Add volume adjustment, lower default volume 
Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88
 2019-05-19 15:31:32 -04:00
Pfauenauge
13e916d485 visuals in settings - audio 
Former-commit-id: 51bfcdcbed1d8254c966e7a92a472b585ff61c01
 2019-05-19 19:35:40 +02:00
Joshua Barretto
0a9d7d68d5 Merge branch 'VD-Slider' into 'master' 
View distance slider

See merge request veloren/veloren!152

Former-commit-id: c285b72576f47e1e13ee5959669f51c8aa652ea0
 2019-05-19 01:10:42 +00:00
Joshua Barretto
3508e4afcb Added view distance configuration 
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
 2019-05-19 01:45:02 +01:00
Imbris
0349461533 Pass up Vd slider changes to session.rs & fmt 
Former-commit-id: 187a3d286e288d2159fcde292f78e2bc08ec796b
 2019-05-18 19:55:06 -04:00
Pfauenauge
78173b4bce added slider 
Former-commit-id: c01a2601365c9d4d4b03e58ca33d91469cfbba0f
 2019-05-19 01:22:30 +02:00
Imbris
4f970b63ef fix screen shot flipping 
Former-commit-id: 47ed01cd5f91445d1367121d939c01876008f643
 2019-05-18 19:09:23 -04:00
Imbris
7855dfe52f Add screenshot, fullscreen, & debug keys 
Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34
 2019-05-18 17:16:35 -04:00
Imbris
9e9e8be196 Tweak settings change event handling in hud 
Former-commit-id: 7b9a3163f2e85d202ef295cf6bd63de3ce753640
 2019-05-18 17:09:03 -04:00
Louis Pearson
b0f26633d3 Remove lewton, fix filename issue 
Former-commit-id: 067f3bfe8ea4f20741107689bf55b01d7580b983
 2019-05-18 14:26:16 -06:00
Louis Pearson
6b0fc57ce3 Move global maintains above rendering 
Also moves the call to the AudioFrontend constructor to take place in the
GlobalState constructor


Former-commit-id: 0be9df5a7355b6a7d1ce758894568d67df7db11a
 2019-05-18 14:10:02 -06:00
Louis Pearson
22286c24e6 Play random music whenever a track ends 
To support this, a global_state.maintain() method was added that calls
audio.maintain().


Former-commit-id: e5d20719291ee17096070dfcacec760e45937f7a
 2019-05-18 13:53:57 -06:00
Louis Pearson
315767f19f Add code to ignore jack as an audio device 
Former-commit-id: 1dbaa796f82f2e9be26a3648e9aaca81f3348134
 2019-05-18 13:53:57 -06:00
Louis Pearson
5a04e98725 Change asset paths to be relative 
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
 2019-05-18 13:37:44 -06:00
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
Joshua Barretto
7f857daa91 Colour adjustment and server crash fix 
Former-commit-id: 7a1f6dcccc9869472f6044407d063ea86bb12dd3
 2019-05-18 17:47:55 +01:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Joshua Barretto
7174830279 fmt 
Former-commit-id: 71912bdd2b8f40020153c5696cd5cc1af3f154cc
 2019-05-17 18:54:56 +01:00
Joshua Barretto
91184356e7 Added chonks 
Former-commit-id: a62fb321dbfb7541feaa9de4e641db9887b061fd
 2019-05-17 18:44:30 +01:00
Imbris
8e0c1b1abd cleanup some warnings, pretty crash string literal 
Former-commit-id: 43492866f624c12c87762a94188c6c193e5bb90c
 2019-05-17 03:55:51 -04:00
Imbris
c780b85f24 Stop crash when minimizing 
Former-commit-id: ca52ae2520bf5616d24f27d98244a470966f3573
 2019-05-17 01:13:14 -04:00
Joshua Barretto
db4be8e492 Updated sphynx 
Former-commit-id: f81484571bda8c5e15ea2b6c0e8b9b6892b094a3
 2019-05-17 00:05:46 +01:00
Joshua Barretto
6f984ca181 Added figure colour to shader and health component 
Former-commit-id: e2c23e5132991cc436a678af43782e31ffc55516
 2019-05-16 23:34:57 +01:00
Joshua Barretto
7b09070fc8 fmt 
Former-commit-id: 8f0bc964e00bfd9461f752622862de5335678e5b
 2019-05-16 20:23:45 +01:00
jshipsey
6db00e371d popup origin fix 
Former-commit-id: 9a7ba69115e7b574bc2f3bf26afad71e3c682c38
 2019-05-16 01:29:48 -04:00
jshipsey
50fa3cf098 glide anim 
Former-commit-id: b614a672b0a94f2b8803c0c1c22468b889242cc6
 2019-05-16 00:40:35 -04:00
Joshua Barretto
5092df0e7f Improved quadruped origin 
Former-commit-id: 35a360bf285f2495dda7859cb8d376d5aa16a1af
 2019-05-15 17:06:58 +01:00
Joshua Barretto
8ef8c178d7 Added test gliding 
Former-commit-id: 7aa1513511490feec531f10e58ad955c485ac594
 2019-05-15 13:26:14 +01:00
Joshua Barretto
8af606e348 Fixed singleplayer logout crash due to orphaned mesh worker 
Former-commit-id: 2b8c5aa0c906223ac043db8137ad95a0e29407c5
 2019-05-15 13:26:14 +01:00
Joshua Barretto
1209f0393d Added figure colour to shader and health component 
Former-commit-id: 222c39bd401ad0a9707eb348d5640717004dbf96
 2019-05-15 13:26:14 +01:00
Imbris
8b97ee14bc add backtrace to panic hook 
Former-commit-id: c831dfa85ebfa1ace05e5ffdec5cc68954394ae1
 2019-05-15 13:24:32 +01:00
Louis Pearson
85e97e16d3 Change vec<u8> to BufReader 
Former-commit-id: 0e91de7976357c96ac58e4f4293c680b9ab98155
 2019-05-15 13:24:32 +01:00
jshipsey
efc019f7a4 idle, run, jump animations 
Former-commit-id: e476dc3aaf2197876c80eeba17837aee976f8df9
 2019-05-15 00:24:36 -04:00
Joshua Barretto
49cc422dfa Fixed quadruped animation selection 
Former-commit-id: 03315efa2c88a4ac3517835b25f7a14cd1599cf0
 2019-05-14 12:37:05 +01:00
jshipsey
2a2b873f56 added skeleton, needs animation fix 
Former-commit-id: f2c741426c073f3bfab3cdcd5b7f401a4fc6400e
 2019-05-13 22:24:34 -04:00
Joshua Barretto
cf487589e2 Made model cache handle non-humanoids 
Former-commit-id: 4b3efb70ba24a8e4c8e1d933752e8ea28d3e8dd1
 2019-05-14 01:02:37 +01:00
jshipsey
732c43ce11 first quadruped changes 
Former-commit-id: 71ad084a872c3bf96d5cbab53c376d214f3cdcd0
 2019-05-13 19:43:10 -04:00
Imbris
ca60b86f53 add ImageSlider widget 
Former-commit-id: 218eb14090365f9ea3c6fb956fcdb989d51aaea2
 2019-05-13 13:09:38 -04:00
Joshua Barretto
5c36aaf01f Merge branch '79-glsl-include' into 'master' 
Move u_globals to shared included file

See merge request veloren/veloren!124

Former-commit-id: 297d46cfe956881ae7a22528fc4c12b8c5ed5c56
 2019-05-13 13:40:02 +00:00
Joshua Barretto
67241fec31 Massively increased efficiency of terrain meshing, chunks generate from centre 
Former-commit-id: 66217b9974a791044e4b1f3d4580761bd066113a
 2019-05-13 13:08:17 +01:00
Joshua Barretto
ee380782fb fmt 
Former-commit-id: 140f1e4f1809b70881a51a3bd943e1697a9dc0a2
 2019-05-13 11:29:35 +01:00
Joshua Barretto
4f53be633e sync 
Former-commit-id: 708f80eabb9dc4052d35ed03875ef7ae485d6170
 2019-05-13 11:15:03 +01:00
Joshua Barretto
216819ca92 fmt 
Former-commit-id: 4fd53e02969d9d044367d81640a2975043c6953a
 2019-05-13 11:06:58 +01:00
Joshua Barretto
761c6e9cf8 Switched to actor system 
Former-commit-id: d2a482f6209aff7aaa4e747e35ce4a7c8a79cdfc
 2019-05-13 11:06:58 +01:00
robojumper
ba10ca38ba Fix chunk meshing 
Former-commit-id: d3a53602e4b480ab9db0a2a98e25cbba5081b624
 2019-05-13 11:03:47 +01:00
sxv20_
f600eca072 start fixing chunk rendering, noticed stack overflow crash 
Former-commit-id: 334904276580cd78f5d5e3bf010a86fcd822cfdf
 2019-05-13 11:03:47 +01:00
sxv20_
592477752e move sample() to returning VolMap, incomplete VolMap meshing code 
Former-commit-id: 77d3db6c3bf28364089647802f83d2d00f3a152d
 2019-05-13 11:03:47 +01:00
sxv20_
a5db1fd0a6 fix TODO (unnecessary mpsc clone) 
Former-commit-id: 6f6319fa6bf86ee4eec4778c6795f71beab21e89
 2019-05-13 11:03:47 +01:00
sxv20_
c2a806910b fix chunks not getting rendered once unloaded and reloaded, remove weightings 
Former-commit-id: d98d1e9bb767d80173c531e8914163c1cc23d7fc
 2019-05-13 11:03:47 +01:00
sxv20_
38da6af3c6 change remeshing queue from LinkedList to HashMap, add remesh weightings 
Former-commit-id: 28f0826501539848ca97721aff5057ccb4599736
 2019-05-13 11:03:47 +01:00
jshipsey
98380df9b2 pipeline fix 
Former-commit-id: 5de7ef7070f1d978206a4e303058411627fac138
 2019-05-12 22:39:16 -04:00
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
3d14d791cf Cleaned code 
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
 2019-05-12 15:57:39 -04: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
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
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
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
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
Forest Anderson
cf22cb99e7 Ran fmt 
Former-commit-id: 6acf43d8e4c446b3f50a673179b8df20d6da648c
 2019-05-09 17:30:44 -04:00
Joshua Barretto
89f9589cf0 Fixes to head animations 
Former-commit-id: b595d4cdb459acbdd3a9a971aff8f0fbfd45981a
 2019-05-09 20:18:13 +01: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
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
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
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
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
Imbris
470e63a691 Remove or uncomment commented code 
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
 2019-05-07 21:59:35 -04:00
timokoesters
a15532f81a Improve cursor grab 
Former-commit-id: c1a8b5383bf7682245e2294e5b1d62dae0beb329
 2019-05-07 22:00:03 +02:00
timokoesters
b3ffc61119 Don't let widgets have mutable access to show 
Former-commit-id: 4c525c60d25bcc6551ddeabd325992fcd513619d
 2019-05-07 19:50:53 +02:00
timokoesters
54cc96f0d1 Move minimap into own file 
Former-commit-id: 7c4a9b0930c899fc8e5089920c3ee5c717561a1a
 2019-05-07 19:34:30 +02:00
Imbris
81c5a070c5 move conrod font out of common 
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
 2019-05-07 02:25:26 -04:00
Imbris
d13430d51e revert chat clicking change (broke scrolling) 
Former-commit-id: f43f3fd97c01dc304f29fcc852ab9909e6d00620
 2019-05-07 01:50:47 -04:00
Imbris
eb3d8310f8 rustfmt 
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
 2019-05-07 01:40:03 -04:00
Imbris
99d6c92c8d rebase 
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
 2019-05-07 01:39:32 -04:00
Imbris
0fc6dd317f open input box by clicking anywhere on chat 
Former-commit-id: f379c52d034b16c5390375899e551b01515cd11e
 2019-05-07 01:27:24 -04:00
Imbris
5c63f398ba replace typing field with function and cleanup 
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
 2019-05-07 01:27:24 -04:00
Pfauenauge
009ca0a130 small windows "relative" to opened char window 
Former-commit-id: 13d07e3bfce60cd17eaf7447a442c47353d9517e
 2019-05-07 01:25:33 -04:00
timokoesters
7f709bba0c Prepare relative small windows 
Former-commit-id: 6f1046518b49b302d69d51e0596514bf9ded7952
 2019-05-07 01:25:32 -04:00
timokoesters
a36fcb4243 Fix settings to use Show 
Former-commit-id: 99c31d8c9914f4b9e6fbcc2b1f72a97a260a725b
 2019-05-07 01:25:32 -04:00
Pfauenauge
6894e55a24 Bag Position 
Former-commit-id: af8435d0c078ea1caa388ff0926ef6dae22ab70b
 2019-05-07 01:25:31 -04:00
Pfauenauge
b7b3c5f3cd positioning 
Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a
 2019-05-07 01:25:31 -04:00
timokoesters
87e75644ec Fix fonts 
Former-commit-id: c7929a0b540099ac67b93563d97be4b8c6639190
 2019-05-07 01:25:31 -04:00
Imbris
efa2afc5c8 re-enable chat focusing 
Former-commit-id: 8cbcbba82bcb85fec11638085cff26049838fe6d
 2019-05-07 01:25:30 -04:00
Imbris
7bade0360e Move Hud's show fields to their own struct 
Former-commit-id: 8f546b2c2f40fb74e4daecc982256b441fcdd7fb
 2019-05-07 01:24:12 -04:00
timokoesters
1c79d06985 Fix settings 
Former-commit-id: 694387dc670ac2c39d3fbc8915d4819b638fe431
 2019-05-07 01:22:48 -04:00
Pfauenauge90
6cbd045231 positioning 
Former-commit-id: 90b626c2900e6bf4924dc290764c2860a5bade98
 2019-05-07 01:22:47 -04:00
timokoesters
819e0a200f Separate bag + buttons into own file 
Former-commit-id: 08e3b640adb85266ce7a739008fa26e1caee0ebf
 2019-05-07 01:15:49 -04:00