Commit Graph

2573 Commits

Author SHA1 Message Date
Roman Masanin
fe46aa5cc2 better flying cars, some refractoring and fixes 2020-10-01 02:20:09 +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
ee3f5744f5 Merge branch 'master' of github.com:erorcun/re3 2020-09-30 20:54:42 +03:00
eray orçunus
595421da39 Fixes, mouse AUX buttons, joystick detect menu 2020-09-30 20:03:01 +03:00
Filip Gawin
4ec5e44b68 Mark audio code which is the same in re3 as done 2020-09-30 18:14:50 +02:00
Nikolay Korolev
1666995cd9 fixed bad bug 2020-09-30 16:29:39 +03:00
Nikolay Korolev
0a58e3e430 fixed bad bug 2020-09-30 16:25:21 +03:00
Roman Masanin
db0758690e new implementation for car fly enhancment 2020-09-30 13:37:43 +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
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
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
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
Roman Masanin
7576b003c6 change for better understanding 2020-09-28 20:48:28 +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
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
Nikolay Korolev
48a10de41f bug fixed 2020-09-26 21:25:40 +03:00
Nikolay Korolev
3c5624bc56 fixed tabs 2020-09-26 21:16:55 +03:00
Nikolay Korolev
796ad66d72 fixed replay bug 2020-09-26 21:12:47 +03:00
shfil
db1137b5a1
Merge pull request #715 from Nick007J/master
some SilentPatch fixes
2020-09-26 20:11:25 +02:00
Nikolay Korolev
f7d5021ac5 VC replays 2020-09-26 21:10:23 +03:00
Roman Masanin
4c220b1f95 return bridge, crane and fix structures in fluff.h 2020-09-26 21:07:51 +03:00
Roman Masanin
356c50ec1e mark completed functions in audioManager.h 2020-09-26 20:50:51 +03:00
Roman Masanin
ec8ac117ed Improve dodo cheat to allow fly on cars 2020-09-26 20:36:07 +03:00
Roman Masanin
c61160fee3 small fixes and cleanup 2020-09-26 20:24:25 +03:00
Roman Masanin
1bd497effc complete cleanup heli and flatTyre 2020-09-26 14:32:14 +03:00
Sergeanur
4d1182bdb1 Fix coronas reflections 2020-09-26 14:24:21 +03:00
Sergeanur
05e65baabe Fix coronas reflections 2020-09-26 14:23:34 +03:00
Nikolay Korolev
2eb2e9ac12 fixed tab 2020-09-26 14:12:42 +03:00
Nikolay Korolev
b42d9e3e7c silentpatch fixes 2020-09-26 13:30:22 +03:00
Roman Masanin
e256eaf014 cleanup carHeli 2020-09-26 05:41:10 +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
Roman Masanin
a75ddd0d0c processVehicleOneShots for heli, and heli blade fix 2020-09-26 04:10:00 +03:00
Sergeanur
c3d7a73c0b Fix OpenGL Z-write
# Conflicts:
#	src/core/main.cpp
2020-09-26 00:26:43 +03:00
Sergeanur
0ce8082bda Fix OpenGL Z-write 2020-09-26 00:25:39 +03:00
Roman Masanin
6e3523d594 flat tyre and minimal refractoring 2020-09-25 23:27:28 +03:00
Roman Masanin
4d1023ca30 safe before clean up 2020-09-25 04:57:11 +03:00
Roman Masanin
f097b9c972 fix deaddodo 2020-09-25 03:10:11 +03:00
Roman Masanin
4414288b86 remove anther goto 2020-09-25 02:30:51 +03:00
Roman Masanin
b3cbe3d338 removed some goto 2020-09-25 02:17:58 +03:00
Roman Masanin
1d22c78f9f processCarHeli half done 2020-09-25 01:43:19 +03:00
eray orçunus
dbc458a4d7 CPed and CCivilianPed funcs done 2020-09-24 01:54:37 +03:00
Roman Masanin
b2e3d90734 ProcessEscalators + some fixes 2020-09-22 19:32:05 +03:00
Sergeanur
a043902d9a
Merge pull request #703 from Nick007J/miami
script fixes + LCS cheat
2020-09-22 15:38:50 +03:00
Roman Masanin
a9c3fdd63f rewisited:
ProcessReverseGear
ProcessWeather
ProcessScriptObject
ProcessExtraSounds
ProcessEntity
and so, more info in my repo
2020-09-22 03:28:14 +03:00
Sergeanur
bde17bb395
Merge pull request #706 from theR4K/miami
Miami
2020-09-21 19:55:51 +03:00
Roman Masanin
579d96534d fix enum edditing effects for oal target and small improvements 2020-09-21 03:21:17 +03:00
Roman Masanin
0f119ed371 cleanup processVehicleEngine and some fixes 2020-09-21 02:49:35 +03:00
Roman Masanin
5b9e4c4780 some style and bug fixes, updated sfx enum, and implemented processVehicleEngine 2020-09-21 01:55:22 +03:00
shfil
3bad82db3b
Fix build (renamed var name in definiton file) 2020-09-19 20:45:57 +02:00
Sergeanur
ec2f4fde93 Fixes to MusicManager 2020-09-19 16:40:30 +03:00
Sergeanur
db2c34923d Fixes to MusicManager 2020-09-19 16:39:31 +03:00
Sergeanur
7efc153dc9 Renaming audio enum entries to something more like original 2020-09-19 15:55:27 +03:00
Roman Masanin
223cd11835 just more cleanup... 2020-09-18 20:32:25 +03:00
Roman Masanin
5f810ff21c cleanup processVehicle 2020-09-18 19:14:36 +03:00
Roman Masanin
7f77e8a441 cleanup processPlayerVehicleEngine 2020-09-18 19:11:28 +03:00
Roman Masanin
3ab01fa6a3 fix conditions for processPlayerVehicleEngine 2020-09-18 18:11:49 +03:00
Roman Masanin
c19c5ca083 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-15 23:24:22 +03:00
Roman Masanin
2d3d5d67ee revisit processVehicle 2020-09-15 22:06:18 +03:00
Sergeanur
9c2e9fcf88 Fix RotateY 2020-09-15 00:31:57 +03:00
Sergeanur
dff49e9c23 Fix RotateY 2020-09-15 00:31:32 +03:00
Roman Masanin
97550b4fd9 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-14 21:47:15 +03:00
Roman Masanin
16dab00bec finish work on ProcessPlayerVehicleEngine and cleanup 2020-09-14 21:47:00 +03:00
Sergeanur
a8a28c1512 Move a bunch of math to cpp files + small fixes
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/math/Matrix.h
#	src/math/Vector2D.h
#	src/math/math.cpp
#	src/render/Skidmarks.cpp
2020-09-14 21:10:23 +03:00
Sergeanur
38ec1bd50d Move a bunch of math to cpp files + small fixes 2020-09-14 21:07:31 +03:00
Roman Masanin
8f948228d5 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-13 21:45:53 +03:00
Roman Masanin
aa2f1b6b29 vehicle audio(first part) and temp fix for openAL 2020-09-13 21:45:42 +03:00
Nikolay Korolev
084efb1f14 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-13 12:06:44 +03:00
Sergeanur
25a22cc6f2
Merge pull request #702 from Sergeanur/VC/MusicManager
cMusicManager, cDMAudio, radio position save/load, a few commands imp…
2020-09-13 03:10:14 +03:00
Nikolay Korolev
e5faeea2e5 wall climb cheat from LCS 2020-09-11 18:46:16 +03:00
Nikolay Korolev
f0b15ee053 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-11 16:39:35 +03:00
erorcun
e9a7ab789d
Merge pull request #701 from erorcun/miami
Peds objectives and wait states done, fixes
2020-09-10 03:21:23 +03:00
eray orçunus
93d77f340d Fixes from miami 2020-09-10 03:14:50 +03:00
Sergeanur
bc0a97af04 Add missing file 2020-09-10 01:08:44 +03:00
Sergeanur
f6c0bcf201 Fix getter types 2020-09-10 00:57:14 +03:00
Sergeanur
7aca08a954 player mood enum 2020-09-10 00:32:51 +03:00
Sergeanur
c5b411c1ed Fix crash on assert 2020-09-09 22:36:53 +03:00
Sergeanur
f0ccbcb281 CStats::PopulateFavoriteRadioStationList 2020-09-09 20:37:36 +03:00
Sergeanur
4f4b1f9145 cMusicManager, cDMAudio, radio position save/load, a few commands implemented 2020-09-09 19:37:44 +03:00
erorcun
350b1ec67e
Merge pull request #698 from majesticCoding/miami
cheats, fixes, cosmetic changes
2020-09-06 10:14:55 +03:00
eray orçunus
3f402d23ff Peds objectives and wait states done, fixes 2020-09-05 20:28:50 +03:00
Sergeanur
9b47625115 More stinger fix 2020-09-02 21:03:02 +03:00
Sergeanur
fa7334c74f Stinger fixes 2020-09-02 20:55:28 +03:00
Nikolay Korolev
3e4f7b7bdf fixes 2020-09-02 14:13:52 +03:00
eray orçunus
16e10d788a Enable Stinger 2020-09-01 21:10:35 +03:00
majestic
9f43b1988b cheats, fixes, cosmetic changes 2020-09-01 09:42:17 -07:00
aap
0640ec7f5a
Merge pull request #700 from Sergeanur/VC/Stinger
Stinger done
2020-09-01 17:31:35 +02:00
aap
e3f607dba0
Merge pull request #699 from Nick007J/miami
small script fix
2020-09-01 17:30:59 +02:00
aap
6fc6ed8635
Merge pull request #696 from Fire-Head/miami
Miami Weapon, WeaponEffects done
2020-09-01 17:30:49 +02:00
Sergeanur
3bb0e78e1c Rename vars 2020-09-01 12:35:59 +03:00
Sergeanur
6778640b52 Rename states 2020-08-31 21:35:26 +03:00
Sergeanur
df67c73d81 vars rename 2020-08-31 21:21:50 +03:00
Sergeanur
024f0a5027 use SetOrientation 2020-08-31 21:15:04 +03:00
Sergeanur
8a0a29c64e Stinger done 2020-08-31 21:09:48 +03:00
Nikolay Korolev
647ddfa05e more fix 2020-08-31 17:18:37 +03:00
Nikolay Korolev
4ffca8954f Merge remote-tracking branch 'upstream/miami' into miami 2020-08-31 00:07:38 +03:00
Nikolay Korolev
ed799fb555 script inaccuracy 2020-08-31 00:07:29 +03:00
erorcun
b7456c604d
Merge pull request #697 from erorcun/miami
CGame done, Peds, fixes
2020-08-30 23:24:39 +03:00
Fire-Head
c22d252246 fix melee car damage 2020-08-30 17:50:03 +03:00
eray orçunus
3e549a7d44 CGame done, Peds, fixes 2020-08-30 12:40:30 +03:00
aap
e0f6459674 stupid zone load fix 2020-08-30 00:57:00 +02:00
Fire_Head
a8999bbf38
Merge pull request #1 from GTAmodding/miami
Miami
2020-08-27 20:35:14 +03:00
Fire-Head
210c7b8785 bike shooting fix + trace temp fix 2020-08-27 20:27:28 +03:00
Fire-Head
a38702a7d2 weapons 2020-08-27 19:52:43 +03:00
eray orçunus
7658577260 CFO fixes 2020-08-25 03:27:38 +03:00
eray orçunus
082c4caecf new frontend customization 2020-08-25 00:55:57 +03:00
aap
8e7989087d
Merge pull request #694 from Sergeanur/miami_CutsceneMgr
CutsceneMgr done
2020-08-24 22:46:17 +02:00
Sergeanur
963e85f047 Fix 2020-08-24 23:01:51 +03:00
Sergeanur
14ed50a559 Remote done 2020-08-24 22:52:07 +03:00
Sergeanur
041d342faf PlayerSkin done 2020-08-24 22:37:38 +03:00
eray orçunus
cb813bd1ab Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-08-24 22:36:03 +03:00
Sergeanur
85cf043e4a Compilation fix 2020-08-24 22:14:05 +03:00
Sergeanur
a3322f17d5 Merge branch 'master' into miami
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/core/ControllerConfig.cpp
#	src/core/ControllerConfig.h
#	src/core/Streaming.cpp
#	src/peds/PedChat.cpp
#	src/render/Weather.cpp
#	src/rw/TexRead.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
2020-08-24 21:59:32 +03:00
Sergeanur
1d907ac91f small fix 2020-08-24 21:56:34 +03:00
Sergeanur
bbcf3fd7d2 CutsceneMgr done 2020-08-24 21:52:16 +03:00
aap
56b80cb0ab fixes to zones and vehicle comp rules 2020-08-24 17:21:45 +02:00
aap
0a19925e99 finished sprites 2020-08-24 14:26:17 +02:00