Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2 enhancements: dynamic info during pause and spacebar to center view #647

Closed
wants to merge 9 commits into from

Conversation

xuancong84
Copy link

a small change: when paused, the bottom panel will still display object info if mouse is moved over an object, previously it only displays the
tag "PAUSED" so that you cannot actual play the game when paused

added a new function: when there is an announcement such as "doctor required in GP office", the player can press to center view or press to scroll to view, so that he does not need to check one-by-one which GP office is missing a doctor when there are many GP offices

xuancong added 2 commits January 31, 2015 10:11
info if mouse is moved over an object, previously it only displays the
tag "PAUSED" so that you cannot actual play the game when paused
GP office", the player can press <tab> to center view or press
<spacebar> to scroll to view, so that he does not need to check
one-by-one which GP office is missing a doctor when there are many GP
offices
mouse leaves the window, and the player can scroll in arbitrary
direction according to which when the mouse leaves the window
@Lego3
Copy link
Contributor

Lego3 commented Jan 31, 2015

For the pause thing: The game is not meant to be playable while paused (a kind of difficulty mechanism). However, there is an advanced setting in the options menu that let's you tick "play while paused" to on. When on we should indeed show info in the dynamic bar.

I would suggest to create two pull requests, one for each change.

@xuancong84
Copy link
Author

I don't think that is efficient as I have made further commits. Maybe when @CycoOne merging my branch, you add an additional condition that the allow-edit-during-pause option must also be enabled as well.

Cheers,
Xuancong

On 31 Jan 2015, at 3:32 pm, Edvin notifications@github.com wrote:

For the pause thing: The game is not meant to be playable while paused (a kind of difficulty mechanism). However, there is an advanced setting in the options menu that let's you tick "play while paused" to on. When on we should indeed show info in the dynamic bar.

I would suggest to create two pull requests, one for each change.


Reply to this email directly or view it on GitHub.

@TheCycoONE
Copy link
Member

@xuancong84 this is why it's important to make your changes in different branches.

@xuancong84
Copy link
Author

I see. I think things are a bit messed up because the CorsixTH/CorsixTH
master branch is now full of dirt:

  1. the clip bug
  2. background music speed sometimes faster
  3. screen flashed black and white if you zoom during right-click picked
  4. ghost images: so many humanoids while right-click picked

I have created branch 0.40 and 0.45 in my fork. When the time comes, you
just watch the difference between 0.40 and 0.45 while patching up the
master.

xc

On Sun, Feb 1, 2015 at 11:47 AM, Stephen E. Baker notifications@github.com
wrote:

@xuancong84 https://github.com/xuancong84 this is why it's important to
make your changes in different branches.


Reply to this email directly or view it on GitHub
#647 (comment).

@xuancong84
Copy link
Author

hi Stephen,

It seems that both the "scale" function and "setClip" function in SDL has
problems, they cause blackout and flicking during rendering. Or should we
fall back to the old SDL?

xc

On Sat, Jan 31, 2015 at 7:47 PM, Stephen E. Baker notifications@github.com
wrote:

@xuancong84 https://github.com/xuancong84 this is why it's important to
make your changes in different branches.


Reply to this email directly or view it on GitHub
#647 (comment).

@TheCycoONE
Copy link
Member

@xuancong84 I think you responded to the wrong thread?

@TheCycoONE
Copy link
Member

@xuancong84 there are too many different unrelated commits in this pull request. Some of them look interesting, but nothing can be merged as is.

I'm going to close this pr, and you can open new ones for any individual fixes that are still relevant.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants