Commit Graph

202 Commits

Author SHA1 Message Date
9647901ba0 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
2021-01-25 19:35:03 +02:00
202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
e9689a0a07 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/core/re3.cpp
2021-01-23 17:54:46 +02:00
1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03:00
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03:00
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
2021-01-22 15:04:09 +02:00
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
aap
f7ab5cb7c4 loadscreens, not accurate 2021-01-22 00:41:34 +01:00
ed74182cc2 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	vendor/librw
2021-01-21 16:03:27 +02:00
aap
24de9f92e8 enable screenshots for librw; update librw 2021-01-21 10:21:47 +01:00
7541fa7cb7 Revert extra checks before autolinking 2021-01-14 22:26:36 +01:00
1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00
c7b905c0ec More checks before autolinking 2021-01-14 22:06:27 +01:00
852c3badbb Change window name 2021-01-09 14:21:46 +02:00
ecdd751ec3 PC controls and icon 2021-01-08 16:57:22 +02:00
aap
fc312113d2 some PS2 things 2020-12-20 14:27:48 +01:00
8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
0448ae662f Fix language initialization call order 2020-12-14 02:50:34 +03:00
0f5893ed60 Fix language initialization call order 2020-12-14 02:46:55 +03:00
cf4aedd97c Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 06:36:28 +03:00
e1044a7947 AnimViewer fixes, commentary from miami 2020-12-09 05:10:57 +03:00
122c7aa40d Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 03:41:45 +03:00
ab3e810a95 AnimViewer done, comment cleanup 2020-12-03 05:22:58 +03:00
16abbad6b2 Add multisampling to librw
# Conflicts:
#	src/core/config.h
#	vendor/librw
2020-12-01 03:42:40 +02:00
b8d3d8f5e4 add -console cmdline arg instead of #if 0/1
# Conflicts:
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
2020-12-01 03:41:09 +02:00
4ec60676e7 Merge pull request #846 from withmorten/ini
add -console cmdline arg instead of #if 0/1
2020-12-01 04:21:00 +03:00
aap
d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
aap
c57fee38ca Merge pull request #841 from aap/master
start using CMemoryHeap; also some PS2 define cleanup
2020-11-28 18:52:44 +01:00
b1a431a740 add -console cmdline arg instead of #if 0/1 2020-11-28 17:57:10 +01:00
aap
a8035b6466 moved some stuff to MemoryMgr 2020-11-28 17:05:57 +01:00
18d0fd2e48 Add multisampling to librw 2020-11-28 15:13:06 +02:00
aap
d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
aap
4ddc356341 memory heap starting to work 2020-11-25 22:49:50 +01:00
54214dd2c4 Fix mouse lock/high-dpi 2020-11-18 17:42:21 +03:00
2ce9e540da Use CLOCK_MONOTONIC_FAST when available (FreeBSD)
CLOCK_MONOTONIC_FAST is the equivalent of Linux's CLOCK_MONOTONIC_RAW.
2020-11-18 17:13:03 +03:00
1544acff05 Use GLFW_CURSOR_DISABLED (glfw's native mouse restriction)
On Wayland, clients cannot move the mouse pointer.
Mouse constraints, as required for 3D camera movement, are an explicit specific thing,
and glfw supports it with GLFW_CURSOR_DISABLED.
Use DISABLED, unless we're in a menu in windowed mode, where HIDDEN is still appropriate.
2020-11-18 17:10:56 +03:00
7c1497a058 glfw: scale cursor position by the ratio of framebuffer to screen size
This fixes the mouse being constrained to the top left quarter of the window on Wayland HiDPI setups.
2020-11-18 17:10:49 +03:00
d05c50ea74 Use glfwSetFramebufferSizeCallback instead of glfwSetWindowSizeCallback
Framebuffer size is scaled by the display scale.
This fixes the game being shrunk to the bottom left quarter of the window on Wayland HiDPI setups.

Corresponding change in librw: glfwGetWindowSize -> glfwGetFramebufferSize.
2020-11-18 17:09:10 +03:00
c6f53d25b0 Frontend: Stats, Map, Audio inputs, Radio selector 2020-11-18 00:33:45 +03:00
f33ed2892a Fix mouse lock/high-dpi 2 2020-11-16 15:49:00 +03:00
3b1debaa0d Fix mouse lock/high-dpi 2020-11-16 15:28:10 +03:00
72c0a6a680 Merge pull request #723 from myfreeweb/master
Fixes for Wayland (HiDPI and mouse lock) support, FreeBSD
2020-11-16 15:20:20 +03:00
067200dd7e mr.casepath 2 2020-10-23 04:37:01 +03:00
1587815fca satisfy mr.casepath 2020-10-23 04:25:55 +03:00
bedc066cfd mr.casepath 2020-10-23 01:56:32 +03:00
0265804003 Cross-platform fix and a little style change 2020-10-21 03:55:35 +03:00
af53267b74 Text and cross-platform fix 2020-10-21 03:11:10 +03:00