claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
6,199 Commits 1 Branch 0 Tags
f6741b172e8ff27c47349444ba48079ac4226e75
Commit Graph

146 Commits

Author SHA1 Message Date
RichardG867
0de137daf7 Merge branch 'master' of https://github.com/86Box/86Box into cleanup30 
# Conflicts:
#	src/include/86box/machine.h
#	src/machine/m_at_socket7.c
#	src/machine/machine_table.c
#	src/video/vid_tgui9440.c
#	src/win/win.c
 2021-11-14 13:45:37 -03:00
Laci bá
6f0da19369 Merge branch 'master' into translation_hu-HU 2021-11-14 00:03:36 +01:00
Laci bá
b321679bde Final cleanup 2021-11-13 23:56:35 +01:00
Laci bá
dfa795b267 Add reverse conversion from string to LCID 2021-11-13 23:51:29 +01:00
OBattler
bfb3c0c324 Fixed the intendation mess in cpu/x86seg.c, removed port 61h handling from keyboard/keyboard_at.c, and fixed a function with undeclared type in win/win.c. 2021-11-13 23:15:28 +01:00
OBattler
3730117a37 Conflict resolution. 2021-11-13 22:49:19 +01:00
Laci bá
7e4abcbfbd Implement system language as 0xFFFF 2021-11-13 21:37:51 +01:00
Laci bá
0bab2e144a Reinit media menu, and store the system language too 2021-11-12 22:41:30 +01:00
Laci bá
dafc429e93 A lot of changes 
- Fix the broken itemindex of ComboBox  in the Settings dialog
- Change from LCID to uint32_t
- Rewrite the headers of the lang related functions (can handle the whole LCID as input)
- Add dummy functions to unix.c
- Add proper combobox handling in win_settings.c
- Added a lot of debug calls temporarily
- Reactivate every disabled option related to language changes
- Move lang_id to 86box.h from win.h
- Implement on-fly resource switch as discussed with OBattler
- Reimplement everything language related in the initialization section of the program
- Implemented the ladder of three points
1, what is the --lang?
2, what are definied in the config? (to be implemented)
3, what is the system language
 2021-11-09 22:33:54 +01:00
Laci bá
ca638e1a9e Merge branch '86Box:master' into translation_hu-HU 2021-11-09 19:58:58 +01:00
OBattler
c892c521ea More preparation for localization. 2021-11-09 19:57:38 +01:00
OBattler
e2bdeae4cc Bugfixes to prepare for localization. 2021-11-09 19:50:42 +01:00
Laci bá
9914ad520c Multiple language-related updates 
Add the possibility to change runtime language, via --lang parameter. Also specify the verbose language code in the Hungarian translation.
 2021-11-09 18:53:15 +01:00
RichardG867
06ab671d32 Allow inserting of build number and git hash through CMake, while also porting the mouse capture title fix from the CLI branch 2021-11-05 21:49:00 -03:00
OBattler
a394a33500 Conflict resolution. 2021-10-19 18:18:15 +02:00
RichardG867
5bf8aa2d58 Port plat_m(un)map from the VFIO branch 2021-10-16 20:12:49 -03:00
OBattler
273e1a4cbe Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-19 14:47:15 +02:00
OBattler
a491b3a35c Reverted the meaning of video_fullscreen_first to what it used to be. 2021-09-18 21:33:13 +02:00
OBattler
e42fdbfcdd Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-18 15:25:37 +02:00
OBattler
0f69aa7ff7 Some fixes, fixes PCjr when the emulator is started in full screen, fixes #1702. 2021-09-18 15:24:00 +02:00
OBattler
105c0389c2 Merge remote-tracking branch 'origin/master' into feature/machine_and_kb 2021-09-18 00:03:41 +02:00
OBattler
065b8cc0c3 Using MoveWindow instead of SetWindowPos to move the window now, which actually works. 2021-09-18 00:01:39 +02:00
Miran Grča
be2005dea4 Merge pull request #1690 from 86Box/master 
Bring the branch up to par with master.
 2021-09-14 22:34:42 +02:00
