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.

Sign up for GitHub

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

Jump to bottom

Std r10996 #648

Closed
wants to merge 118 commits into from
Closed

Std r10996 #648

wants to merge 118 commits into from

Conversation

Ranran-the-JuicyPork
Copy link

No description provided.

ceeac and others added 30 commits March 29, 2024 08:00
@ceeac @Ranran-the-JuicyPork
CODE: Use single function for getting mouse position
872d97c 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10938
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/components/gui_timeinput.cc
#	src/simutrans/gui/depot_frame.cc
#	src/simutrans/gui/line_item.cc
@ceeac @Ranran-the-JuicyPork
CODE: use scr_coord for last mouse position/click
ac7482b 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10939
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/banner.cc
#	src/simutrans/gui/city_info.cc
#	src/simutrans/gui/components/gui_button.cc
#	src/simutrans/gui/components/gui_chart.cc
#	src/simutrans/gui/components/gui_combobox.cc
#	src/simutrans/gui/components/gui_container.cc
#	src/simutrans/gui/components/gui_flowtext.cc
#	src/simutrans/gui/components/gui_image_list.cc
#	src/simutrans/gui/components/gui_numberinput.cc
#	src/simutrans/gui/components/gui_schedule.cc
#	src/simutrans/gui/components/gui_scrollbar.cc
#	src/simutrans/gui/components/gui_scrolled_list.cc
#	src/simutrans/gui/components/gui_scrollpane.cc
#	src/simutrans/gui/components/gui_tab_panel.cc
#	src/simutrans/gui/components/gui_textinput.cc
#	src/simutrans/gui/gui_frame.cc
#	src/simutrans/gui/map_frame.cc
#	src/simutrans/gui/minimap.cc
#	src/simutrans/gui/simwin.cc
#	src/simutrans/gui/tool_selector.cc
#	src/simutrans/simevent.cc
#	src/simutrans/simevent.h
#	src/simutrans/siminteraction.cc
#	src/simutrans/simloadingscreen.cc
@ceeac @Ranran-the-JuicyPork
CODE: Use scr_coord for gui_component_t::getroffen
98fb518 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10940
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/components/gui_button.cc
#	src/simutrans/gui/components/gui_button.h
#	src/simutrans/gui/components/gui_schedule.cc
#	src/simutrans/gui/components/gui_timeinput.cc
#	src/simutrans/gui/depot_frame.cc
#	src/simutrans/gui/line_item.cc
@ceeac @Ranran-the-JuicyPork
CODE: Use scr_coord in depot_frame::update_vehicle_info_text
4f32c06 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10945
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/depot_frame.cc
@ceeac @Ranran-the-JuicyPork
CODE: scr_coord for win_set_pos()
e45e926 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10947
8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
CODE: Use scr_coord for change_drag_start
bca89f2 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10948
8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
CODE: Use scr_coord in gui_container_t::infowin_event
8974596 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10949
8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
CODE: Use scr_coord for dr_notify_input_pos
46377af 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10950
8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
Fix window resize using click-and-drag
77b2927 
Partially reverts r10948.

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10955
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/gui_frame.cc
@prissi @Ranran-the-JuicyPork
MUch better Android support including working pak set installation
57404fd 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10219
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	android/add_assets.sh
#	android/pelya.patch
#	get_pak.sh
#	gui/pakinstaller.cc
#	gui/simwin.h
#	network/pakset_info.cc
#	paksetinfo.h
#	simconst.h
#	simmain.cc
#	sys/simsys_s2.cc

NOTE: incorporate only modal_dialogue().
@ceeac @Ranran-the-JuicyPork
FIX: Runaway simulation speed in some cases if modal_dialogue is open
9cc695c 
The frame timing in modal_dialogue() did not account for step()
being interrupted by sync_step(). The fix is to fix the frame timing -
5 sync_steps between steps and no interrupts (similar to network mode).

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10338 8aca7d54-2c30-db11-9de9-000461428c89
@prissi @Ranran-the-JuicyPork
Add tool to viually invert control
f18880e 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10590
8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10597
8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10598
8aca7d54-2c30-db11-9de9-000461428c89

