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
13,721 Commits 151 Branches 18 Tags 2.1 GiB
a6665ed988
Commit Graph

5040 Commits

Author SHA1 Message Date
timokoesters
c7dd3e96cc Start work on image_ids! and asset loading 
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
 2019-05-07 00:28:05 -04:00
Forest Anderson
6699d7cba2 Merge branch 'backtraces_and_panics' into 'master' 
Fix panic when minimizing, show backtraces when panicking

See merge request veloren/veloren!108

Former-commit-id: 161f1ffe4818cce3535be3913b9da2c476b56334
 2019-05-06 14:42:45 +00:00
robojumper
209b29a870 Slightly improve render target creation code 
Former-commit-id: 7ce92cce35834b006df9dacb4b4dd3e88d603b4e
 2019-05-06 14:06:07 +02:00
robojumper
821ab80c5b Add post-process pipeline 
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
 2019-05-06 10:22:47 +02:00
robojumper
31a8e653c4 Fix panic when minimizing, show backtraces when panicking 
Former-commit-id: 0ad401d81a2f7b4d0b766578238d2ab9259f80eb
 2019-05-05 20:42:44 +02:00
robojumper
b2c2d89447 Run cargo fmt 
Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2
 2019-05-05 17:54:08 +02:00
robojumper
647d1dcc9c Smoother and terrain-aware camera 
Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058
 2019-05-05 17:44:56 +02:00
Forest Anderson
aa9c01af35 Merge branch 'master' into 'master' 
Update help window to use player's keybindings

Closes #42

See merge request veloren/veloren!71

Former-commit-id: b35965946b9558a19f29610357d62982f7554588
 2019-05-04 17:52:16 +00:00
Pfauenauge
48d254c7ae esc menu buttons visuals fix 
Former-commit-id: 742857d2f7bcf19a543890bf780d9b46fbca9e0e
 2019-05-03 22:25:23 +02:00
Forest
75f8a638f7 Ran clean code 
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
 2019-05-03 09:49:05 -04:00
Pfauenauge90
b2a2eb0907 deleted .gitignore in voxygen 
Former-commit-id: 8a3ede769bb5f74af836bb8975fa2e1b7281c716
 2019-05-03 15:17:53 +02:00
Pfauenauge
505eb3b22e Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren 
Former-commit-id: 53ceca71f2d9a623ed994ad171058f488a42de77
 2019-05-03 13:49:37 +02:00
Pfauenauge
c45494e70f textbox visuals 
Former-commit-id: 4ae65bb009a1e461143b3dbf3f3e52344148fa7c
 2019-05-03 13:48:56 +02:00
Pfauenauge
8240997f8c New Buttons and Input Frame 
Former-commit-id: cf05992eca9e6a75cedda8c873ef268e4bbaade8
 2019-05-03 13:48:55 +02:00
Pfauenauge90
b3bac9a46e Controls Window 
Former-commit-id: 785b039f9241da2f0ba66e7e2db2a14a9b8b54c9
 2019-05-03 13:48:54 +02:00
Pfauenauge
c188affb4e rebase 
Former-commit-id: 9c50e08fc7c4e8afa06f1f995ea1aebd386764c2
 2019-05-03 13:48:53 +02:00
Pfauenauge
c312a8cece rebase 
Former-commit-id: 214203f0d1ccb4e6457395e84b01e4d41467ecdb
 2019-05-03 13:48:52 +02:00
Pfauenauge
dc4ea871ea Controls Window Contents 
Former-commit-id: f3317475e6a06c63ae0a648b29168474b9cf7544
 2019-05-03 13:48:26 +02:00
Pfauenauge
02ba0d969f Controls Window Text 
Former-commit-id: 7f33117748c84644e9f6d7833b5ff44e035e7d76
 2019-05-03 13:48:25 +02:00
Pfauenauge
188e523128 rebase 
Former-commit-id: f44030800c380054af2fef4532bbe93731f128e4
 2019-05-03 13:46:13 +02:00
Pfauenauge
12347ead0b settings window 
Former-commit-id: 3cefa7cc816206fd777f4a94a9b9a1689ed9aa03
 2019-05-03 13:46:12 +02:00
Pfauenauge
cbd754bd90 settings window 
Former-commit-id: a7a72ab6b1db411fcfcf3e03d1db4fce56370af3
 2019-05-03 13:46:12 +02:00
Pfauenauge
1109c55671 Map Window, Settings Window 
Former-commit-id: 337f21010b8c4250a1eaa7ddfbe8d5f2ea1ac412
 2019-05-03 13:46:12 +02:00
Pfauenauge
5852efd896 settings window 
Former-commit-id: 41d85bdc41507bb8c26e5cda2db3135200db7be5
 2019-05-03 13:46:11 +02:00
Pfauenauge
1f369d37bf Map Window, Settings Window 
Former-commit-id: e01861cab1a42540a8b92db46debf95ede3978aa
 2019-05-03 13:46:11 +02:00
Pfauenauge
632ecabef9 Map Window, Settings Window 
Former-commit-id: a94f57941d95cc271a5642e54af7e6ddf373cd18
 2019-05-03 13:40:48 +02:00
Pfauenauge
cc44e86a24 textbox visuals 
Former-commit-id: 8a929c46ebffea8c781817bd4535bf638e605fcb
 2019-05-03 13:21:44 +02:00
Pfauenauge
b2918c2ebc New Buttons and Input Frame 
Former-commit-id: 140b27f9d41de04eb7018d1bbe65012af889a271
 2019-05-03 13:02:03 +02:00
Pfauenauge90
0dbe9c7846 Controls Window 
Former-commit-id: e6e83aaa0eb5606b59581c3005b30e969123bb56
 2019-05-02 20:06:23 +02:00
Pfauenauge
77397788e7 rebase 
Former-commit-id: d40850ca70c5c833f17cba6a9f16de8c63bb5717
 2019-05-02 14:44:51 +02:00
Yeedo
b7ba7f0795 Use shorter help text format, compact stuff into one format!() 
Former-commit-id: 345bef9a2f0714986e4ba6fb24b0bc150023a12e
 2019-05-01 23:15:43 +01:00
Pfauenauge
5362ac7289 rebase 
Former-commit-id: 047a4ffcad326721eaff6f77eb9c8b57cfa0b2b4
 2019-05-01 23:47:09 +02:00
Pfauenauge
8c35f06ed7 Controls Window Contents 
Former-commit-id: f11a9b4da250ba9bd095220efc9e8fc97d32c983
 2019-05-01 23:20:31 +02:00
Pfauenauge
1ba1eb20c7 Controls Window Text 
Former-commit-id: 2e479f29af73fd36b5cb8e6f34b8d2d4265dd100
 2019-05-01 15:50:41 +02:00
