Created by SirVer on 2016-10-24 and last modified on 2016-10-25
Get this branch:
bzr branch lp:~widelands-dev/widelands/zoom_ui
Members of Widelands Developers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Widelands Developers

Recent revisions

8152. By SirVer on 2016-10-25

Fixed codecheck.

8151. By SirVer on 2016-10-25

Addressed reviewer comments.

8150. By SirVer on 2016-10-24

Add UI for resetting zoom and reorder buttons in the toolbar a bit.

8149. By SirVer on 2016-10-24

Implement hotkeys for zoom.

8148. By Bunnybot <bunnybot@raspberrypi> on 2016-10-24

Merged lp:~widelands-dev/widelands/zoom:
- Adds mouse wheel zoom to the MapView and adapt code for these changes.
  - Overlays (text & soldier icons) are drawn at integer scale only and not at all once scale is < 0.5.
  - This required to change all blitting to be sub-pixel - i.e. float - for the 'destination'.
- Adapted and simplified minimap rendering. It gained a feature too: Minimaps can be drawn using two modes :
    - the map scrolls and the view window stands still (the old one, stil used for in-game)
    - the view window scrolls and the map always looks like the minimap preview. This is now used in the editor.
- Renames Vector -> Vector3f, Point -> Vector2i, Pointf -> Vector2f, Rect -> Recti, FloatRect -> Rectf.
- Refactored object drawing to be simpler and slightly faster:
    - Never pass the field to be drawn to the draw routine.
    - Do not calculate if statics or census should be shown inside the draw routines of the objects, but outside.
    - Move 'owner' field to MapObject - it was duplicated on Bob, Immovable and PlayerImmovable.

Known issues that I will not fix in this branch:
Lua is not aware of zoom and uses zoomless calculations for its moving functions of the view. That means that if the player has zoomed in a scenario and the code wants to move to a certain field, the movement will be wrong. My plan is to remove the Lua functions and add a Animator class to the MapView that will do smooth animations over time in the next branch.

8147. By GunChleoc on 2016-10-24

Merged lp:~widelands-dev/widelands/buttons_constructor_cleanup

Replaced bools in Buttons with enum classes.

- Replaced 'permpressed' and 'flat' bools with enum class 'Style'.
- Replaced 'keep_image_size' with enum class 'ImageMode'.
- Removed 'bool const enabled = true' from constructors.
- Cleanup: Removed default parameters from constructor calls.

8146. By GunChleoc on 2016-10-24

Merged lp:~widelands-dev/widelands/notifications_shipwindow

Ships no longer know about their windows.
- Ships send a NoteShipWindow when window contents need to be changed / the window destroyed.
- Ship windows are now controlled by InteractiveGameBase.
- Made a bunch of functions in Ship const.

8145. By GunChleoc on 2016-10-24

Merged lp:~7010622-q/widelands/topple-sounds-4

Added new sound files for Barbarians Inn + Big-Inn, also for Empire Inn. Resampled sound file "ox_00.ogg" to 11025 Hz.

8144. By GunChleoc on 2016-10-24

Merged lp:~7010622-q/widelands/topple-production-logic-2

Modified LUA scripts for weapon- and armor smithies of all races to omit all wait times for complex products if their resource constraints are not met.

8143. By GunChleoc on 2016-10-24

Merged lp:~7010622-q/widelands/topple-production-logic-1

Modified the LUA scripts for all races' smelting_works so that the penalty production time for not supplying iron-ore or gold-ore are reduced to 10 seconds for each kind of resource per production run.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.