fae97f29c4
Merge branch 'master' into master
2020-10-04 22:12:57 +03:00
3bd3330227
Load and write our settings in re3.ini & fixes
2020-10-02 21:18:34 +03:00
01ea7801fd
macOS support; thanks to @MrYadro
...
This should support ARM64 and x86-64.
-target flag based on information from
https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377 .
2020-09-30 15:40:28 -04:00
595421da39
Fixes, mouse AUX buttons, joystick detect menu
2020-09-30 20:03:01 +03:00
f740588780
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-09-30 02:44:02 +03:00
f71953077d
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
2020-09-30 02:41:42 +03:00
fae4c73ad3
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.h
# src/audio/MusicManager.cpp
# src/audio/sampman.h
# src/audio/sampman_oal.cpp
# src/control/CarCtrl.cpp
# src/control/Replay.cpp
# src/control/Script.cpp
# src/core/Camera.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/math/Matrix.cpp
# src/math/Matrix.h
# src/math/Vector2D.h
# src/peds/Ped.cpp
# src/render/Credits.cpp
# src/render/Hud.cpp
# src/render/Skidmarks.cpp
# src/weapons/Weapon.cpp
2020-09-30 02:25:30 +03:00
35d7591def
some SilentPatch fixes
...
# Conflicts:
# src/core/Camera.cpp
# src/weapons/Weapon.cpp
2020-09-30 02:14:10 +03:00
7d03a6fe29
Use CLOCK_MONOTONIC_FAST when available (FreeBSD)
...
CLOCK_MONOTONIC_FAST is the equivalent of Linux's CLOCK_MONOTONIC_RAW.
2020-09-28 04:59:14 +03:00
0205960a2f
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-09-28 04:53:15 +03:00
b95accb8ff
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-09-28 04:52:13 +03:00
5654347c5d
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-09-28 04:50:57 +03:00
70aac0f460
Fixes: PS2/PS2-like menu, Hud, new sliding text found
2020-09-27 19:22:21 +03:00
9b76424540
Fixes
2020-09-27 04:39:25 +03:00
a5d6c952a7
Credits & fixes
2020-09-27 02:36:49 +03:00
b42d9e3e7c
silentpatch fixes
2020-09-26 13:30:22 +03:00
dd93a90ab2
Fix MASTER build with glfw
2020-09-26 05:14:24 +03:00
3f0a80f7c7
Fix MASTER build with glfw
2020-09-26 05:10:22 +03:00
827b240078
Merge branch 'master' into miami
...
# Conflicts:
# gamefiles/TEXT/american.gxt
# src/control/Garages.cpp
# src/control/Record.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/ModelInfo.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# utils/gxt/american.txt
2020-08-19 23:34:33 +03:00
a728a542be
Graphics menu + MSAA
2020-08-16 01:37:09 +03:00
9956b27767
Merge branch 'master' into miami
...
# Conflicts:
# src/control/Darkel.cpp
# src/core/main.cpp
2020-08-15 15:13:46 +03:00
e7945625b5
Original screen grabber
2020-08-14 18:57:23 +03:00
b54bb62c94
Stats(except displaying), PlayerInfo, marker fix
2020-08-14 01:14:04 +03:00
1c1fa25e6c
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# premake5.lua
# src/render/Coronas.cpp
# src/render/Timecycle.cpp
# src/render/Timecycle.h
2020-08-10 19:15:51 +03:00
bad2b4b3c2
Merge pull request #681 from withmorten/master
...
remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't …
2020-08-08 17:40:17 +02:00
24a1644b2a
don't CoUninitialize for NO_MOVIES
2020-08-08 17:12:23 +02:00
ce0633a0c2
remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't check return value for CoInitialize
2020-08-07 18:52:33 +02:00
8392b9ad2f
Update glfw.cpp
2020-08-07 17:51:43 +02:00
c4f9bfdc44
added FreeBSD support
2020-08-05 14:33:50 +02:00
9df1d08348
Fixes after merge
2020-07-29 15:41:00 +03:00
acdc52116e
Merge branch 'master' into miami
...
# Conflicts:
# src/animation/RpAnimBlend.cpp
# src/audio/oal/stream.cpp
# src/audio/sampman.h
# src/control/Pickups.cpp
# src/core/Collision.cpp
# src/core/Collision.h
# src/core/FileLoader.cpp
# src/core/FileMgr.cpp
# src/core/FileMgr.h
# src/core/Streaming.cpp
# src/core/Streaming.h
# src/core/SurfaceTable.h
# src/modelinfo/VehicleModelInfo.h
# src/peds/Ped.cpp
# src/rw/RwHelper.cpp
# src/rw/RwHelper.h
# src/skel/glfw/glfw.cpp
# src/skel/platform.h
# src/text/Text.cpp
# src/text/Text.h
# src/vehicles/CarGen.cpp
# src/vehicles/Heli.cpp
2020-07-29 15:34:57 +03:00
c87b639a84
Fix casepath chaos
2020-07-28 17:56:47 +03:00
eb8844fd11
Fix casepath chaos
2020-07-28 17:40:12 +03:00
7fea567eb2
Fix/change some Windows define
2020-07-25 15:24:24 +03:00
199d57b16c
Fix/change some Windows define
2020-07-25 15:18:15 +03:00
15918feb8e
90% fixes, 10% skel refactoring
2020-07-24 21:35:04 +03:00
ad6094ca1d
90% fixes, 10% skel refactoring
2020-07-24 21:02:55 +03:00
732b760829
64-bit on Windows
2020-07-24 20:26:33 +03:00
1dc6fbda1f
64-bit on Windows
2020-07-22 18:51:28 +03:00
f882586eb8
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# README.md
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/render/Renderer.cpp
# src/vehicles/Plane.cpp
2020-07-22 18:29:17 +03:00
f40f44b14e
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 15:19:22 +03:00
7d51995640
Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher
2020-07-22 03:32:46 +03:00
70df13f9d3
Fixes from miami
2020-07-20 22:47:41 +03:00
30384bb4ef
Merge branch 'master' into miami
...
# Conflicts:
# src/render/Credits.cpp
2020-07-17 21:15:47 +03:00
e8ded77e27
Add fix/workaround for black screen at startup
2020-07-17 21:14:48 +03:00
d0f5464200
Merge branch 'master' into miami
...
# Conflicts:
# src/control/CarAI.cpp
# src/control/Phones.cpp
# src/control/Phones.h
# src/control/Record.cpp
# src/control/Restart.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.h
# src/core/Streaming.cpp
# src/core/TempColModels.cpp
# src/core/Wanted.cpp
# src/core/Zones.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/entities/Entity.cpp
# src/entities/Physical.cpp
# src/extras/frontendoption.cpp
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/CivilianPed.cpp
# src/peds/CopPed.cpp
# src/peds/EmergencyPed.cpp
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/peds/Population.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# src/skel/win/win.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
# src/vehicles/Boat.h
# src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +03:00
70fa4ab79c
Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes
2020-07-06 16:38:00 +03:00
1cea84d2b1
Remove console and fix sth
2020-07-04 16:01:07 +03:00
ed036df3ce
Re-enable console for debugging frontend
2020-07-03 05:40:22 +03:00
6cf698badd
Fix glfw.cpp
2020-06-29 16:24:40 +02:00