Pfauenauge
777f4066d4 changed char head and offset 
Former-commit-id: 6e9ca7249a33504bc0b7cf8f5b5591ead0399151
 2019-05-01 14:11:55 +02:00
Pfauenauge
532a570923 rebase 
Former-commit-id: b3eef84c3a76629e399827e12327556b4c8c7ffa
 2019-04-30 13:49:29 +02:00
Pfauenauge
85bdff364d settings window 
Former-commit-id: b85c0f656c331195bd9c35f57a2609cd4f34f3fa
 2019-04-30 12:59:55 +02:00
Pfauenauge
1a12bc91a1 settings window 
Former-commit-id: 1fc6e52bb860c2f114114bd75ef0b260d9f43871
 2019-04-30 12:59:10 +02:00
Pfauenauge
e12a1a623a Map Window, Settings Window 
Former-commit-id: 72ac20ecdcaccf39c1691be1fbdcb5305d900e78
 2019-04-30 12:58:30 +02:00
Pfauenauge
052c5ecbda settings window 
Former-commit-id: 0dd430bdff017ab95f8df35403c5f4b6d8f10198
 2019-04-30 12:57:34 +02:00
Pfauenauge
bbbcfd15ba Map Window, Settings Window 
Former-commit-id: 74560f37005ec0dc1b5fda6dc18e2b56d74f598d
 2019-04-30 12:54:46 +02:00
Yeedo
f1e268986b cargo fmt, also remove a stray <<<<HEAD thing 
Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
 2019-04-29 22:23:31 +01:00
Yeedo
164feaa616 fix merge conflicts 
Former-commit-id: 72614e5d57607a2095161857df45ce746e8c1b06
 2019-04-29 22:13:14 +01:00
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
Forest Anderson
0ca4b55322 Merge branch 'clean-up-gitignore' into 'master' 
Fix gitignore and delete gitignores in subdirs

See merge request veloren/veloren!91

Former-commit-id: 689231e73e7a97a49fb3d20d76ccc43af3f2681a
 2019-04-29 20:14:52 +00:00
Monty Marz
c7b61d5626 New Settings Window and Map Window 
Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e
 2019-04-29 19:04:52 +00:00
timokoesters
f35e8d7b98 Fix gitignore and delete gitignores in subdirs 
Former-commit-id: 4d57caa521c47d137e29d5b781abbdda6a2d8759
 2019-04-29 20:43:04 +02:00
Forest Anderson
3c45d3c996 Merge branch 'ao-artifact-fix' into 'master' 
Fix ambient occlusion artifact

See merge request veloren/veloren!89

Former-commit-id: b529f9df722d8b174b0c8e5ce9ef2d32965d7294
 2019-04-29 17:00:56 +00:00
Erocs
c68f33babe Add VOXYGEN_LOG env variable to allow detailed terminal logging. 
Former-commit-id: 01c29a65311dbd6a4739be5aca9865d4ac0872d9
 2019-04-29 16:56:38 +00:00
robojumper
cf88e9a5b1 Line endings are hard 
Former-commit-id: 3a0e48b7571ff706feeff4e089fb9c5d63f6ac7a
 2019-04-29 17:41:12 +02:00
robojumper
0bd84b58ec Fix occlusion artifact 
Former-commit-id: 23be3f1173706076802809576e3455833e64b4e4
 2019-04-29 17:39:35 +02:00
Forest Anderson
c95bee9838 Merge branch '12-terrain-ao' into 'master' 
Add terrain and figure ambient occlusion

Closes #12

See merge request veloren/veloren!84

Former-commit-id: 943648d9ca3399e07a275946487d3431ba3832de
 2019-04-29 13:14:36 +00:00
robojumper
7091557b82 Rename mod ao to vol 
Former-commit-id: ef126e03761b18151594780777fa27e94efe24d7
 2019-04-28 23:35:47 +02:00
robojumper
021c6eeda1 Generalize meshing and AO code over terrain, figure 
Former-commit-id: f0a91173ec5a0a9c683e6d1c222cb74e858625b7
 2019-04-28 19:12:45 +02:00
robojumper
32509d2fb1 Add terrain ambient occlusion 
Former-commit-id: de73dcb09f68bcad5dc7431c30849e16f68c5ab7
 2019-04-28 17:10:09 +02:00
Pfauenauge
3773653072 Closable minimap 
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
 2019-04-28 15:56:40 +02:00
Yeedo
0dbdb185d4 Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 2f341c1de302f5600436a3ded1c69af7c9b2c329
 2019-04-28 14:19:08 +01:00
Yeedo
c032e60d12 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: c12d760a22926eebc2661be1db4609546286c89a
 2019-04-28 14:19:08 +01:00
Yeedo
dc5ec137e9 Update help window to use player's keybindings (fix #42) 
Former-commit-id: b5bc8a8801fd4633ec94ea53a8973bcb891a4fd6
 2019-04-28 14:19:08 +01:00
Yeedo
ad1fc20cfe Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 5b29776d3f37fbf87842bc61c8d287fe8e66b691
 2019-04-28 14:19:08 +01:00
Yeedo
00e92e5ea2 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: 99927ee1ca6c1cabb5268353690ec88425b7ae3d
 2019-04-28 14:19:08 +01:00
Yeedo
e1fc901b5f Update help window to use player's keybindings (fix #42) 
Former-commit-id: c79b4184b279b2e6fbaac8e0b7c641741d8eb51e
 2019-04-28 14:19:08 +01:00
Yeedo
44f8e834fc Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: a0e023c1cce1677cd1178490df9c569b774db6b6
 2019-04-28 14:19:08 +01:00
Yeedo
48747dd9a9 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: ce120495a91ce0306bcb010923cd340fc70b87db
 2019-04-28 14:19:08 +01:00
Yeedo
488132f63b Update help window to use player's keybindings (fix #42) 
Former-commit-id: b1d374e83ab134a094b664ada8f35916e4734602
 2019-04-28 14:19:08 +01:00
Yeedo
be9a399269 Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
 2019-04-28 14:19:08 +01:00
Yeedo
7593d4e821 Tiny fix to prevent settings from permanently being marked as changed 
Former-commit-id: 665a8851526c1386e497064e2b0f3f8689db60d8
 2019-04-28 14:19:08 +01:00
Yeedo
50c6518d89 Update help window to use player's keybindings (fix #42) 
Former-commit-id: 5f35a153f05b48ae8c21ae9735080c5c7392e2dc
 2019-04-28 14:19:08 +01:00
Pfauenauge90
0afbba3303 FPS display moved, changes to windows 
Former-commit-id: 141d250e29273f59edf661eff7fc7ebd88754435
 2019-04-28 13:18:00 +02:00
