majestic
d4efd003bc
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-09-30 03:13:32 -07: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
Filip Gawin
73e4350320
Use Const instead of const (last commit)
2020-09-30 02:19:04 +03:00
Filip Gawin
6c59d97520
Fix warning ISO C++11 does not allow conversion from string literal to
...
'char *
2020-09-30 02:18:55 +03:00
Filip Gawin
855c6a3c05
Fix build (if -> ifdef)
2020-09-30 02:18:46 +03:00
Filip Gawin
ff2998bee3
Make frequency more consistent with vanilla
2020-09-30 02:18:38 +03:00
Sergeanur
2129cc2906
Fix arg types
2020-09-30 02:18:11 +03:00
Nikolay Korolev
9cce324316
fixed cargen
...
# Conflicts:
# src/vehicles/CarGen.cpp
2020-09-30 02:18:03 +03:00
shfil
f35fd97c76
Merge pull request #722 from theR4K/master
...
fix for frequency miscalculation
2020-09-30 02:17:14 +03:00
Filip Gawin
35656fe0e8
Add target arm64
...
# Conflicts:
# premake5.lua
2020-09-30 02:16:50 +03:00
shfil
35d7591def
some SilentPatch fixes
...
# Conflicts:
# src/core/Camera.cpp
# src/weapons/Weapon.cpp
2020-09-30 02:14:10 +03:00
erorcun
f9dc00a458
Merge pull request #718 from Nick007J/miami
...
VC replays
2020-09-29 23:00:50 +03:00
erorcun
1fa852f118
Merge pull request #727 from erorcun/miami
...
Restore All Cars are Heli cheat
2020-09-29 22:42:08 +03:00
Filip Gawin
8235fe08d1
Fix more
2020-09-29 17:47:48 +02:00
Filip Gawin
e324f3dac0
Some more const
2020-09-29 17:43:34 +02:00
Filip Gawin
874b31d82b
Use Const instead of const (last commit)
2020-09-29 17:27:36 +02:00
Filip Gawin
eeb26cfc7d
Fix warning ISO C++11 does not allow conversion from string literal to
...
'char *
2020-09-29 17:16:02 +02:00
Filip Gawin
8424eabf22
Fix build (if -> ifdef)
2020-09-29 17:02:47 +02:00
Filip Gawin
a0b6410801
Make frequency more consistent with vanilla
2020-09-29 16:56:40 +02:00
eray orçunus
7646ceeaaa
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-09-29 02:30:48 +03:00
eray orçunus
a0588ef8b1
Restore All Cars are Heli cheat
2020-09-29 02:29:10 +03:00
erorcun
e2314c7852
Merge pull request #717 from theR4K/miami
...
Helicopters not ringing, and other audio stuff
2020-09-29 01:48:11 +03:00
Roman Masanin
a729f32c83
TEMPORALY remove flying cars
2020-09-29 01:39:59 +03:00
Sergeanur
5144b5051c
Fix arg types
2020-09-28 21:37:59 +03:00
Nikolay Korolev
742ca47a43
fixed cargen
2020-09-28 21:25:14 +03:00
Roman Masanin
a5269b998b
reverse compare
2020-09-28 21:11:24 +03:00
Roman Masanin
c317d3d9b1
tiny style fix
2020-09-28 21:09:06 +03:00
shfil
bc0bdd02f4
Merge pull request #721 from theR4K/miamiUpstream
...
fix for original bug in flying cars cheat
2020-09-28 20:07:14 +02:00
shfil
20167f341e
Merge pull request #722 from theR4K/master
...
fix for frequency miscalculation
2020-09-28 20:05:28 +02:00
Roman Masanin
7576b003c6
change for better understanding
2020-09-28 20:48:28 +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
7d31b7005a
Add non-amd64 architectures for bsd
2020-09-28 04:57:41 +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
Roman Masanin
1ea89f5aed
Merge remote-tracking branch 'upstream/master'
2020-09-28 03:40:58 +03:00
Roman Masanin
37e382c758
fix for frequency misscalculation
2020-09-28 03:29:45 +03:00
Roman Masanin
ca73f0344c
fixed original bug, when heli go ma if cars fly cheat activated
2020-09-28 01:38:05 +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
Roman Masanin
b956be0f44
another clamp
2020-09-27 04:22:59 +03:00
Roman Masanin
f67275be13
correction of defects and another two audio functions
2020-09-27 03:35:15 +03:00
eray orçunus
a5d6c952a7
Credits & fixes
2020-09-27 02:36:49 +03:00
Sergeanur
4cfc61da14
Use enums in aVehicleSettings
2020-09-27 02:26:35 +03:00
Roman Masanin
c403df0861
processEngineDamage
2020-09-27 02:03:36 +03:00
Filip Gawin
6cfac662a1
Add target arm64
2020-09-27 00:32:14 +02:00
Roman Masanin
bb2e601e13
Merge remote-tracking branch 'upstream/miami' into miami
2020-09-26 21:38:37 +03:00
Nikolay Korolev
c5699a9b30
now fixed properly
2020-09-26 21:35:09 +03:00
