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

2268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
4747c09785 Merge branch 'imbris/tooltip-enhancements' into 'master' 
Add ImageFrame widget, make tooltips use this, align ui to the pixels properly

See merge request veloren/veloren!474
 2019-09-03 06:44:38 +00:00
Imbris
37f4ba3f84 Merge branch 'which_object_spawned' into 'master' 
Tells the user which object was spawned

See merge request veloren/veloren!368
 2019-09-02 05:34:28 +00:00
Christoffer Lantz
f0d96d84fe Added unwrap_or to obj_str_opt in handle_object in case we don't return early in the _ => match arm 2019-09-02 01:22:09 -04:00
Christoffer Lantz
8fd9f1614b Changed Spawned object: to Spawned: in handle_object 2019-09-02 01:22:09 -04:00
Christoffer Lantz
3771a26e88 Tells the user which object was spawned 2019-09-02 01:22:08 -04:00
Imbris
447ae91171 Merge branch 'chat_history' into 'master' 
Basic chat window history functionality, closes #186

Closes #186

See merge request veloren/veloren!331
 2019-09-02 05:12:23 +00:00
Imbris
4a4eab274a Don't add adjacent duplicates to the history 2019-09-02 01:07:16 -04:00
Imbris
e1e1dd9a28 Directly adjust chat input when traversing history 2019-09-02 00:54:44 -04:00
tommy
3f46987cc1 Added SetText event, rewritten based on comments 2019-09-01 23:43:06 -04:00
tommy
a3c8acf0e4 Basic chat window history functionality 2019-09-01 23:43:04 -04:00
Imbris
a9d0daee32 Remove copy-pasted comment 2019-09-01 16:41:40 -04:00
Imbris
9d0f114df7 Adjust tooltip layout by moving title to the right of images 2019-09-01 16:30:26 -04:00
Imbris
2e1427933d Tooltips: make title optional, improve spacing, make it simple to add similar tooltips to multiple widgets 2019-09-01 15:34:21 -04:00
Imbris
2c84be4306 Convert tooltips to use ImageFrame, add autosizing 2019-09-01 15:34:20 -04:00
Imbris
8a4dd94132 Pixel perfection, vox orientation, image rotation 2019-09-01 15:34:20 -04:00
Imbris
6ba734a944 Add ImageFrame widget 2019-09-01 15:34:19 -04:00
Joshua Barretto
277b4181cc Merge branch 'pfauenauge/more_sprites' into 'master' 
More sprites, ui fixes, lianas

See merge request veloren/veloren!472
 2019-09-01 19:04:03 +00:00
Monty Marz
8c39a4751b More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
Joshua Barretto
8d0c91dc94 Merge branch 'zesterer/worldgen' into 'master' 
Worldgen improvements

See merge request veloren/veloren!457
 2019-08-31 21:37:54 +00:00
Joshua Barretto
7f48155de8 Merge branch 'timo-animations' into 'master' 
Split animations

See merge request veloren/veloren!466
 2019-08-31 15:47:16 +00:00
Joshua Barretto
8c0346a190 Faster prng 2019-08-31 14:24:56 +01:00
Joshua Barretto
2bfb5d7c5e Fixed warnings 2019-08-31 11:44:52 +01:00
Joshua Barretto
022d303f00 Better town park generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
ba4d2cf5db Cleaned up wall generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
61c35855ba Better loading times 2019-08-31 11:44:52 +01:00
Joshua Barretto
c27d2e4c85 Sloped wall tops 2019-08-31 11:44:52 +01:00
Joshua Barretto
9e1a6662dc Removed extra foundations 2019-08-31 11:44:52 +01:00
Joshua Barretto
3ce4186143 Added city walls 2019-08-31 11:44:52 +01:00
Joshua Barretto
1b48699d1b Added wall module assets 2019-08-31 11:44:52 +01:00
Joshua Barretto
5a61d563d8 Added modular building generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
99c5171258 Added walls 2019-08-31 11:44:52 +01:00
Joshua Barretto
ca8c78eee6 Started work on modular buildings 2019-08-31 11:44:52 +01:00
Joshua Barretto
b5da843aec Improved mountain slopes and cliffs 2019-08-31 11:44:52 +01:00
Joshua Barretto
0a5805d423 Fixed terrain sprite transparency issue 2019-08-31 11:44:52 +01:00
Joshua Barretto
bc422e8075 Added module parts, made cell size smaller 2019-08-31 11:44:52 +01:00
Joshua Barretto
460c509a12 Fixed terrain sprite transparency layering 2019-08-31 11:44:52 +01:00
Joshua Barretto
71fcb70a51 Initial implementation of towns 2019-08-31 11:44:52 +01:00
Joshua Barretto
fb0f981bbc Added town road construction 2019-08-31 11:44:52 +01:00
Joshua Barretto
c70e87b4af Better warping 2019-08-31 11:44:52 +01:00
Joshua Barretto
b3cc006bce Switched to FastNoise 2019-08-31 11:44:52 +01:00
Joshua Barretto
42837268bc Added test generator 2019-08-31 11:44:52 +01:00
Joshua Barretto
5e78479b50 Added Generator trait, fixed ocean lighting 2019-08-31 11:44:52 +01:00
Joshua Barretto
44df366177 Removed dryness 2019-08-31 11:44:52 +01:00
Joshua Barretto
ac583f6d0a More interesting hills 2019-08-31 11:44:52 +01:00
timokoesters
9fd258eaf6 Remove old code 2019-08-31 09:00:20 +02:00
jshipsey
11d52a3972 removing to make gitlab compiler happy 2019-08-30 23:18:56 -04:00
jshipsey
26c877d8ac rebase 2019-08-30 23:01:29 -04:00
jshipsey
a1d23cdc14 combine character.action movement blocks 2019-08-30 22:51:46 -04:00
timokoesters
702a4afd46 Move std::mem::discriminant into new method 2019-08-30 22:51:46 -04:00
timokoesters
3430f290bb Remove warning 2019-08-30 22:51:46 -04:00