Pfauenauge90
33515bd04c removed test_assets in voxygen 
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
 2019-04-28 13:18:00 +02:00
timokoesters
a4d7d0d488 Implement StartSingleplayerState 
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
 2019-04-27 22:57:55 +02:00
Joshua Barretto
b72c6b7185 Merge branch 'master' into 'master' 
bag visuals fix

See merge request veloren/veloren!75

Former-commit-id: 30b26e73c0d43ef4f0c3d55154547e5d010a33a7
 2019-04-25 21:59:55 +00:00
Pfauenauge
d7be49def1 Minimap changes, grass colour adjusted 
Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5
 2019-04-25 23:43:32 +02:00
timokoesters
fb0b0f682a Fix duplicated code 
Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538
 2019-04-25 22:59:11 +02:00
Pfauenauge
bf8bb9180b bag visuals fix 
Former-commit-id: e73f822883badd76d823c69984675a76e9bbbf1e
 2019-04-25 22:33:14 +02:00
Joshua Barretto
f1b63732af Merge branch 'master' into 'master' 
Terrain

Closes #5

See merge request veloren/veloren!66

Former-commit-id: 01d1eb1e0aaae62d0c2a53390fd847db524d217e
 2019-04-25 19:35:35 +00:00
Forest Anderson
cabb06717b Merge branch 'show-mouse-esc' into 'master' 
Show mouse on Esc, hide when pressing again

Closes #28

See merge request veloren/veloren!61

Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f
 2019-04-25 18:27:08 +00:00
Joshua Barretto
f136a63f69 Adjusted terrain loading and meshing performance 
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
 2019-04-25 17:52:11 +01:00
Joshua Barretto
0b0c71592c Fixed orientation issue 
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
 2019-04-25 17:52:11 +01:00
Joshua Barretto
9105bf0811 Added better terrain collisions 
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f210de09df Added raycasting (needs testing) and basic character terrain collision 
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
 2019-04-25 17:52:11 +01:00
Joshua Barretto
61afb98869 Foobar 
Former-commit-id: adac9eea1bd685a8eee275e5a05a74c287762e22
 2019-04-25 17:52:11 +01:00
Joshua Barretto
f9f434a1c2 Started work on worldgen 
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
 2019-04-25 17:52:11 +01:00
Louis Pearson
b0ebbd5631 Use the directory defined by the OS to store configuration files 
Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
 2019-04-25 10:24:00 -06:00
Joshua Barretto
7e1ef46e4d Merge branch 'pfauenauge-fix' into 'master' 
Update UI (Pfauenauge)

See merge request veloren/veloren!68

Former-commit-id: 43d549dbb8882937df929f618325163d22c919a4
 2019-04-25 12:25:30 +00:00
Joshua Barretto
dc86b4d14e Removed old commented logging code 
Former-commit-id: 9b20f7b7a979de3377f1da84d46e23ddd0ef6c11
 2019-04-25 13:08:47 +01:00
Joshua Barretto
abaab5787b Made message output smaller 
Former-commit-id: 21eee7126baf3f85468dc54c5e31cbb4deda9667
 2019-04-25 13:08:46 +01:00
Joshua Barretto
03051248b9 Added user-friendly error output for Voxygen 
Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
 2019-04-25 13:08:46 +01:00
Joshua Barretto
d04db4f6dc Merge branch 'master' into 'master' 
velocity tilt, run adjustments

See merge request veloren/veloren!69

Former-commit-id: 90a449e76431bb11bf748b887876c0e88db9e566
 2019-04-25 12:08:01 +00:00
Louis Pearson
2a6a0a2a3e Fix default server loading 
Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71
 2019-04-25 02:45:01 -06:00
Louis Pearson
feb0610448 Ran rustfmt on ui.rs 
Former-commit-id: 7ee721023ce69de122993b9c94b0bd3fa739e154
 2019-04-25 02:35:08 -06:00
Louis Pearson
d7e9caf5de Adjust server list UI 
Former-commit-id: 61587cbd540c71bc9c264a744b89b8d88ec7ac15
 2019-04-25 02:35:08 -06:00
Louis Pearson
dadbfb9d85 Add clickable server buttons 
Former-commit-id: d56b65b83db590991a2a42a95caa7b41a216052c
 2019-04-25 02:35:08 -06:00
Louis Pearson
d7c80d0afc Add basic UI to view saved servers 
Former-commit-id: 85cc946ac3684aaba64a03997790ef5ab06dbbd7
 2019-04-25 02:35:08 -06:00
Louis Pearson
15c2cdb2ef Add networksettings and integrate with main menu ui 
Former-commit-id: f04532e03f8262b9751ae4a68259637f7de0344c
 2019-04-25 02:35:08 -06:00
timokoesters
e36ca0bc59 Fix unnecessary if 
Former-commit-id: 303b140a06045a7eb3406402d5e30480571a713d
 2019-04-25 10:27:18 +02:00
jshipsey
c0a8a677b7 simplified scaling code 
Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347
 2019-04-24 23:33:36 -04:00
jshipsey
0a34bfab9b run animation incremental tweaks 
Former-commit-id: fa43d89890e22da665dc29606baed46e23f8eb6e
 2019-04-24 23:32:35 -04:00
jshipsey
bc5074a2b8 velocity tilt 
Former-commit-id: 362232bff35784828ee8766e77dadc4e83bf3753
 2019-04-24 23:31:18 -04:00
jshipsey
56a8a247cc simplified scaling code 
Former-commit-id: 2a1c8450f002862f67873c375674413902e138ef
 2019-04-24 23:30:06 -04:00
jshipsey
9c15fa08a8 run animation incremental tweaks 
Former-commit-id: 3abad8762a7a2daaf96c955cf89bcf5713ae7318
 2019-04-24 23:28:51 -04:00
jshipsey
9510edd148 velocity tilt 
Former-commit-id: 34443765d993ec5036d2b3e08e7dff5a68193de6
 2019-04-24 23:26:22 -04:00
jshipsey
97603120a2 simplified scaling code 
Former-commit-id: 3f85bf6aef1f3931570fafb8b2aa5b0dc26f8fad
 2019-04-24 23:25:05 -04:00
jshipsey
4d0660affb run animation incremental tweaks 
Former-commit-id: c80f014baf3b9ddb73bb01cf6fd83272d890ab55
 2019-04-24 23:25:05 -04:00
jshipsey
df39bcb2dc velocity tilt 
Former-commit-id: 7373827734c9a65813537d7a1cb49b400c7d6fb8
 2019-04-24 23:25:05 -04:00
timokoesters
a981d57379 Fix formatting 
Former-commit-id: 5fd593a918f22d02b2c5be246c81ef1e8042ad69
 2019-04-24 22:33:34 +02:00
