erorcun
54214dd2c4
Fix mouse lock/high-dpi
2020-11-18 17:42:21 +03:00
Greg V
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
Greg V
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
Greg V
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
Greg V
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
erorcun
c6f53d25b0
Frontend: Stats, Map, Audio inputs, Radio selector
2020-11-18 00:33:45 +03:00
erorcun
f33ed2892a
Fix mouse lock/high-dpi 2
2020-11-16 15:49:00 +03:00
erorcun
3b1debaa0d
Fix mouse lock/high-dpi
2020-11-16 15:28:10 +03:00
erorcun
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
erorcun
067200dd7e
mr.casepath 2
2020-10-23 04:37:01 +03:00
erorcun
1587815fca
satisfy mr.casepath
2020-10-23 04:25:55 +03:00
erorcun
bedc066cfd
mr.casepath
2020-10-23 01:56:32 +03:00
erorcun
0265804003
Cross-platform fix and a little style change
2020-10-21 03:55:35 +03:00
erorcun
af53267b74
Text and cross-platform fix
2020-10-21 03:11:10 +03:00
erorcun
a6aa782d6d
Fixes and style changes from miami
2020-10-18 19:16:37 +03:00
eray orçunus
f60e3d667a
Minor things
2020-10-18 13:53:17 +03:00
erorcun
4e4e0e8e04
Merge pull request #765 from erorcun/miami
...
Radar, WaterCannon, win/glfw skels
2020-10-17 18:39:56 +03:00
eray orçunus
b84dc2bc9b
Fix management issue
2020-10-17 18:10:37 +03:00
eray orçunus
dc80884ab5
Fix management issue
2020-10-17 18:07:20 +03:00
eray orçunus
b98864d134
Radar, WaterCannon, win/glfw skels
2020-10-17 17:35:26 +03:00
eray orçunus
342da2430b
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
2020-10-12 20:47:34 +03:00
eray orçunus
3772be32bf
Streaming and cross-platform fixes
2020-10-12 20:41:13 +03:00
eray orçunus
be6b97b5d8
Streaming and cross-platform fixes
2020-10-12 20:30:49 +03:00
eray orçunus
d18a55f429
SampleManager
2020-10-12 20:22:39 +03:00
Sergeanur
f1bb09826d
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# gamefiles/TEXT/american.gxt
# premake5.lua
# src/audio/MusicManager.cpp
# src/control/Darkel.cpp
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/Frontend.cpp
# src/core/Game.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/extras/frontendoption.cpp
# src/extras/frontendoption.h
# src/render/Hud.cpp
# src/skel/glfw/glfw.cpp
# src/vehicles/CarGen.cpp
# src/vehicles/Vehicle.cpp
# src/weapons/WeaponInfo.cpp
# utils/gxt/american.txt
2020-10-11 01:18:08 +03:00
eray orçunus
22c9e8b581
Fix POSIX streaming
2020-10-09 02:22:02 +03:00
eray orçunus
ed82c55475
Fix POSIX streaming
2020-10-09 02:19:49 +03:00
eray orçunus
570ccb7db1
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
2020-10-08 22:45:37 +03:00
Andrew Udvare
d590fdddf6
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-10-08 17:51:43 +03:00
eray orçunus
da39624f1c
Pad, BulletInfo, ProjectileInfo, fixes
2020-10-08 00:26:24 +03:00
erorcun
fae97f29c4
Merge branch 'master' into master
2020-10-04 22:12:57 +03:00
eray orçunus
3bd3330227
Load and write our settings in re3.ini & fixes
2020-10-02 21:18:34 +03:00
Andrew Udvare
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
eray orçunus
595421da39
Fixes, mouse AUX buttons, joystick detect menu
2020-09-30 20:03:01 +03:00
eray orçunus
f740588780
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-09-30 02:44:02 +03:00
eray orçunus
f71953077d
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
2020-09-30 02:41:42 +03:00
Sergeanur
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
shfil
35d7591def
some SilentPatch fixes
...
# Conflicts:
# src/core/Camera.cpp
# src/weapons/Weapon.cpp
2020-09-30 02:14:10 +03:00
Greg V
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
Greg V
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
Greg V
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
Greg V
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
eray orçunus
70aac0f460
Fixes: PS2/PS2-like menu, Hud, new sliding text found
2020-09-27 19:22:21 +03:00
eray orçunus
9b76424540
Fixes
2020-09-27 04:39:25 +03:00
eray orçunus
a5d6c952a7
Credits & fixes
2020-09-27 02:36:49 +03:00
Nikolay Korolev
b42d9e3e7c
silentpatch fixes
2020-09-26 13:30:22 +03:00
Sergeanur
dd93a90ab2
Fix MASTER build with glfw
2020-09-26 05:14:24 +03:00
Sergeanur
3f0a80f7c7
Fix MASTER build with glfw
2020-09-26 05:10:22 +03:00
Sergeanur
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
Sergeanur
a728a542be
Graphics menu + MSAA
2020-08-16 01:37:09 +03:00
Sergeanur
9956b27767
Merge branch 'master' into miami
...
# Conflicts:
# src/control/Darkel.cpp
# src/core/main.cpp
2020-08-15 15:13:46 +03:00
Sergeanur
e7945625b5
Original screen grabber
2020-08-14 18:57:23 +03:00
eray orçunus
b54bb62c94
Stats(except displaying), PlayerInfo, marker fix
2020-08-14 01:14:04 +03:00
Sergeanur
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
aap
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
withmorten
24a1644b2a
don't CoUninitialize for NO_MOVIES
2020-08-08 17:12:23 +02:00
withmorten
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
blingu
8392b9ad2f
Update glfw.cpp
2020-08-07 17:51:43 +02:00
blingu
c4f9bfdc44
added FreeBSD support
2020-08-05 14:33:50 +02:00
Sergeanur
9df1d08348
Fixes after merge
2020-07-29 15:41:00 +03:00
Sergeanur
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
eray orçunus
c87b639a84
Fix casepath chaos
2020-07-28 17:56:47 +03:00
eray orçunus
eb8844fd11
Fix casepath chaos
2020-07-28 17:40:12 +03:00
eray orçunus
7fea567eb2
Fix/change some Windows define
2020-07-25 15:24:24 +03:00
eray orçunus
199d57b16c
Fix/change some Windows define
2020-07-25 15:18:15 +03:00
eray orçunus
15918feb8e
90% fixes, 10% skel refactoring
2020-07-24 21:35:04 +03:00
eray orçunus
ad6094ca1d
90% fixes, 10% skel refactoring
2020-07-24 21:02:55 +03:00
eray orçunus
732b760829
64-bit on Windows
2020-07-24 20:26:33 +03:00
eray orçunus
1dc6fbda1f
64-bit on Windows
2020-07-22 18:51:28 +03:00
Sergeanur
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
eray orçunus
f40f44b14e
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 15:19:22 +03:00
Sergeanur
7d51995640
Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher
2020-07-22 03:32:46 +03:00
eray orçunus
70df13f9d3
Fixes from miami
2020-07-20 22:47:41 +03:00
Sergeanur
30384bb4ef
Merge branch 'master' into miami
...
# Conflicts:
# src/render/Credits.cpp
2020-07-17 21:15:47 +03:00
Sergeanur
e8ded77e27
Add fix/workaround for black screen at startup
2020-07-17 21:14:48 +03:00
Sergeanur
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
eray orçunus
70fa4ab79c
Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes
2020-07-06 16:38:00 +03:00
eray orçunus
1cea84d2b1
Remove console and fix sth
2020-07-04 16:01:07 +03:00
eray orçunus
ed036df3ce
Re-enable console for debugging frontend
2020-07-03 05:40:22 +03:00
Filip Gawin
6cf698badd
Fix glfw.cpp
2020-06-29 16:24:40 +02:00
Sergeanur
b26eec5daf
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/control/Script.cpp
# src/control/ScriptCommands.h
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Pad.cpp
# src/core/Pad.h
# src/core/config.h
# src/entities/Entity.cpp
# src/render/Credits.cpp
# src/render/Fluff.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Timecycle.cpp
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
# src/text/Text.cpp
2020-06-29 12:56:50 +03:00
Fire-Head
d9cb9583bf
update glfw.cpp
2020-06-29 11:04:30 +03:00
Fire-Head
63fdcf7e64
menu fixes
2020-06-29 10:29:02 +03:00
Fire_Head
860f75d66c
Merge branch 'master' into ps2menu
2020-06-29 09:37:53 +03:00
Fire-Head
1c11a8081f
mips overdose
2020-06-28 00:01:51 +03:00
Sergeanur
509ca11d76
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# src/control/GameLogic.cpp
# src/control/PathFind.cpp
# src/control/RoadBlocks.cpp
# src/control/Script.cpp
# src/control/Script.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/core/TempColModels.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.h
# src/render/Skidmarks.h
# src/render/WaterLevel.cpp
# src/save/GenericGameStorage.h
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/DamageManager.cpp
# src/vehicles/Vehicle.cpp
# src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
eray orçunus
329a387fdf
Frontend customization functions, freecam toggle, minor things
2020-05-28 11:34:12 +03:00
Sergeanur
88b6168f1c
Merge branch 'master' into miami
...
# Conflicts:
# premake5.lua
# src/control/Script.cpp
# src/core/SurfaceTable.cpp
# src/core/config.h
# src/entities/Physical.cpp
# src/entities/Physical.h
# src/objects/Object.h
# src/skel/skeleton.h
# src/vehicles/Vehicle.h
2020-05-23 21:14:16 +03:00
aap
9313bfa155
skeleton typos
2020-05-23 11:34:48 +02:00
aap
e2d3ef449c
skeleton typos
2020-05-23 11:34:40 +02:00
erorcun
8b82e9c40f
Merge pull request #574 from Xinerki/miami
...
many additions
2020-05-22 15:49:37 +03:00
eray orçunus
a5f23a0342
VC CMenuManager struct, ctor etc.
2020-05-22 03:48:12 +03:00
Xinerki
900d5a4ce0
focus loss improvement
...
for u aap
2020-05-21 21:48:39 +03:00
Xinerki
1cb7b9876f
scuffed InitAfterFocusLoss implementation
2020-05-21 14:23:12 +03:00
aap
9dc5dca209
remove some unneeded plane paths for the moment; also different exe icon
2020-05-16 11:34:51 +02:00
Sergeanur
24875f34d0
Merge branch 'master' into miami
...
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
2020-05-14 17:05:42 +03:00
aap
f5345f59ea
blacklist for glfw "joysticks"
2020-05-14 00:09:45 +02:00
Sergeanur
7c2b9478d5
Merge branch 'master' into miami
...
# Conflicts:
# src/control/Garages.cpp
# src/core/FileLoader.cpp
# src/core/Streaming.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/render/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
2020-05-13 00:55:52 +03:00
Sergeanur
33dfaf7da1
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
2020-05-13 00:27:15 +03:00
Filip Gawin
c2ac6b3759
Fix linux warnings
2020-05-12 23:18:54 +02:00