NOTE: Include fix of typo
@ceeac @Ranran-the-JuicyPork
Squelch warning
4ad1427 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10604
8aca7d54-2c30-db11-9de9-000461428c89
@Ranran-the-JuicyPork
Update cherry-picked-commits.txt
547918b
@prissi @Ranran-the-JuicyPork
rename _network_safe() to _alters_map(), and removed is_move_metwork_…
19c6a41 
…safe()

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10623
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	Simutrans-Main.vcxitems
#	src/simutrans/script/api/api_command.cc
#	src/simutrans/tool/simtool-scripted.h
@prissi @Ranran-the-JuicyPork
Logic is otherwise, network_safe means keeping game state => renamed …
cb04d9d 
…to ..._keeps_game_state

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10624
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/script/api/api_command.cc
#	src/simutrans/tool/simtool-scripted.h
@ceeac @Ranran-the-JuicyPork
FIX: Crash when supplying invalid default_param to tool_plant_tree_t
aac2bbf 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10735
8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
FIX: Crash when supplying invalid default_param to tool_plant_groundo…
74e45ab 
…bj_t

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10750
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/tool/simtool.cc
#	src/simutrans/tool/simtool.h
@prissi @Ranran-the-JuicyPork
FIX: quit does not quit the server
b3a5860 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10758
8aca7d54-2c30-db11-9de9-000461428c89
@Dwachs @Ranran-the-JuicyPork
CODE: remove unused function
74c6408 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10768
8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
FIX: Crash when supplying null default_param to tool_build_station_t
c0f2d16 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10743
8aca7d54-2c30-db11-9de9-000461428c89
@Ranran-the-JuicyPork
Restoring rows that were unintentionally reverted by merging old commits
ddde254
@ceeac @Ranran-the-JuicyPork
FIX: Crash when supplying invalid default_param to tool_build_station_t
c5a934f 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10745
8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
Improved error messages for network_send_data/network_receive_data
f2ac780 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10756
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/network/network.cc
@ceeac @Ranran-the-JuicyPork
FIX: Uninitialized read in gui_image_t::get_min_size when COLOUR_DEPTH=0
7c0fbe7 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10765
8aca7d54-2c30-db11-9de9-000461428c89
@Ranran-the-JuicyPork
FIX merging error in r10947
71d89c5
@Ranran-the-JuicyPork
FIX: missing change in r10219
abf168e
@ceeac @Ranran-the-JuicyPork
CODE: Mark simwin internal functions as static
6c267ae 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10956
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/simwin.cc
#	src/simutrans/gui/simwin.h
@ceeac @Ranran-the-JuicyPork
CODE: Use scr_coord for create_win
76eb93f 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10957
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/player/simplay.cc
#	src/simutrans/tool/simmenu.cc
@ceeac @Ranran-the-JuicyPork
CODE: Use scr_coord for win_set_tooltip
e8ed8c6 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10958
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/ground/grund.cc
#	src/simutrans/gui/line_item.cc
#	src/simutrans/gui/tool_selector.cc
ceeac and others added 14 commits May 28, 2024 02:01
@ceeac @Ranran-the-JuicyPork
CODE: Use defines instead of magic numbers for player numbers
1edfd79 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10285
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	simworld.cc
@Ranran-the-JuicyPork
CODE: remove duplicate code and same as standard
1298b14
@Ranran-the-JuicyPork
CODE: Indentation and comment position
e2e55e5
@Ranran-the-JuicyPork
Update cherry-picked-commits.txt
3956209
@Ranran-the-JuicyPork
FIX: add ex-revision to 14.65 for "scroll_threshold"
22748d7
@Ranran-the-JuicyPork
FIX: cannot read setting xml
b965964
@Ranran-the-JuicyPork
CODE: same format with standard (for diff check)
24cbf4d
@Ranran-the-JuicyPork
comment fix as standard
5c07b64
@ceeac @Ranran-the-JuicyPork
CHG: Allow querying gameinfo of older servers again
39a57d5 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@9628
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	network/network_file_transfer.cc
@ceeac @Ranran-the-JuicyPork
CODE: Use named constants for server announce
f22fe4d 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@9941
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	simworld.cc
#	simworld.h
@ceeac @Ranran-the-JuicyPork
CODE: Use named constants for server announce
676435f 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@9941
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	simworld.cc
@ceeac @Ranran-the-JuicyPork
Improved error messages for network_send_data/network_receive_data
1e27590 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10756
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/network/network.cc
@Ranran-the-JuicyPork
Update cherry-picked-commits.txt
96d1d56
@Ranran-the-JuicyPork
CODE: standard format
d3a1bbd
@jamespetts
Copy link
Owner