timokoesters
8314fc9439 Update UI 
Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217
 2019-04-24 21:55:22 +02:00
Forest Anderson
f85e3546cf Merge branch 'fps_counter' into 'master' 
Add debug window, window toggle, fps counter

See merge request veloren/veloren!63

Former-commit-id: 38e5d85a0db9a01c877f975f91526cd2dbe1c1fb
 2019-04-23 17:57:49 +00:00
sxv20_
0127cae5d0 remove TODO comment 
Former-commit-id: cd90cd0403d03b6c8c9477a7377ad25288cc1488
 2019-04-23 18:36:29 +01:00
timokoesters
701755a8e2 Add disconnect handling 
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
 2019-04-23 14:01:16 +02:00
timokoesters
7baecff1f0 Clean up figure cache models when necessary 
Former-commit-id: 7653217b2f4c02f5c179e35907fa47c3526b2a2e
 2019-04-23 13:59:16 +02:00
timokoesters
3bb7de61ef Fix .internal() 
Former-commit-id: 63207ee9bdc1fa31dcff0c5ad93c6a71857fe165
 2019-04-22 23:00:25 +02:00
timokoesters
e9027c6433 Split connecting from registering 
Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9
 2019-04-22 23:00:24 +02:00
timokoesters
ba6ead4077 More wrong messages will be punished with disconnect 
Former-commit-id: 767f3226c62d7560d26a909eed8a69b8afe11110
 2019-04-22 23:00:23 +02:00
timokoesters
794b9cafad Implement ClientStates 
Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2
 2019-04-22 23:00:22 +02:00
timokoesters
802c484a38 Make character model more variable 
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
 2019-04-22 23:00:21 +02:00
sxv20_
ded36d7c8d Add debug window, debug window toggle 
Former-commit-id: f0eee8c127dab7c6f552e00ca26632fe1798ee5d
 2019-04-22 20:24:54 +01:00
sxv20_
64c97f47fc Add prototype FPS counter to HUD 
Former-commit-id: c75778ff22ddd44d6e398a559193bc0d0c2e62fe
 2019-04-22 20:24:16 +01:00
timokoesters
f8d1340199 Show mouse on Esc, hide when pressing again 
Former-commit-id: 440fd99b32b2490cb87add2e095cdd17fece0b57
 2019-04-22 20:23:40 +02:00
timokoesters
91057edfac Remove .internal and .internal_mut 
Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2
 2019-04-22 10:24:27 +02:00
jshipsey
44374969fb Merge branch 'master' of https://gitlab.com/jshipsey/fresh 
Former-commit-id: ba8dfe2c6b54b40b25ce2fe71d2eef8827f8a779
 2019-04-20 19:39:54 -04:00
jshipsey
c492e72a99 tidying up code 
Former-commit-id: 0f77e7baf0c628969bc31e4d5fc4b42e18ab57d2
 2019-04-20 19:37:09 -04:00
jshipsey
7778546b69 more rebasing 
Former-commit-id: f8671bbddd1c8aae132f1888bb76262aa5f81bcf
 2019-04-20 19:34:40 -04:00
jshipsey
0e71756643 merge fix 
Former-commit-id: 38fa38de2b2985062e3260170b4f6f06d17515a1
 2019-04-20 19:28:18 -04:00
jshipsey
a7f300feee rebasing 
Former-commit-id: 1ef4423a8f839f5c72c650dd0ba4affddc0215fa
 2019-04-20 19:28:18 -04:00
jshipsey
9d2040d509 tidying up code 
Former-commit-id: 43981525316728a182d41ecc107f31e2eb2583f9
 2019-04-20 19:20:49 -04:00
jshipsey
6fd783e6eb animation minor fixes 
Former-commit-id: 38d2da587d647b7f0c08994bc9fe41cc2d7ab675
 2019-04-20 19:20:48 -04:00
jshipsey
0137a83dd8 animattion tweaks 
Former-commit-id: ea560ba0f06432d2d4f9d4f1906f77451a7f5ef7
 2019-04-20 19:18:42 -04:00
jshipsey
78d7cfd89d animation adjustments 
Former-commit-id: d396ddadf4293212f9f6f7142de0d8a519e127d6
 2019-04-20 19:18:42 -04:00
jshipsey
33411a6004 merge fix 
Former-commit-id: 15da549d36774bb3713297d2b9f3799b1d7eb5f4
 2019-04-20 19:13:38 -04:00
jshipsey
ab17221dad adding test assets 
Former-commit-id: 7d8f9b19d8ec1b31a67d3d650a9e64aa23fc741c
 2019-04-20 19:13:38 -04:00
jshipsey
a04ddf67f6 quadruped testing 
Former-commit-id: 07f4fb4484f26dae0e8503ddec32a17f2fa312b5
 2019-04-20 19:13:38 -04:00
Joshua Barretto
0e812baf7f Merge branch 'ui_improvements' into 'master' 
Ui improvements

Closes #23

See merge request veloren/veloren!54

Former-commit-id: 227b25c971c2576e5121d884a5e102307dd471c3
 2019-04-20 23:06:59 +00:00
jshipsey
357a035757 Merge branch 'master' of https://gitlab.com/jshipsey/fresh 
Former-commit-id: 0b7dab49b7d7d92149b2873a8390ab699db63642
 2019-04-20 18:57:09 -04:00
jshipsey
83f8759746 tidying up code 
Former-commit-id: 062930589922dc903be9e959eb06fd203945c101
 2019-04-20 18:52:34 -04:00
jshipsey
30e80bdfc3 animattion tweaks 
Former-commit-id: 8e1b89a929761fee2a46aab4689a3dee72573eff
 2019-04-20 18:47:46 -04:00
jshipsey
7717d12c7a more rebasing 
Former-commit-id: c38dde30d5ced7cefad40e3f4ae4208f412bdd23
 2019-04-20 18:47:15 -04:00
jshipsey
c655790c8a merge fix 
Former-commit-id: a344856978c40e12d37dba5aaa0e0abac1dba9f4
 2019-04-20 18:41:05 -04:00
jshipsey
164b9ee203 adding test assets 
Former-commit-id: 9731a05a8b4bed89898513599f8689be5600bb0b
 2019-04-20 18:41:05 -04:00
jshipsey
ee4a261a28 rebasing 
Former-commit-id: 38e7f49fb503caa9ca2377ac48f8fb3a1b22301e
 2019-04-20 18:37:09 -04:00
jshipsey
3d318a85e4 tidying up code 
Former-commit-id: df86599ae47b71bb744f5589da4511fa71603541
 2019-04-20 18:12:45 -04:00
jshipsey
46f571f99a animation minor fixes 
Former-commit-id: 4326db41103a0d3f87c7ad638fb38cd2f3eec71c
 2019-04-20 18:08:56 -04:00
