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
604 Commits 151 Branches 18 Tags 2.1 GiB
1948bc6392
Commit Graph

69 Commits

Author SHA1 Message Date
Imbris
1948bc6392 fix & remove some unused uses, cursor toggle tweak 
Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f
 2019-05-11 10:59:48 -04:00
Joshua Barretto
54cc9e137a fmt 
Former-commit-id: b43b7192f7a2dd71da26182ca0c74449867381f3
 2019-05-09 18:58:16 +01:00
Joshua Barretto
df9b64355a Improved singleplayer error handling 
Former-commit-id: 0e33493bbb588ab0cd5278ec92b5859712446f4b
 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
2e3288cc29 Adjusted view distance and worldgen 
Former-commit-id: 01eeb0e48bcb018111c5f32b6252beb11bccd452
 2019-05-09 18:57:47 +01:00
timokoesters
2309ce599c Move font_ids! into mod.rs 
Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae
 2019-05-08 22:25:15 +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
Imbris
81c5a070c5 move conrod font out of common 
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
 2019-05-07 02:25:26 -04:00
Imbris
eb3d8310f8 rustfmt 
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
 2019-05-07 01:40:03 -04:00
Imbris
5c63f398ba replace typing field with function and cleanup 
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
 2019-05-07 01:27:24 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style 
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
 2019-05-07 01:08:27 -04:00
Imbris
775b5e731e integrate blank graphic, remove Graphic from impls 
Former-commit-id: 190e03fe98591e8ab29d1202cf462cf6b51ede4d
 2019-05-07 00:57:42 -04:00
Imbris
990b42a6b0 remove poison err & Segment Asset impl, cleanup 
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
 2019-05-07 00:47:22 -04:00
Imbris
1d5020634d revamp asset system with a global singleton cache 
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
 2019-05-07 00:44:44 -04:00
timokoesters
3f0f8b84d1 Fix asset imports 
Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328
 2019-05-07 00:30:09 -04:00
Forest
75f8a638f7 Ran clean code 
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
 2019-05-03 09:49:05 -04: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
Forest Anderson
993388e56a Ran fmt on codebase 
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
 2019-04-29 20:37:19 +00:00
timokoesters
a4d7d0d488 Implement StartSingleplayerState 
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
 2019-04-27 22:57:55 +02: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
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
8314fc9439 Update UI 
Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217
 2019-04-24 21:55:22 +02:00
timokoesters
e9027c6433 Split connecting from registering 
Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9
 2019-04-22 23:00:24 +02:00
timokoesters
802c484a38 Make character model more variable 
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
 2019-04-22 23:00:21 +02:00
Imbris
7fa37e0c2a update asset loading to not use env 
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
 2019-04-20 18:02:48 -04:00
Imbris
1143c58e37 add graphic cache clearing on resize 
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
 2019-04-19 21:35:12 -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
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
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
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
Piotr
ddb32eec30 Animation States 
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
 2019-04-16 14:29:44 +00:00
Imbris
b7439b9107 ignore tx.send() result 
Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff
 2019-04-14 20:23:26 -04:00
Imbris
e377e8ff09 Add asynchronus client creation to Voxygen 
Former-commit-id: 0c11cc8a7ddc7b425e036c2357c233e376002c6e
 2019-04-14 23:28:29 +00:00
Joshua Barretto
3d9f8105e6 Started work on server-side chunks 
Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28
 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