OBattler
df30b47aa7 And fixed the behavior of that. 2021-09-14 22:20:20 +02:00
OBattler
07eb764df6 Locking a window to a specified size now also makes it remember the position, closes #1683. 2021-09-14 22:17:47 +02:00
Miran Grča
8ca1328c7e Merge pull request #1571 from 86Box/master 
Bring the branch up to par with master.
 2021-08-02 06:58:22 +02:00
OBattler
d1991ac763 Added the ability to hide the status bar, closes #1530. 2021-07-30 04:01:46 +02:00
OBattler
f31e8b27d5 Fixed a warning in win/win.c . 2021-07-21 16:55:03 +02:00
OBattler
706ad0e896 Changed the way the emulator is shut down, fixes #1555. 2021-07-21 04:05:40 +02:00
OBattler
4f6df76f10 Revert "Revert "Merge branch 'feature/machine_and_kb' into master"" 
This reverts commit f2cd3756dd.
 2021-07-04 17:40:39 +02:00
Daniel Gurney
f2cd3756dd Revert "Merge branch 'feature/machine_and_kb' into master" 
This reverts commit 6604a29d7e, reversing
changes made to 1d7fca0abd.
 2021-07-04 18:22:52 +03:00
OBattler
fd4817a87b All the current WIP work (warning: the PIT is currently using some temporary test rewrite that is going to be undone). 2021-06-29 19:11:19 +02:00
ts-korhonen
ed86f69c85 Explicitly initialize COM library in main and opengl threads, hopefully fixing filedialog issues. 2021-06-17 19:17:21 +03:00
ts-korhonen
dd65a80b19 Add menu option for filter method to use when scaling video. 2021-05-01 20:49:23 +03:00
Alexander Babikov
b4a16437d3 Add a separate build option for the OpenGL renderer 2021-04-26 02:45:20 +05:00
ts-korhonen
2bf6c7aa11 win_opengl: UI for options and add them to config. Reloading changed options at runtime. Improved framerate limitter. 2021-04-23 16:09:45 +03:00
ts-korhonen
3088c6c26f win_opengl: (WIP)UI for options. Add comments to help find conditionals that put opengl in dev_branch. 2021-04-21 23:08:32 +03:00
Miran Grča
027d93196e Merge pull request #1382 from ts-korhonen/opengl 
OpenGL renderer a.k.a. shader support
 2021-04-18 00:17:53 +02:00
OBattler
3497ed71c2 Some fixes to the UI code. 2021-04-17 22:43:31 +02:00
ts-korhonen
e6bac34b47 win_opengl: restrict to DEV_BRANCH as a separate renderer 2021-04-17 13:45:11 +03:00
ts-korhonen
afc5122a50 win_opengl: Add loading shaders from a file and few common uniforms. 
plat.h,win.c: Add missing const
 2021-04-15 16:38:23 +03:00
ts-korhonen
fc00dfd417 Merge branch 'master' into opengl 2021-04-12 23:47:06 +03:00
OBattler
58a1939dbf Improved the main window size specifying, now has an option to lock the window to the specified size, making it unresizable. 2021-04-12 05:58:59 +02:00
ts-korhonen
fe3e1d05de win_opengl: Get window size from resize instead of enable. Use noactivate window style to keep focus on parent window. 2021-04-11 22:29:00 +03:00
ts-korhonen
f315145c7d OpenGL rendering component. First iteration, WiP. 2021-04-10 18:15:26 +03:00
OBattler
5dace5e657 Fixed warnings introduced by the UTF-8 conversion. 2021-04-01 00:04:59 +02:00
David Hrdlička
dfbbe08a07 rewrite the emulator to use UTF-8 internally 2021-03-30 09:46:49 +02:00
OBattler
56d62de4fe Properly initialized framecountx and re-added the startblit() / endblit() to the CPU thread, fixes renderer switches. 2021-03-30 03:49:46 +02:00
Sean Ramey
8d9a3f02ea Fix build due to renamed variable. 
quited -> is_quit
 2021-03-25 03:20:25 -05:00
OBattler
1a643ab040 Reworked some memory and CPU parts to fix bugs, improve performance by getting rid of excess calls to mmutranslate(), and properly invalidate page bytes on page invalidation on new recompiler. 2021-03-24 19:52:44 +01:00