Imbris
7fa37e0c2a update asset loading to not use env 
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
 2019-04-20 18:02:48 -04:00
jshipsey
60fa9a7e20 animattion tweaks 
Former-commit-id: 0baf418a09bfa8ffad7a0bfe4b9f5256053454fb
 2019-04-20 17:33:51 -04:00
Piotr
2800c9e9f5 make 11.0 a const 
Former-commit-id: 4602f3147b434e93256d48938b813325e74ad551
 2019-04-20 20:35:45 +02:00
Imbris
d6d4155fc4 rearrange hud event handling slighlty 
Former-commit-id: 8043d6c6197112123c371258407ea886a5ae3595
 2019-04-20 14:08:39 -04:00
Imbris
67584a49ce hide chat input when not typing 
Former-commit-id: a1982ef2edf991c94cea359a2892cbf13ef8e980
 2019-04-20 11:43:38 -04:00
Imbris
85dda5e505 go back to main menu when logging out 
Former-commit-id: 95956f916adb0afb47e489defa197f2b8e99b775
 2019-04-20 11:34:45 -04:00
Imbris
83ed5200b0 hide entire hud when toggling interface 
Former-commit-id: 969564ecfd85df0477db4216cd8974adf2df1921
 2019-04-20 11:34:45 -04:00
Imbris
2147774665 Stop sending empty messages 
Former-commit-id: 0f2ed6d0adbbf07566ae1cee1cb0c0498c0c15d8
 2019-04-20 11:34:45 -04:00
Imbris
eef5dd28b5 Fix chat spacing 
Former-commit-id: 2e823a1deb51e2fc77a1662b291ed1b5d01b3e70
 2019-04-20 10:46:36 -04:00
Imbris
0daa8ef3f3 fix scaling artifacts 
Former-commit-id: 7b90e7d033438a0c83e254ea7bcc791ad83808b3
 2019-04-20 08:59:26 -04:00
Imbris
1143c58e37 add graphic cache clearing on resize 
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
 2019-04-19 21:35:12 -04:00
jshipsey
3ff88ff478 animation adjustments 
Former-commit-id: 8720a7442a27103989eae7333b2a48265b94fd07
 2019-04-19 20:20:01 -04:00
jshipsey
4d0466a618 merge fix 
Former-commit-id: b83fed02f8a49e5914c8939bb2ec5e6f76bad2a2
 2019-04-19 19:42:12 -04:00
jshipsey
b4fdc472e5 merge conflict fix 
Former-commit-id: 31fca905c387211f926031012f6c025e3d82f531
 2019-04-19 19:08:10 -04:00
jshipsey
b107a46b07 fixing conflict 
Former-commit-id: 4b0293ce11a5ae4ca0c8b265959fee2138941032
 2019-04-19 19:05:33 -04:00
Imbris
7707636c4e rearrange ui graphic code 
Former-commit-id: d0ea7feee59a1daf4ad93e9b9224750deb75ee45
 2019-04-19 15:06:58 -04:00
Imbris
0b4e268dee add blank graphic, ao for voxel graphics in the ui 
Former-commit-id: ceaba13fdd47707a8804886b5db2260a8cbba2f1
 2019-04-19 15:06:58 -04:00
Imbris
2e69526069 initial setup for .vox rendering 
Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
 2019-04-19 15:00:13 -04:00
yeet
40c2625a4c Fix Singleplayer 
After a certains person's MR has been merged, for some reason all traces of working Singleplayer have disappeared

Former-commit-id: 4119e4609cd39bb1896c7f28d45f5c1a7ec9c129
 2019-04-18 15:53:03 +02:00
Joshua Barretto
56e50f4d58 Minor fixes 
Former-commit-id: 54c2b050fd9be82916d66c872fa9ab5f5354f9dd
 2019-04-18 14:21:25 +01:00
Pfauenauge90
f7af7417ce Error Window, Alpha Version Display 
Former-commit-id: 0cdf4980eacf57db6dc275aabc26f49a0db274a6
 2019-04-17 23:12:15 +02:00
Pfauenauge90
15e498c3f5 Rebase and Login Error 
Former-commit-id: 1b7736d80dde1a10ba04936c2cfe3df4d64ec57f
 2019-04-17 23:11:29 +02:00
Pfauenauge90
1ea7b5031d Help window Closing button fixed 
Former-commit-id: 75c539985527e38b13bf7aa382d3b9491ef19fed
 2019-04-17 23:06:21 +02:00
Pfauenauge90
2e671899e0 Error Window, Alpha Version Display 
Former-commit-id: 59ee7e42ca522cdcdbec7b07dbee4d3249213aab
 2019-04-17 23:06:21 +02:00
Pfauenauge90
a23e71a258 Rebase and Login Error 
Former-commit-id: 226fca5f37aa9c94fdd3e1a030c7de4703deba4c
 2019-04-17 23:06:21 +02:00
Pfauenauge90
2c5bfaa118 Error Window 
Former-commit-id: 0f4f92c39632f8cbd1750036d19eb1cfbf39f374
 2019-04-17 23:06:21 +02:00
timokoesters
ec16153164 Rename animationHistory to animation_history 
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
 2019-04-17 22:32:36 +02:00
timokoesters
b9607ef405 Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02:00
Joshua Barretto
1e4d02a5d8 Merge branch 'singleplayer' into 'master' 
Start Singleplayer server when singleplayer is selected

See merge request veloren/veloren!39

Former-commit-id: ac8c9f3f52871d89847fdecc74ac58bb593e762b
 2019-04-17 15:31:02 +00:00
Louis Pearson
a768971c6c Stop singleplayer thread whenever a session is left 
Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550
 2019-04-17 09:22:26 -06:00
Joshua Barretto
a87cdc1993 Changed default server address to 'server.veloren.net' 
Former-commit-id: 660083d3d7ca341428b8c3cd8d54dd3ac1f453ab
 2019-04-17 16:08:25 +01:00
Louis Pearson
76adbec3bb Add method to drop singleplayer thread 
Former-commit-id: b62a90728d4e83a005687538e134cee427491052
 2019-04-17 08:57:23 -06:00
Louis Pearson
7ec6e09332 Add basic singleplayer support 
Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1
 2019-04-17 07:41:34 -06:00
Imbris
3658a50685 Fix most spacing issues in chat 
Former-commit-id: 90a4080123b77630888967423b030153b9f81709
 2019-04-16 20:17:15 -04:00
Joshua Barretto
db527e64df Improved camera attributes and focus 
Former-commit-id: 223f85c884c063c5cbb7d6c9f9f5c4a8c62a7ffd
 2019-04-16 20:22:04 +01:00
