lp:~der-treba/stratagus/stratagus

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:stratagus

Pali: Needs Fixing on 2013-05-01

treba: Pending requested 2013-04-21

Diff: 360 lines (+188/-85)

5 files modified

src/game/game.cpp (+1/-0)
src/include/video.h (+2/-0)
src/stratagus/stratagus.cpp (+3/-0)
src/video/sdl.cpp (+108/-85)
src/video/video.cpp (+74/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8698. By treba on 2013-04-23

- removed declarations of lua bindings from video.h
- replaced resolution calls with the following two:
 GetCurrentResolution() -- array with width and height of current resolution. if called at startup, the optimal resolution is given
 GetAvailableResolutions() -- two dimensional array with available resolutions. in window mode gives nil

8697. By treba on 2013-04-20

added lua queries to determine the default resolution of a screen aswell as queries to for supported resolutions.

GetVideoResolutionsNr() - get number of available resolutions
GetResolutionsWidth(i) - get width of resolution i
GetResolutionsHeight(i) - see above
GetCurrentResolutionsWidth() - get current resolution width. if queried on startup, it's the default/optimal resolution
GetCurrentResolutionsHeight() - see above

8696. By Joris Dauphin on 2013-04-20

Remove unused growingTree.
make more CTileset member private

8695. By Joris Dauphin on 2013-04-19

Fix typo (case5) in QuadFromTile.
Fix CTileset::getTileNumber.

8694. By Joris Dauphin on 2013-04-19

Add CTileset::getTileNumber and fillSolidTiles
cleanup editloop.cpp
Use loop.

8693. By Joris Dauphin on 2013-04-18

Add CTileset::findTileIndex{,ByTile}.
Redisplay terrain names in editor in debug.

8692. By Joris Dauphin on 2013-04-18

Clean up tileset.

8691. By Joris Dauphin on 2013-04-17

Clean up tileset.

8690. By Joris Dauphin on 2013-04-17

Replace some raw arrays by std::vector.

8689. By Joris Dauphin on 2013-04-16

Clean up tileset.