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
3,196 Commits 151 Branches 18 Tags
Commit Graph

1281 Commits

Author SHA1 Message Date
timokoesters
819e0a200f Separate bag + buttons into own file 
Former-commit-id: 08e3b640adb85266ce7a739008fa26e1caee0ebf
 2019-05-07 01:15:49 -04:00
timokoesters
abd960aa48 Move skillbar into own file 
Former-commit-id: efab633e9b5c1ffc5071a556203490780615cde6
 2019-05-07 01:13:26 -04:00
timokoesters
08aa8875fd Separate settings and small windows and convert chat 
Former-commit-id: 847b0b8cf64b9d2de10b241d37bb7e21c126d314
 2019-05-07 01:12:56 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style 
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
 2019-05-07 01:08:27 -04:00
timokoesters
e8aa680aad Move map into it's own file 
Former-commit-id: 5a1b593e3d6b00dad3e3a4d462dfd48592537f64
 2019-05-07 01:00:48 -04:00
Imbris
8232ffbd33 add load_expect, change error reporting 
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
 2019-05-07 00:59:05 -04:00
Imbris
775b5e731e integrate blank graphic, remove Graphic from impls 
Former-commit-id: 190e03fe98591e8ab29d1202cf462cf6b51ede4d
 2019-05-07 00:57:42 -04:00
Imbris
2f9358f167 integrate timo's macro change 
Former-commit-id: a7657636efe4ce1db8c1714077262585e662c982
 2019-05-07 00:54:35 -04:00
Imbris
33fbcd1e93 formatting tweaks 
Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa
 2019-05-07 00:48:39 -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
b83d45c464 Change macro to make single struct 
Former-commit-id: ed7876d49fccdc7fb11317c13b59b2b4776daef9
 2019-05-07 00:33:06 -04:00
timokoesters
f028aa5a2c Split character_window from hud/mod.rs 
Former-commit-id: 61a09a0ff322dc104d8f4a50eff654706daccde8
 2019-05-07 00:33:06 -04:00
timokoesters
3f0f8b84d1 Fix asset imports 
Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328
 2019-05-07 00:30:09 -04:00
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
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
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
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
Monty Marz
c7b61d5626 New Settings Window and Map Window 
Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e
 2019-04-29 19:04:52 +00: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