timokoesters
8cc4399d18 Handle bone orientation and scale as well 
Former-commit-id: 80c80342ae3458b98c2520359bc0a0705b22dbc1
 2019-04-16 20:55:04 +02:00
timokoesters
713b59aeff Implement animation smoothing 
Former-commit-id: e89caca7d273934533c57c4324365a126d02e5df
 2019-04-16 20:26:24 +02:00
Louis Pearson
780e034674 Add better defaults support 
Former-commit-id: fa77acae3ee2b99cbf37a8fec71ee1913e889d82
 2019-04-16 11:41:39 -06:00
Louis Pearson
515039c62d Add auto generation of settings.toml if it does not already exist 
Former-commit-id: 941b81a8faeff89096256666c56ae472d9b569d5
 2019-04-16 10:06:23 -06:00
Louis Pearson
9592eb67c5 Add default keybindings 
Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
 2019-04-16 08:57:31 -06:00
Louis Pearson
55f3f0857f Add support for keybinding 
Former-commit-id: 1edbf3bebb8d1651a1b912cedcd3513dfb287fa1
 2019-04-16 08:57:31 -06:00
Piotr
ddb32eec30 Animation States 
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
 2019-04-16 14:29:44 +00:00
Joshua Barretto
a41b642570 Merge branch 'master' into 'master' 
Solve physics fighting problem

See merge request veloren/veloren!27

Former-commit-id: 010af4fb0f31b854dd1f8c42f6a65711cc9d84cd
 2019-04-15 16:43:41 +00:00
Imbris
571e319a62 make zooming always work if cursor is grabbed 
Former-commit-id: e07bb0746fa117f045d62919a4ca55a8eb0c6cf7
 2019-04-14 20:53:42 -04:00
Imbris
e755afce91 simplify chat keybaord capture 
Former-commit-id: 3c5c5c241fe0c0d97059c7b87c0c08104eb5c5fe
 2019-04-14 20:45:54 -04:00
Imbris
b7439b9107 ignore tx.send() result 
Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff
 2019-04-14 20:23:26 -04:00
Imbris
3812e0b58f stop zooming when scrolling chat 
Former-commit-id: a94f26e30029ef4cff1807c2347cbd2490c4afd7
 2019-04-14 20:15:12 -04:00
Joshua Barretto
c98d841890 Fixed physics sync 
Former-commit-id: 86d3af46c69f6566f4cab8d93ecf27636a9563cf
 2019-04-15 00:29:28 +01:00
Imbris
e377e8ff09 Add asynchronus client creation to Voxygen 
Former-commit-id: 0c11cc8a7ddc7b425e036c2357c233e376002c6e
 2019-04-14 23:28:29 +00:00
Joshua Barretto
f69ad40bd5 Fixed aspect on scene start, added more information to post errors 
Former-commit-id: 0daff37cbcad6f906962216ce923a005da6861c1
 2019-04-14 16:05:51 +01:00
Joshua Barretto
51f7d85508 Ensured that Client is Send 
Former-commit-id: abadfc7d1d86110ed442cdb5a2e639c163c96e04
 2019-04-14 14:23:43 +01:00
Joshua Barretto
824fb8a6c0 Fixed 1-frame animation bug 
Former-commit-id: fc591de5026e35cab1ef72ce250b19cbe2fcec0e
 2019-04-14 14:23:43 +01:00
Joshua Barretto
19e6930e67 Named Voxygen correctly 
Former-commit-id: a4f4e5703103e3f93da87bd515e80eb430eef52e
 2019-04-14 14:23:43 +01:00
Joshua Barretto
f4260706e6 Updated package versions 
Former-commit-id: bb0d1efd718ddef598fbb894498a43ad014a11c0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
3d9f8105e6 Started work on server-side chunks 
Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28
 2019-04-14 14:23:43 +01:00
Joshua Barretto
11630877e3 Moved figure rendering to a better place 
Former-commit-id: 51ca948e131c20151c97f9f8454c80c47a9154b0
 2019-04-14 14:23:43 +01:00
Joshua Barretto
62b91eb01b Integrated Sphynx 
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
 2019-04-14 14:23:43 +01:00
Pfauenauge90
8e69464588 Charselection Help Text 
Former-commit-id: 463a3aad1c8d0b8e98f0b5464103016c401d1d32
 2019-04-14 15:19:12 +02:00
Pfauenauge90
6b32d2bcb6 Updated race descriptions 
Former-commit-id: 2384a6f01a27000d39ba9e399468e1d7897b6b1f
 2019-04-14 15:19:12 +02:00
Pfauenauge90
51047236a0 chat changes 
Former-commit-id: c2a5ae0d34e1e93d8f6feb4a9e5cf69045db7275
 2019-04-14 15:19:12 +02:00
Pfauenauge90
bc420e41d6 help window, chat padding, font colours 
Former-commit-id: 8d42f8e05cd11f669e4e56873e31a8530272b3b2
 2019-04-14 15:19:11 +02:00
Pfauenauge90
a45e9e708c Help window, chat padding, font colours 
Former-commit-id: 18643504fd8e94ed991c137e9ea91dfa094686c7
 2019-04-14 15:17:38 +02:00
Pfauenauge90
822901b08b Chat padding, Font Colours to white, Help Window 
Former-commit-id: d36a878971f92fbf16eb44d3102b4328832e6563
 2019-04-14 15:15:42 +02:00
Imbris
2e14f7d559 update colors to match gamma scaling 
Former-commit-id: 461b5cf751d329a219250bc8090b016f54f3ec96
 2019-04-14 15:12:29 +02:00
Imbris
07a4cb268e new bones, update asset repo 
Former-commit-id: 4dbed55af4a9532051025a797349e77bd937dff2
 2019-04-14 15:05:43 +02:00
Imbris
fb83c836a1 make to_server() blocking, post fixes & cleanup, use server address 
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
 2019-04-14 15:04:44 +02:00
Imbris
5e576f048e use modified version of conrod 
Former-commit-id: 6a4697d02e18732dbf9ad679bac761c5a73457fa
 2019-04-13 10:52:48 -04:00
Imbris
5404cc548a remove hidden chat scrollbar 
Former-commit-id: fc534a2d71bbdbf2989b9772c7d5a64aa44f1ed9
 2019-04-13 10:52:48 -04:00
Marcel Märtens
251cccffe5 add simple interface to get assets from various locations 
Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a
 2019-04-13 03:40:59 +02:00
Yeedo
b88dc1bbde Updated mouse wheel zooming to use WindowEvent 
Former-commit-id: 700fa66382f3a8e0fd738a8ce14fb44bc211b5fe
 2019-04-11 23:12:42 +01:00
