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
655 Commits 151 Branches 18 Tags 2.1 GiB
216819ca92
Commit Graph

55 Commits

Author SHA1 Message Date
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
Forest
3d14d791cf Cleaned code 
Former-commit-id: fd4ef550ff58f621a129901d142d80266fbbc534
 2019-05-12 15:57:39 -04:00
Joshua Barretto
d8f6025b68 Added rendering to character selection menu 
Former-commit-id: 82992904639ec2f468c70f43f3f8fe721a98de51
 2019-05-12 14:03:08 +01:00
Imbris
1948bc6392 fix & remove some unused uses, cursor toggle tweak 
Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f
 2019-05-11 10:59:48 -04: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
854271f321 Make use of image_ids! in char selection 
Former-commit-id: 98a11ae94aa299a8eb9e5e4d69cb99c7753f626b
 2019-05-08 20:40:34 +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
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
9d63253627 enable split out character window 
Former-commit-id: 9018814bd43960b9f0f5f8da03794df9c1eb803c
 2019-05-07 00:48:38 -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 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
Forest
75f8a638f7 Ran clean code 
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
 2019-05-03 09:49:05 -04:00
Pfauenauge
8240997f8c New Buttons and Input Frame 
Former-commit-id: cf05992eca9e6a75cedda8c873ef268e4bbaade8
 2019-05-03 13:48:55 +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
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
Yeedo
be9a399269 Redo settings -> help text, add supplement_events to Window. 
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
 2019-04-28 14:19:08 +01:00
timokoesters
a4d7d0d488 Implement StartSingleplayerState 
Former-commit-id: 982246096fe20c33631c1df3ce172c60b4f49bfe
 2019-04-27 22:57:55 +02:00
timokoesters
8314fc9439 Update UI 
Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217
 2019-04-24 21:55:22 +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
Imbris
7fa37e0c2a update asset loading to not use env 
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
 2019-04-20 18:02:48 -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
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
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
Louis Pearson
a768971c6c Stop singleplayer thread whenever a session is left 
Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550
 2019-04-17 09:22:26 -06: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
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
Imbris
fb83c836a1 make to_server() blocking, post fixes & cleanup, use server address 
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
 2019-04-14 15:04:44 +02: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
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
6ebff7ce2c Merged with UI-Input 
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
 2019-04-04 16:45:57 +02:00
Pfauenauge90
0ce80ec9ad Inventory Window 
Former-commit-id: 4f8c6fbef1dd4afea587ece7187a17648ff3e301
 2019-04-01 22:31:29 +02:00
Pfauenauge
51e41ade07 Filepath fixes 
Former-commit-id: b3134806904d8fb0b7fb1ee4dc05ea96af1474e8
 2019-03-29 22:36:15 +01: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