Forest Anderson
c053155d67
Merge branch 'pfau-controls-and-visuals' into 'master'
...
Settings: Controls content added, new Button visuals and Input Frame
See merge request veloren/veloren!102
Former-commit-id: abbdf95c4cd03d42df9c846822e1116ae535f6bf
2019-05-03 13:56:27 +00: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
f346acfb04
asset update
...
Former-commit-id: 58b9a630dbf5d1b584d0df01c0ff5ca407a2f762
2019-05-03 13:48:56 +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
116e13534c
control window
...
Former-commit-id: 478826a92ed7c86dfa926cc82da0afde96d44b63
2019-05-03 13:48:54 +02:00
Pfauenauge90
b3bac9a46e
Controls Window
...
Former-commit-id: 785b039f9241da2f0ba66e7e2db2a14a9b8b54c9
2019-05-03 13:48:54 +02:00
Pfauenauge90
9869e11d3a
asset update
...
Former-commit-id: 79d7f652f2ae7a150b66cc0612fb6a19b1bfcc79
2019-05-03 13:48:53 +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
dad6e6c2f8
asset update
...
Former-commit-id: 41f7c22d846a50791899519ceea63bdd41ad4c57
2019-05-03 13:25:58 +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
485108afd4
control window
...
Former-commit-id: 2a777c24dc113a3a04beafc63c427fba5324b640
2019-05-02 20:07:13 +02:00
Pfauenauge90
0dbe9c7846
Controls Window
...
Former-commit-id: e6e83aaa0eb5606b59581c3005b30e969123bb56
2019-05-02 20:06:23 +02:00
Pfauenauge90
f1c9d619db
asset update
...
Former-commit-id: 7c0933fb27a83849461e3cbd181a0959344e0871
2019-05-02 17:55:12 +02:00
Pfauenauge90
6a1e3e1b22
asset update
...
Former-commit-id: 687c9275806bf150c9c26d02035a9f0216faf121
2019-05-02 17:28:18 +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
a3cb1c26d7
Asset Update
...
Former-commit-id: 3ef4a1d4cf4d4e29f6d8d20a30d981864e4278eb
2019-05-01 23:35:08 +02:00
Pfauenauge
bb1267b86d
controls window
...
Former-commit-id: 2bf1970e5e11117d8192030c1846ec76310f64ca
2019-05-01 23:21:21 +02:00
Pfauenauge
8c35f06ed7
Controls Window Contents
...
Former-commit-id: f11a9b4da250ba9bd095220efc9e8fc97d32c983
2019-05-01 23:20:31 +02:00
Yeedo
95f689c875
Merge branch 'master' of gitlab.com:veloren/veloren
...
Former-commit-id: 83dc38d485fbe06bcef86849e14f0b6755b05219
2019-05-01 20:49:06 +01:00
Forest Anderson
042d5bb571
Merge branch 'dispatcher' into 'master'
...
Store a thread pool in State for the Dispatcher
Closes #63
See merge request veloren/veloren!98
Former-commit-id: 948c18e3c902901505d8f7136f151971d47a7072
2019-05-01 19:28:10 +00:00
Imbris
7a192a9466
add nightly feature back for specs -> shred
...
Former-commit-id: b483f75c10cc47faa66ab8063f7747e654068634
2019-05-01 14:46:06 -04:00
Imbris
f0b0b83cc8
Store thread pool in State, Remove unnecessary dep
...
Former-commit-id: cbce09915267f264801c174817b97ed3528715fd
2019-05-01 14:10:43 -04:00
Joshua Barretto
fddd7863bd
Merge branch 'fix_submodule' into 'master'
...
Submodule Fix
See merge request veloren/veloren!97
Former-commit-id: 8a59f38324b959a159180e3bcfa90135a0b1ac0a
2019-05-01 15:50:51 +00:00
Pfauenauge
1ba1eb20c7
Controls Window Text
...
Former-commit-id: 2e479f29af73fd36b5cb8e6f34b8d2d4265dd100
2019-05-01 15:50:41 +02:00
Imbris
93dcf434b1
point to latest asset commit
...
Former-commit-id: 844f4c00d09b19ae3870565bb88fe184c6e8cccf
2019-05-01 08:59:23 -04:00
Pfauenauge
777f4066d4
changed char head and offset
...
Former-commit-id: 6e9ca7249a33504bc0b7cf8f5b5591ead0399151
2019-05-01 14:11:55 +02:00
Pfauenauge
25932ad02b
Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren
...
Former-commit-id: 88e89d15e791aefc013e7500fe692d5cb3601fb1
2019-04-30 13:49:32 +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
ccfdef0563
Merge branch 'master' of gitlab.com:veloren/veloren
...
Former-commit-id: 80aff10654c5182ffae030fc18c3665d797abb75
2019-04-29 22:38:38 +01:00