Pfauenauge90
3f2a938735 Key Command Changes, Char Window 
Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b
 2019-04-09 18:30:13 +02:00
Pfauenauge
4607ad612d Minor changes to font sizes 
Former-commit-id: d998532c9b858cea5704b307b8bc6ef0ef3c75d7
 2019-04-07 00:05:56 +02:00
Pfauenauge
8ecb849970 Char Window, Mana, Health, Exp-Bar 
Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128
 2019-04-06 00:36:04 +02:00
Pfauenauge90
c1af42522d char window additions 
Former-commit-id: 63dfbd68594fc7ecb6e9caf610c9c5165c9e88d4
 2019-04-04 19:35:33 +02:00
Pfauenauge90
6ebff7ce2c Merged with UI-Input 
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
 2019-04-04 16:45:57 +02:00
Pfauenauge90
6d6c585808 char window 
Former-commit-id: e3a6e5aadf20f60e6db237d63382cd55cd8211b9
 2019-04-04 15:51:36 +02:00
Pfauenauge90
b29343490f disabled chat arrows 
Former-commit-id: 5a5ea8e7101c16ae780af1fb9b3e6e4ba59a98b4
 2019-04-02 16:25:14 +02:00
Pfauenauge90
a4f96b4642 Inventory 
Former-commit-id: 01df86c3a652e4a36d37edfdcc90dc350c1e5b04
 2019-04-02 06:54:27 +02:00
Pfauenauge90
8378663cca Added controls to open menus 
Former-commit-id: cfa167aef56e12def40a083effe37d1b0216c00f
 2019-04-02 03:05:18 +02:00
Pfauenauge90
87a41a30a7 Bag Additions 
Former-commit-id: 62e02ad0d67916b8ee12674e564931e92c08ee95
 2019-04-02 01:26:42 +02:00
Pfauenauge90
0ce80ec9ad Inventory Window 
Former-commit-id: 4f8c6fbef1dd4afea587ece7187a17648ff3e301
 2019-04-01 22:31:29 +02:00
Imbris
ca454d0c8b make chat arrow only appear when scrolled up and enable it 
Former-commit-id: 72bf830acea7fa273d90b996ce7bcf88f215d1bf
 2019-03-29 22:59:31 -04:00
Imbris
820967838d enable chat with enter while cursor is captured 
Former-commit-id: a6b54d6325135462e04c2cec1703f45641c389f2
 2019-03-29 22:15:27 -04:00
Pfauenauge
702e8321b1 Added chat arrow 
Former-commit-id: 387bf73af19e23678a9048ab3870665c88ff47b9
 2019-03-30 01:11:10 +01:00
Pfauenauge
51e41ade07 Filepath fixes 
Former-commit-id: b3134806904d8fb0b7fb1ee4dc05ea96af1474e8
 2019-03-29 22:36:15 +01:00
Pfauenauge
99e364dc54 Asset Path Changes 
Former-commit-id: 8d31707d0e5c6db8328e0a389296f4f1a7f7cd69
 2019-03-29 21:08:14 +01:00
Imbris
cf9780e1ec remove title screen 
Former-commit-id: 53b269b28ac38290c50bcf38c266534b673dacd2
 2019-03-29 03:34:33 -04:00
Pfauenauge90
07f7e89ca7 removed assets from folder, added race desc 
Former-commit-id: fd11261bfbf3e5986775dc6b818fced9df6dd09b
 2019-03-28 23:07:10 -04:00
Pfauenauge90
60df735e3b accessories tab 
Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd
 2019-03-28 23:03:39 -04:00
Imbris
93897f904a fix bug with ui using old win size when switching to previous playstate 
Former-commit-id: b6c166882c978806af65f70496626fad33081975
 2019-03-28 00:42:04 -04:00
Imbris
bee273fc9e replace mmap button bools with an enum 
Former-commit-id: e7c7e17b3473d250e2fd23f6a75f3012297c7bd5
 2019-03-28 00:00:51 -04:00
Imbris
589110c2f5 modify chat visually, replace whitney with opensans, add to charcreation 
Former-commit-id: 50ec03271ae5e9e7995144fd2d0701f62a68e5f7
 2019-03-27 22:25:08 -04:00
Imbris
f753a64018 fix inconsistent text cursor height 
Former-commit-id: da08c7ef8679a6f4626bf5fec0ec66ab5da9cad0
 2019-03-24 22:15:29 -04:00
Imbris
283a5a2a7d add more elements to character creation screen 
Former-commit-id: 0cac8ca7a1f8e836a086250d200d5dca6191e555
 2019-03-22 22:22:05 -04:00
Imbris
2cdfde905d add character selection screen 
Former-commit-id: 457af87f4046a6247530e516af15fd7ef5ea04cb
 2019-03-22 02:29:09 -04:00
Imbris
aef3179448 remove chat message echoing by ui 
Former-commit-id: f97358f3bdb39048ed705abff17cbd4c949dbaf3
 2019-03-21 23:55:52 -04:00
Imbris
fdb0512069 make hud consume key events when typing in the chat box 
Former-commit-id: bb1b06827d3d298f68ae6d17f534c7bc31065306
 2019-03-21 23:55:42 -04:00
Imbris
b0009f9e14 apply scizzor from conrod, replace [T; 4] with vek::Aabr<T> for ui rects 
Former-commit-id: 4eaa8832ddda40882cc45c3a08c5de2fa5e68682
 2019-03-20 01:26:24 -04:00
Imbris
d82adb7e71 add char selection playstate 
Former-commit-id: 1d97cf90686532cb354d12f79a129a0a9c7fde98
 2019-03-20 01:26:24 -04:00
Imbris
03b20fa1bd connect chat box to network 
Former-commit-id: 581c724ee31564c7473120d5431ceb2182afb207
 2019-03-20 01:26:22 -04:00
Imbris
9aece17286 fix rebase error 
Former-commit-id: 9d3866f860c80468c5087d8f8dbffd7c8a8441f9
 2019-03-20 01:24:28 -04:00
Imbris
e54a1ba369 add ToggleButton widg, make hud return event vec, simplify some widgets 
Former-commit-id: aa3fe6de4944f912cb44fa6ecebe928cc849c52c
 2019-03-20 01:24:27 -04:00
Imbris
f837492284 add chat box, minimap buttons, ui windows, etc 
Former-commit-id: 09d3e20b917a9ac9ef6333ee9bb913d01a7fb52c
 2019-03-20 01:24:27 -04:00
Imbris
16ed207437 add main menu and more hud elements 
Former-commit-id: 29557c100e2b82597ced04df09f41c4f132ffc5e
 2019-03-20 01:24:25 -04:00
Imbris
3d5c11855a add ui scaling 
Former-commit-id: 7c6c3c8fc7d16c4a2cd0e5eff36248d6009652d2
 2019-03-20 01:24:23 -04:00
