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
517 Commits 151 Branches 18 Tags
Commit Graph

517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
cbeae203ba enable split out character window 
Former-commit-id: 9018814bd43960b9f0f5f8da03794df9c1eb803c
 2019-05-07 00:48:38 -04:00
Imbris
00bab4f82f remove poison err & Segment Asset impl, cleanup 
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
 2019-05-07 00:47:22 -04:00
Imbris
d71d289179 revamp asset system with a global singleton cache 
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
 2019-05-07 00:44:44 -04:00
timokoesters
88bf1aaa94 Change macro to make single struct 
Former-commit-id: ed7876d49fccdc7fb11317c13b59b2b4776daef9
 2019-05-07 00:33:06 -04:00
timokoesters
43f261cc83 Split character_window from hud/mod.rs 
Former-commit-id: 61a09a0ff322dc104d8f4a50eff654706daccde8
 2019-05-07 00:33:06 -04:00
timokoesters
a4eaae921f Fix asset imports 
Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328
 2019-05-07 00:30:09 -04:00
timokoesters
426cbd9c3c Start work on image_ids! and asset loading 
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
 2019-05-07 00:28:05 -04:00
Forest Anderson
82c5bed234 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
Joshua Barretto
13cce7d9e1 Merge branch 'post-process' into 'master' 
Add post-process pipeline

Closes #6

See merge request veloren/veloren!109

Former-commit-id: 0f7cfc0d3e18428bfe013f509af0b35c7a0c0aa8
 2019-05-06 12:10:26 +00:00
robojumper
7034419fd8 Slightly improve render target creation code 
Former-commit-id: 7ce92cce35834b006df9dacb4b4dd3e88d603b4e
 2019-05-06 14:06:07 +02:00
robojumper
35e1a43a38 Add post-process pipeline 
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
 2019-05-06 10:22:47 +02:00
robojumper
6d8f8bb654 Fix panic when minimizing, show backtraces when panicking 
Former-commit-id: 0ad401d81a2f7b4d0b766578238d2ab9259f80eb
 2019-05-05 20:42:44 +02:00
Forest Anderson
1e45a85fc2 Merge branch 'camera_improvements' into 'master' 
Smoother and terrain-aware camera

Closes #29 and #40

See merge request veloren/veloren!106

Former-commit-id: dc69df19ddd23dc503aebf701e6ae5fb6ad3feed
 2019-05-05 16:52:06 +00:00
robojumper
ea64600ad0 Run cargo fmt 
Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2
 2019-05-05 17:54:08 +02:00
robojumper
da2bb3ee51 Smoother and terrain-aware camera 
Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058
 2019-05-05 17:44:56 +02:00
Forest Anderson
1fa8b9bda8 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 Anderson
820ae17674 Merge branch 'add-lfs-asset-storage-system' into 'master' 
Added LFS config, removed modules

Closes #71

See merge request veloren/veloren!103

Former-commit-id: d8e2e0dc15a4d16d433f76c814ee02aeb4957e76
 2019-05-04 12:18:14 +00:00
Forest
3a99ab11f0 Add lfs files 
Former-commit-id: 6f7f0a40fa2fa1aee1f0276ec36466af80d15aa2
 2019-05-03 22:33:56 -04:00
Forest
64681b0392 Rm assets folder 
Former-commit-id: 884896ec20991bd293c6ad4b2150c23a98a823a7
 2019-05-03 22:32:22 -04:00
Forest Anderson
a5f0c058f9 Merge branch 'hotfix-esc-menu-buttons' into 'master' 
esc menu buttons visuals fix

See merge request veloren/veloren!105

Former-commit-id: de70d02bfb3ddafe06d640bd95d0a8e12ba5a95d
 2019-05-03 20:31:03 +00:00
Pfauenauge
bcd2022000 esc menu buttons visuals fix 
Former-commit-id: 742857d2f7bcf19a543890bf780d9b46fbca9e0e
 2019-05-03 22:25:23 +02:00
Forest
93191f7ce5 Remove submodule content from Gitlab-ci 
Former-commit-id: 86b7cbb8a9de7309defd8b8395eea5355961bd68
 2019-05-03 13:21:48 -04:00
Forest
5d68b61f20 Added LFS config, removed modules 
Former-commit-id: e0410b9d6cf3087c070c27ee99639c2e0ad95ca2
 2019-05-03 13:18:14 -04:00
Forest Anderson
e737e46c68 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
e02e5defe8 Ran clean code 
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
 2019-05-03 09:49:05 -04:00
Pfauenauge90
a7346878d1 deleted .gitignore in voxygen 
Former-commit-id: 8a3ede769bb5f74af836bb8975fa2e1b7281c716
 2019-05-03 15:17:53 +02:00
