lp:~widelands-dev/widelands/editor-grid

Branch merges

Propose for merging

Merged into lp:widelands at revision 9083

GunChleoc: Approve on 2019-04-25

Diff: 457 lines (+225/-6)

15 files modified

data/shaders/grid.fp (+5/-0)
data/shaders/grid.vp (+10/-0)
src/editor/editorinteractive.cc (+14/-1)
src/editor/editorinteractive.h (+3/-0)
src/graphic/CMakeLists.txt (+2/-0)
src/graphic/game_renderer.cc (+8/-0)
src/graphic/game_renderer.h (+1/-0)
src/graphic/gl/grid_program.cc (+89/-0)
src/graphic/gl/grid_program.h (+72/-0)
src/graphic/render_queue.cc (+10/-0)
src/graphic/render_queue.h (+3/-0)
src/wui/interactive_player.cc (+1/-1)
src/wui/interactive_spectator.cc (+1/-1)
src/wui/mapview.cc (+2/-1)
src/wui/mapview.h (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1529261: Create an overlay which shows a grid

Wishlist

Won't Fix

Link a bug report

Related blueprints

9024. By GunChleoc on 2019-04-25

Fix codecheck.

9023. By GunChleoc on 2019-04-25

Merged trunk.

9022. By Nordfriese on 2019-04-25

Merged trunk

9021. By Nordfriese on 2019-04-24

Merged trunk

9020. By Nordfriese on 2019-03-26

Merged master

9019. By Nordfriese on 2019-03-14

Changed grid colour

9018. By Nordfriese on 2019-03-13

Implemented a grid for the editor

9017. By Nordfriese on 2019-03-12

Add missing gridmarkers on borders

9016. By Nordfriese on 2019-03-11

New gridmarker

9015. By Nordfriese on 2019-03-11

typo fixed