Imberflur
e35e2fffc1 add support for drawing portions of images in the ui 
Former-commit-id: 98a939fcdde6ed202c884cdaae56326e3f90d61d
 2019-03-20 01:24:23 -04:00
Imberflur
a20517684a remove variable aliasing in test_hud 
Former-commit-id: d84d517197643650e8f6dce18e27e67ffd06163d
 2019-03-20 01:24:23 -04:00
Imberflur
1cce7e1096 use new ui images for bag, fix flickering of bag 
Former-commit-id: ac93916d648ad14cca142ac68e39dcc940bfe5f7
 2019-03-20 01:24:22 -04:00
Imberflur
71da6e6588 rewrite/address/remove some ui TODOs and comments 
Former-commit-id: bbcbb0ee6e8d4049ad98a5cea6274ce9ef0027e0
 2019-03-20 01:24:22 -04:00
Imberflur
1962320f7e add ui text rendering 
Former-commit-id: 5b9b809c660a2fdd178688bdaa63d16128debe08
 2019-03-20 01:24:21 -04:00
Imberflur
e68fa6b579 separate implementation code from generic UI code 
Former-commit-id: 9c77ca03c4d834188ef863645ab2c26f31763b6c
 2019-03-20 01:24:21 -04:00
Imberflur
3f052cae1c setup ui image rendering, started creating test ui with iteraction 
Former-commit-id: 73235ad6b25ab160e9cde3ad2513d4dd32660161
 2019-03-20 01:24:20 -04:00
Imberflur
d685706c9b remove old ui files 
Former-commit-id: 82979b9df64ffa120f385e625648e04113c6a917
 2019-03-20 01:24:19 -04:00
Imberflur
628a91af00 move conrod ui rendering and setup into ui::Ui 
Former-commit-id: 1dc43fb7d73671d0b798238fecfcbf8d07ffbfcb
 2019-03-20 01:24:18 -04:00
Imberflur
1df2cf2804 starting testing of conrod based ui 
Former-commit-id: d417d2372ed95ae82e8d3766c558fb3498056987
 2019-03-20 01:24:18 -04:00
Joshua Barretto
3214164070 Working with upstream 
Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6
 2019-03-19 14:12:42 +00:00
Joshua Barretto
e2f75c118e Figure changes 
Former-commit-id: c4cfb35c950f938cb8c7f8169518333db6364ad2
 2019-03-19 11:35:38 +00:00
Joshua Barretto
664f28a972 Patched in netcode refactor 
Former-commit-id: 34a3b9a95129edad6dc8280d9a3cb41581d4d386
 2019-03-19 11:35:38 +00:00
Joshua Barretto
a8b0039898 Added networked entity updates, player entity allocation 
Former-commit-id: b81d6e38a74f846d64c092d1422dc402f369100c
 2019-03-19 11:35:38 +00:00
Joshua Barretto
2fffe21bc7 Added client localhost connection 
Former-commit-id: d4dec70ef3ecad8f40196b87b0f5c8b55c51c44a
 2019-03-04 19:58:58 +00:00
Joshua Barretto
dbbcc1e80e Added basic networked communications, chat communication 
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
 2019-03-04 19:58:58 +00:00
jshipsey
187b7939d7 adding test assets 
Former-commit-id: e6cb2b75321c359ad6fdbf8e4ee1dc90c359f645
 2019-03-04 19:58:58 +00:00
jshipsey
966fcc1709 quadruped testing 
Former-commit-id: eb863aa33671032799b70833619ebb3d4d77c58a
 2019-03-04 19:58:58 +00:00
jshipsey
608423f09f adding test assets 
Former-commit-id: fc56d4d1bc9f9ea9b40dc42f600e164d11e2eb40
 2019-03-02 18:05:21 -05:00
jshipsey
7e8781024b quadruped testing 
Former-commit-id: 50340b74d803ec84b6af43ae6d787d72bf2c2d57
 2019-03-02 17:41:34 -05:00
Imbris
33b8922aa4 move/name velocity constant, rename move_vec, simplify cam rotate_by() 
Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b
 2019-03-02 14:43:51 -05:00
Imberflur
6f5f80f749 add player movement with basic physics ecs system 
Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007
 2019-03-01 22:48:30 -05:00
Joshua Barretto
c16a257ae3 Added server-cli, UI tests 
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
 2019-01-30 12:11:34 +00:00
Joshua Barretto
a1617e7b5c Added window resize handling 2019-01-23 22:39:31 +00:00
Joshua Barretto
8a37662cf0 Cleaned up codebase, added cursor grab toggle 2019-01-23 22:21:47 +00:00
Joshua Barretto
248577bdef Added test terrain loading and meshing 2019-01-23 20:01:58 +00:00
Joshua Barretto
41b6672743 Added Terrain type to scene 2019-01-15 15:13:11 +00:00
Joshua Barretto
bd561dd1aa Added terrain pipeline 2019-01-14 23:13:58 +00:00
Joshua Barretto
ae4f1ae2ea Added vox trait 2019-01-14 18:49:53 +00:00
Joshua Barretto
c5a506dad2 Moved client to session type 2019-01-14 15:47:57 +00:00
Joshua Barretto
0a122431db Restructured animation code 2019-01-14 14:40:22 +00:00
Joshua Barretto
86e70751e0 Moved to Skeleton and Animation traits 2019-01-14 14:18:58 +00:00
Joshua Barretto
8184bc6fc0 Added figures, segments, test .vox files, basic animation test 2019-01-13 20:53:55 +00:00
Joshua Barretto
b37a6b67f9 Added time of day, tick time, basic skybox shader and client to voxygen 2019-01-12 15:57:19 +00:00
Joshua Barretto
96d01a9293 Made it bloo 2019-01-12 14:01:01 +00:00
Joshua Barretto
979f47420d Added camera panning and cursor trapping 2019-01-12 13:56:34 +00:00
Joshua Barretto
45d5a0a396 Added cursor trapping, more documentation 2019-01-12 01:14:58 +00:00
Joshua Barretto
c9d877de7a Added session, documented, improved structure 2019-01-11 23:18:34 +00:00
Joshua Barretto
d559d633ab Added pipeline components 2019-01-11 20:14:37 +00:00
Joshua Barretto
d8c87984d5 Switch back to old gfx backend 2019-01-11 17:30:13 +00:00
Joshua Barretto
5d6ec363a5 Added triangle test 2019-01-07 21:10:31 +00:00
Joshua Barretto
6f358fc762 Added RenderCtx 2019-01-02 22:08:13 +00:00
Joshua Barretto
7a29286053 Started adding voxygen and windowing code 2019-01-02 21:25:01 +00:00