Hello - in case you have not seen the message at the forum: I have tested the latest commit (dated 29 May 2024), but, unfortunately, this does not solve the problem described on the forum relating to querying the state of network servers: the original behaviour persists.

Additionally, there is now a problem relating to scrolling in the load and save game windows, where moving the mouse pointer up and down over the windows will scroll the list, whereas the mouse wheel does not work. This causes it to be nearly impossible to select a file name with the mouse. I suspect that this is related to code intended to make Simutrans workable for touch screens.

Thank you for your work on this so far.

Dwachs and others added 11 commits May 31, 2024 05:19
@Dwachs @Ranran-the-JuicyPork
CODE remove disabled cache stuff
505421b 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10258
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	gui/components/gui_scrollpane.cc
@prissi @Ranran-the-JuicyPork
FIX: do not swallow keys and scrollwheel events in scrollpanes
74de33e 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10513
8aca7d54-2c30-db11-9de9-000461428c89
@prissi @Ranran-the-JuicyPork
Do not drag in swallowed event
0f19980 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10522
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/components/gui_scrollpane.cc
@Ranran-the-JuicyPork
FIX/CODE: retake r10939 and some formatting
3d637e1
@prissi @Ranran-the-JuicyPork
Read out the alt dns (if there)
3534435 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10131
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	Simutrans-GDI.vcxproj
@prissi @Ranran-the-JuicyPork
Autoshow keyboard under Android for textinput
62233f5 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10132 8aca7d54-2c30-db11-9de9-000461428c89
@prissi @Ranran-the-JuicyPork
CHG: test connect timeout now 2 seconds (for windows, please adapt an…
1f482f5 
…d test on Linux/Mac) for query server status

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10459
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/server_frame.cc
#	src/simutrans/network/network.cc
@prissi @Ranran-the-JuicyPork
CHG: test connect timeout now 2 seconds (for windows, please adapt an…
031961a 
…d test on Linux/Mac) for query server status

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10459
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/server_frame.cc
#	src/simutrans/network/network.cc
@Ranran-the-JuicyPork
CODE: same as standard
7149e2e
@Ranran-the-JuicyPork
Update cherry-picked-commits.txt
a93ab71
@Ranran-the-JuicyPork
Merge remote-tracking branch 'refs/remotes/jamespetts/master' into st…
6c41198 
…d-r10996
@Ranran-the-JuicyPork
Copy link
Author

I think the mouse operation issue has been fixed.
Next, regarding networking, I have merged the commits related to the server frame, so please check if that makes any changes.

@jamespetts
Copy link
Owner

Thank you. I can confirm that the mouse interaction issue is fixed, but unfortunately the querying of a network game still fails with the error, "send of NWC_GAMEINFO failed" error message in the "Play online" window when I click on my local server in the list. This behaviour does not occur with the latest commit on the master branch.

@Ranran-the-JuicyPork
Copy link
Author

I would like to have you split off and test the std-r10996 branch to understand or work around the issues and move forward.
Please test the std2406-1 branch in pull request #662 instead.

It will skip some commits, but will pick up many commits because it fixes a scrolling bug.

I forgot to report this before, but as an appearance change, striped lists will be introduced to some lists.
However, the goods list will not be changed because it works differently. The same applies to standard.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Ranran-the-JuicyPork @jamespetts @ceeac @prissi @Dwachs @Roboron3042