lp:~widelands-dev/widelands/fh1-multitexture
Created by
GunChleoc
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- Klaus Halfmann: Approve (code review, compile, test)
- kaputtnik (community): Approve (testing)
- GunChleoc: Needs Resubmitting
-
Diff: 3418 lines (+1178/-714)64 files modifiedsrc/editor/ui_menus/main_menu_map_options.cc (+1/-3)
src/editor/ui_menus/main_menu_random_map.cc (+1/-3)
src/editor/ui_menus/tool_set_terrain_options_menu.cc (+3/-3)
src/graphic/CMakeLists.txt (+0/-9)
src/graphic/animation.cc (+2/-1)
src/graphic/build_texture_atlas.cc (+0/-4)
src/graphic/font_handler1.cc (+49/-87)
src/graphic/font_handler1.h (+7/-13)
src/graphic/graphic.h (+4/-0)
src/graphic/minimap_renderer.cc (+2/-1)
src/graphic/playercolor.cc (+2/-2)
src/graphic/rendertarget.cc (+18/-6)
src/graphic/rendertarget.h (+8/-2)
src/graphic/text/CMakeLists.txt (+4/-0)
src/graphic/text/rendered_text.cc (+266/-0)
src/graphic/text/rendered_text.h (+174/-0)
src/graphic/text/rt_render.cc (+260/-132)
src/graphic/text/rt_render.h (+6/-7)
src/graphic/text/sdl_ttf_font.cc (+10/-9)
src/graphic/text/sdl_ttf_font.h (+5/-3)
src/graphic/text/test/CMakeLists.txt (+0/-1)
src/graphic/text/test/render.cc (+1/-1)
src/graphic/text/test/render_richtext.cc (+7/-2)
src/graphic/text/texture_cache.h (+39/-0)
src/graphic/text/transient_cache.h (+106/-29)
src/graphic/text_layout.cc (+16/-8)
src/graphic/text_layout.h (+9/-9)
src/graphic/texture.cc (+1/-1)
src/graphic/texture_atlas.cc (+2/-2)
src/graphic/texture_cache.cc (+0/-87)
src/graphic/wordwrap.cc (+10/-14)
src/graphic/wordwrap.h (+1/-1)
src/logic/editor_game_base.h (+2/-2)
src/logic/map_objects/map_object.cc (+11/-14)
src/network/network.h (+1/-1)
src/ui_basic/button.cc (+4/-7)
src/ui_basic/checkbox.cc (+8/-8)
src/ui_basic/checkbox.h (+1/-1)
src/ui_basic/editbox.cc (+10/-23)
src/ui_basic/listselect.cc (+10/-27)
src/ui_basic/messagebox.cc (+2/-2)
src/ui_basic/multilineeditbox.cc (+1/-1)
src/ui_basic/multilinetextarea.cc (+10/-23)
src/ui_basic/panel.cc (+7/-6)
src/ui_basic/panel.h (+3/-0)
src/ui_basic/progressbar.cc (+2/-3)
src/ui_basic/progresswindow.cc (+3/-5)
src/ui_basic/slider.cc (+6/-17)
src/ui_basic/table.cc (+18/-36)
src/ui_basic/tabpanel.cc (+17/-18)
src/ui_basic/tabpanel.h (+2/-4)
src/ui_basic/textarea.cc (+3/-6)
src/ui_basic/textarea.h (+1/-1)
src/ui_basic/window.cc (+2/-3)
src/ui_fsmenu/loadgame.cc (+1/-11)
src/wui/chatoverlay.cc (+5/-7)
src/wui/game_tips.cc (+9/-12)
src/wui/interactive_base.cc (+7/-10)
src/wui/interactive_base.h (+2/-2)
src/wui/interactive_gamebase.cc (+2/-4)
src/wui/mapdetails.cc (+1/-3)
src/wui/maptable.cc (+1/-1)
src/wui/plot_area.cc (+8/-11)
src/wui/waresdisplay.cc (+4/-5)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:widelands