Created by toptopple and last modified
Get this branch:
bzr branch lp:~7010622-q-deactivatedaccount/widelands/topple-trainingsites-1
Only toptopple can upload to this branch. If you are toptopple please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

8157. By toptopple on 2016-10-29

improved time management in trainings-sites of all races

8156. By Bunnybot <bunnybot@raspberrypi> on 2016-10-28

Merged lp:~7010622-q/widelands/topple-atlantean-update-1:
Added sound playing for Atlantean Mill, Toolsmith, Smelting-Works. Improved time behaviour for Atlantean Toolsmith, Weaving-Mill.

8155. By GunChleoc on 2016-10-27

Ran update_authors.

8154. By Bunnybot <bunnybot@raspberrypi> on 2016-10-27

Merged lp:~widelands-dev/widelands/fix_name_collision.

8153. By Bunnybot <bunnybot@raspberrypi> on 2016-10-27

Merged lp:~7010622-q/widelands/topple-production-logic-3:
Production / sleep time improvements for Barbarian Inn + Big-Inn, Empire Inn and Atlantean Smokery.

8152. By SirVer on 2016-10-27

Unbreak MacOSX build.

8151. By Bunnybot <bunnybot@raspberrypi> on 2016-10-25

Merged lp:~widelands-dev/widelands/zoom_ui:
- Adds UI elements and keyboard shortcuts for zoom.
- Removes ctrl+0 from being a landmark shortcut. Only CTRL 1 - 9 now work.

8150. By Bunnybot <bunnybot@raspberrypi> on 2016-10-25

Merged lp:~widelands-dev/widelands/max_players:
Use playercolor masks for player editor/menu player icons. Increased max players to 16.

8149. By GunChleoc on 2016-10-25

Removed duplicate Widelands logo file.

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.

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.


No subscribers.