Pfauenauge
a0c4d4d999 Merge branch 'master' of https://gitlab.com/Pfauenauge/veloren 
Former-commit-id: 53ceca71f2d9a623ed994ad171058f488a42de77
 2019-05-03 13:49:37 +02:00
Pfauenauge
64a4a529cf asset update 
Former-commit-id: 58b9a630dbf5d1b584d0df01c0ff5ca407a2f762
 2019-05-03 13:48:56 +02:00
Pfauenauge
823d43f4c2 textbox visuals 
Former-commit-id: 4ae65bb009a1e461143b3dbf3f3e52344148fa7c
 2019-05-03 13:48:56 +02:00
Pfauenauge
0096947eae New Buttons and Input Frame 
Former-commit-id: cf05992eca9e6a75cedda8c873ef268e4bbaade8
 2019-05-03 13:48:55 +02:00
Pfauenauge90
9327add4fa control window 
Former-commit-id: 478826a92ed7c86dfa926cc82da0afde96d44b63
 2019-05-03 13:48:54 +02:00
Pfauenauge90
4466ef7526 Controls Window 
Former-commit-id: 785b039f9241da2f0ba66e7e2db2a14a9b8b54c9
 2019-05-03 13:48:54 +02:00
Pfauenauge90
49361aaa3b asset update 
Former-commit-id: 79d7f652f2ae7a150b66cc0612fb6a19b1bfcc79
 2019-05-03 13:48:53 +02:00
Pfauenauge
6e143065cc rebase 
Former-commit-id: 9c50e08fc7c4e8afa06f1f995ea1aebd386764c2
 2019-05-03 13:48:53 +02:00
Pfauenauge
aa25337663 rebase 
Former-commit-id: 214203f0d1ccb4e6457395e84b01e4d41467ecdb
 2019-05-03 13:48:52 +02:00
Pfauenauge
4ffde72097 Controls Window Contents 
Former-commit-id: f3317475e6a06c63ae0a648b29168474b9cf7544
 2019-05-03 13:48:26 +02:00
Pfauenauge
4898521e1b Controls Window Text 
Former-commit-id: 7f33117748c84644e9f6d7833b5ff44e035e7d76
 2019-05-03 13:48:25 +02:00
Pfauenauge
799f31a92d rebase 
Former-commit-id: f44030800c380054af2fef4532bbe93731f128e4
 2019-05-03 13:46:13 +02:00
Pfauenauge
8eb8a6701b settings window 
Former-commit-id: 3cefa7cc816206fd777f4a94a9b9a1689ed9aa03
 2019-05-03 13:46:12 +02:00
Pfauenauge
c97e446ba4 settings window 
Former-commit-id: a7a72ab6b1db411fcfcf3e03d1db4fce56370af3
 2019-05-03 13:46:12 +02:00
Pfauenauge
cfba22c005 Map Window, Settings Window 
Former-commit-id: 337f21010b8c4250a1eaa7ddfbe8d5f2ea1ac412
 2019-05-03 13:46:12 +02:00
Pfauenauge
dc2f32d434 settings window 
Former-commit-id: 41d85bdc41507bb8c26e5cda2db3135200db7be5
 2019-05-03 13:46:11 +02:00
Pfauenauge
8524285848 Map Window, Settings Window 
Former-commit-id: e01861cab1a42540a8b92db46debf95ede3978aa
 2019-05-03 13:46:11 +02:00
Pfauenauge
1c7fecf19e Map Window, Settings Window 
Former-commit-id: a94f57941d95cc271a5642e54af7e6ddf373cd18
 2019-05-03 13:40:48 +02:00
Pfauenauge
1f1cba30f4 asset update 
Former-commit-id: 41f7c22d846a50791899519ceea63bdd41ad4c57
 2019-05-03 13:25:58 +02:00
Pfauenauge
5bfd805c12 textbox visuals 
Former-commit-id: 8a929c46ebffea8c781817bd4535bf638e605fcb
 2019-05-03 13:21:44 +02:00
Pfauenauge
0ec907f636 New Buttons and Input Frame 
Former-commit-id: 140b27f9d41de04eb7018d1bbe65012af889a271
 2019-05-03 13:02:03 +02:00
Pfauenauge90
684fd21f67 control window 
Former-commit-id: 2a777c24dc113a3a04beafc63c427fba5324b640
 2019-05-02 20:07:13 +02:00
Pfauenauge90
5168749179 Controls Window 
Former-commit-id: e6e83aaa0eb5606b59581c3005b30e969123bb56
 2019-05-02 20:06:23 +02:00
Pfauenauge90
83561d7011 asset update 
Former-commit-id: 7c0933fb27a83849461e3cbd181a0959344e0871
 2019-05-02 17:55:12 +02:00