Forgon uploaded file design_pause_label.png (446.8 KiB)

new label "PAUSED" for design screen

Forgon uploaded file design_console_messages.png (438.3 KiB)

console messages should not be displayed in the design screen

Forgon uploaded file multiplayer_intelligence_screen_old.png (458.0 KiB)

old intelligence screen with multiplayer widget and empty blue box

Forgon uploaded file multiplayer_intelligence_screen_new.png (466.4 KiB)

new intelligence screen with multiplayer widget and without empty blue box

Forgon uploaded file purge_power_bar_and_reticule_routines_from_mission_screen.patch (0.7 KiB)

patch file created with git format-patch (part 1/18)

Forgon uploaded file purge_power_bar_and_reticule_routines_from_loadsave_screen.patch (0.7 KiB)

patch file created with git format-patch (part 2/18)

Forgon uploaded file purge_power_bar_routine_for_three_screens.patch (0.8 KiB)

patch file created with git format-patch (part 3/18)

Forgon uploaded file purge_power_bar_routine_from_design_screen.patch (0.7 KiB)

patch file created with git format-patch (part 4/18)

Forgon uploaded file purge_power_bar_routine_from_intelligence_screen.patch (0.7 KiB)

patch file created with git format-patch (part 5/18)

Forgon uploaded file purge_power_bar_routine_from_multiplayer_screen.patch (0.6 KiB)

patch file created with git format-patch (part 6/18)

Forgon uploaded file new_function_setup_world.patch (3.2 KiB)

patch file created with git format-patch (part 7/18)

Forgon uploaded file refactor_int_add_design.patch (1.9 KiB)

patch file created with git format-patch (part 8/18)

Forgon uploaded file refactor_int_remove_intel_map.patch (3.6 KiB)

patch file created with git format-patch (part 9/18)

Forgon uploaded file paused_label_for_design_screen.patch (8.3 KiB)

patch file created with git format-patch (part 10/18)

Forgon uploaded file no_console_messages_in_design_screen.patch (1.1 KiB)

patch file created with git format-patch (part 11/18)

Forgon uploaded file fixes_3663.patch (0.7 KiB)

patch file created with git format-patch (part 12/18)

Forgon uploaded file always_process_escape.patch (2.3 KiB)

patch file created with git format-patch (part 13/18)

Forgon uploaded file process_escape_and_function_keys.patch (1.6 KiB)

patch file created with git format-patch (part 14/18)

Forgon uploaded file enable_mouse_order_exit.patch (2.3 KiB)

patch file created with git format-patch (part 15/18)

Forgon uploaded file remove_intelligence_screen_routine.patch (0.7 KiB)

patch file created with git format-patch (part 16/18)

Forgon uploaded file refactor_int_add_message_form.patch (1.9 KiB)

patch file created with git format-patch (part 17/18)

Forgon uploaded file no_empty_blue_box_in_multiplayer_screen.patch (1.0 KiB)

patch file created with git format-patch (part 18/18)

Berserk Cyborg changed blocking which not transferred by tractive

Berserk Cyborg changed blockedby which not transferred by tractive

Berserk Cyborg commented

That is a lot of patches... I think it's best if you squash everything into one patch file rebased on the current master for easier reviewing and testing, seeing as everything is related.

Forgon uploaded file ticket_4636_all_18_commits.patch (24.1 KiB)

all parts of this patch series joint into one patch file -- for reviewers only! Do not apply this file to the master branch, it has been split into 18 parts for good reasons!

Forgon commented

Replying to Warzone2100/old-trac-import#4636 (comment:1):

That is a lot of patches... I think it's best if you squash everything into one patch file rebased on the current master for easier reviewing and testing, seeing as everything is related.

I carefully split my contributions into many parts because

• squashing commits is trivial, splitting a commit is often not
• it eases debugging
• it helps reviewers to understand the code

I uploaded all commits of this ticket joint in one file (view [raw-attachment:ticket_4636_all_18_commits.patch]), since you claim to prefer that. When this ticket is merged into the master branch, I still want it in 18 parts though, for reasons given in the above paragraph.

Forgon uploaded file multiplayer_intelligence_screen_old_2.png (458.6 KiB)

old intelligence screen with multiplayer widget and box below with weapon widgets

Forgon commented

The last commit of this patch series is based on a false assumption, i.e.

Outside of campaigns and tutorials, the intelligence screen displays a widget showing the status of all players alongside a blue box that is always empty

This is not true at all (see attached image [raw-attachment:multiplayer_intelligence_screen_old_2.png]). I still dislike this widget, though it's up to you whether it will be removed.

Forgon commented

Please remember to close #4654 when merging this ticket with the master branch.

Edit: Philosopher has objected and wants a new keyboard shortcut before that ticket is closed. Keep it.

Forgon changed _comment0 which not transferred by tractive

Forgon2100 <forgon2100@...> changed status from new to closed

Forgon2100 <forgon2100@...> changed owner from `` to Forgon2100 <forgon2100@gmail.com>

Forgon2100 <forgon2100@...> changed resolution from `` to fixed

Forgon changed _comment0 which not transferred by tractive

Forgon2100 <forgon2100@...> committed [1]

In Warzone2100/warzone2100@1a1ac6f:

#CommitTicketReference repository="" revision="1a1ac6fddfbbaa28bf3bb51fe62ab7453dec1d7e"
fixes #4636: ChangeLog correction: version 3.2.3 set default resolution to 1024x768, not 1024x720 (patch 1/2)

This commit references the wrong ticket. It applies to ticket #4736.

Forgon changed _comment0 which not transferred by tractive

Forgon2100 <forgon2100@...> committed [07]

In Warzone2100/warzone2100@07b6a0e:

#CommitTicketReference repository="" revision="07b6a0e31c416150c734ae6731e8eeb65365b2af"
fixes #4636: updated ChangeLog and renamed upcoming release from 3.2.4 to 3.3.0 (patch 2/2)

This commit references the wrong ticket. It applies to ticket #4736.

Forgon changed status from closed to reopened

Forgon changed resolution from fixed to ``

Forgon2100 <forgon2100@...> changed status from reopened to closed

Forgon2100 <forgon2100@...> changed resolution from `` to fixed

Forgon2100 <forgon2100@...> committed [6]

In Warzone2100/warzone2100@6b2d3d4:

#CommitTicketReference repository="" revision="6b2d3d45cfb57d05be23714992adc96de1d473e1"
Revert "fixes #4636: ChangeLog correction: version 3.2.3 set default resolution to 1024x768, not 1024x720 (patch 1/2)"

This reverts commit 1a1ac6fddfbbaa28bf3bb51fe62ab7453dec1d7e.

Forgon2100 <forgon2100@...> commented

In Warzone2100/warzone2100@a3168c7:

#CommitTicketReference repository="" revision="a3168c78f50066370fdbbe59c8d89612be5d7a40"
Revert "fixes #4636: updated ChangeLog and renamed upcoming release from 3.2.4 to 3.3.0 (patch 2/2)"

This reverts commit 07b6a0e31c416150c734ae6731e8eeb65365b2af.

Forgon changed status from closed to reopened

Forgon changed resolution from fixed to ``