Commit Graph

975 Commits

Author SHA1 Message Date
eray orçunus
7e32c603fc New math wrappers
from miami
2020-07-23 00:31:06 +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
erorcun
b182fa4bb8
Merge pull request #656 from erorcun/miami
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 18:21:39 +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
aap
0fba76a565 made NPC heli rotors rotate 2020-07-21 09:58:53 +02:00
aap
5bedca7692 fixed COcclusion 2020-07-20 23:25:04 +02:00
eray orçunus
70df13f9d3 Fixes from miami 2020-07-20 22:47:41 +03:00
aap
ee2d0ffc14
Merge pull request #650 from majesticCoding/miami
COcclusion done, I hope
2020-07-20 19:56:18 +02:00
aap
2612c9f12c CPlaneTrails and CPlaneBanners done 2020-07-20 19:50:20 +02:00
aap
efd49962d2 avoid UB 2020-07-20 19:32:20 +02:00
majestic
1ff27e3363 cosmetic fixes 2020-07-20 09:49:39 -07:00
Sergeanur
87eb96453a Add compatibility with RW 3.4 2020-07-18 13:30:51 +03:00
Sergeanur
de8759eabd Merge branch 'master' into miami
# Conflicts:
#	src/control/Record.cpp
#	src/vehicles/Automobile.cpp
2020-07-17 13:53:11 +03:00
Sergeanur
949d0c8853 Add audio cache for faster initialization 2020-07-17 13:48:25 +03:00
aap
4e3e1d0b87 make game load all platform dffs 2020-07-16 13:36:25 +02: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
Sergeanur
841fa5155c Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
Sergeanur
6eb8f6ae5a Add cutscene borders switch to the menu 2020-07-11 12:04:26 +03:00
eray orçunus
00bba630f6 enable island loading for now 2020-07-10 12:28:00 +03:00
eray orçunus
aabf0f4c2c keep loading screen, but for a second 2020-07-09 21:48:43 +03:00
Sergeanur
c012e5a7ff Disable loading screen 2020-07-09 20:40:15 +03:00
Sergeanur
cf69f22a0c Remove island loading 2020-07-09 19:18:42 +03:00
eray orçunus
67a3c7d2ee VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
eray orçunus
c483a044b5 Noskillx's PR + fix .set loading 2020-07-06 19:26:41 +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
ceb1defc4e fixes from master, menu helper text 2020-07-04 23:50:43 +03:00
aap
0acade08ca
Merge pull request #647 from Fire-Head/miami
miami CParticleObject
2020-07-04 21:24:17 +02:00
eray orçunus
15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
eray orçunus
ed036df3ce Re-enable console for debugging frontend 2020-07-03 05:40:22 +03:00
Fire-Head
d4004805f5 miami pobj 2020-07-03 02:18:06 +03:00
Nikolay Korolev
01b15fe807
reenabled script logging 2020-07-03 01:28:41 +03:00
Filip Gawin
bf2624692c Fix displaying stats 2020-07-03 00:04:49 +02:00
eray orçunus
c4cd210ae0 Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes 2020-07-02 16:01:42 +03:00
aap
2141247e08 CBoat and friends 2020-07-01 18:04:02 +02:00
Nikolay Korolev
ade5dff217 script logging for miami 2020-07-01 15:43:19 +03:00
erorcun
eda50bc32b
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639) 2020-07-01 15:28:43 +03:00
Sergeanur
87fa69385c remove TheText.Load() from CGame::Initialise 2020-06-30 07:48:09 +03:00
Sergeanur
6f81e84bd4 Restore original code of CControllerState::CheckForInput 2020-06-30 07:44:51 +03:00
Sergeanur
c80bdf3a2a Rename IsAnyButtonPressed to CheckForInput 2020-06-30 07:43:55 +03:00
aap
94ce376a76 cleanup 2020-06-29 12:12:43 +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
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
aap
3370ae04cb renamed 2dfx shadowRange to Size 2020-06-28 12:08:46 +02:00
aap
418bee9c22 renamed 2dfx shadowRange to Size 2020-06-28 12:05:42 +02:00
Nikolay Korolev
d6e111bb67 script logging fixes 2020-06-28 11:59:20 +03:00
Fire-Head
b8f633de24 fixes 2020-06-28 01:57:01 +03:00
Fire-Head
233792e2b8 fixfixfix 2020-06-28 00:31:45 +03:00
Fire-Head
1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
aap
592a6aef0b
Merge pull request #638 from erorcun/miami
CWanted, anim fix, ped objs renaming, remove III beta features
2020-06-25 15:15:01 +02:00
aap
2b21f92347 rename attractor flag to type 2020-06-25 15:13:33 +02:00
aap
cafe4d6f0c rename attractor flag to type 2020-06-25 15:13:08 +02:00
aap
077bcf1c82 CPad fix 2020-06-24 19:11:33 +02:00
Nikolay Korolev
043f09f3fb
Merge pull request #637 from Nick007J/master
script logging
2020-06-22 13:27:25 +03:00
eray orçunus
f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
Nikolay Korolev
7a71a47f74 updated player control names 2020-06-21 16:00:17 +03:00
aap
60f736f20f FOV fix 2020-06-21 14:52:44 +02:00
aap
b81bf1e138 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-21 14:52:19 +02:00
aap
e563450cb6 synch with re3 2020-06-21 14:52:03 +02:00
aap
98baa36f1a FOV fix 2020-06-21 14:50:00 +02:00
Nikolay Korolev
08af34bc99 Merge remote-tracking branch 'upstream/master' 2020-06-21 15:49:30 +03:00
aap
3859efff42 ps2 cam transitions done (hopefully) 2020-06-21 14:41:39 +02:00
Nikolay Korolev
f5cba0ce89 script logging 2020-06-21 13:46:23 +03:00
aap
586e8a2ab4 tried to reconstruct bills cam 2020-06-21 11:03:20 +02:00
aap
e1c58131c4 PS2 cam transition mostly working 2020-06-21 00:40:07 +02:00
eray orçunus
d6a853bd60 killing peds increase chaos level 2020-06-20 22:44:31 +03:00
eray orçunus
fd3cd2c26a Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-20 16:23:42 +03:00
eray orçunus
0625954bb7 Ducking, shooting vehicle occupants and weapon fixes 2020-06-20 16:23:32 +03:00
aap
c5205a89ee CCamera done 2020-06-20 14:54:11 +02:00
aap
5ad739f096 some PS2 cam code; fix for arrest cam 2020-06-20 14:38:21 +02:00
aap
4cd4f91e57 ccamera cleanup 2020-06-19 09:15:23 +02:00
erorcun
d322a8033e
Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
aap
7ceedc1d47 CCam done 2020-06-16 13:54:18 +02:00
aap
5f3eb76cff CCam fixes yet again 2020-06-16 13:50:29 +02:00
aap
62024217b7 more CCam 2020-06-15 20:50:01 +02:00
Sergeanur
655eaa36ce Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/Script.cpp
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
2020-06-15 17:44:47 +03:00
eray orçunus
686d6e9834 Fix vehicle cam. zoom values 2020-06-15 16:17:22 +03:00
eray orçunus
ef4c8f53c5 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-15 00:26:27 +03:00
eray orçunus
2d976827dd much better mission switcher 2020-06-15 00:26:19 +03:00
aap
e6d2b49121 more cleanup 2020-06-14 23:16:22 +02:00
aap
0741fd5b1d some more camera stuff 2020-06-14 23:15:56 +02:00
erorcun
f64d3ad7de
Merge pull request #631 from erorcun/miami
Peds, mission switcher & fixes
2020-06-14 22:59:02 +03:00
eray orçunus
db6110e996 Peds, mission switcher & fixes 2020-06-14 22:57:26 +03:00
majestic
015921522d fixed condition in CBoat::ProcessControl and changed enum 2020-06-14 07:53:45 -07:00
aap
c7a32bb83d some camera code 2020-06-14 09:36:30 +02:00
aap
3fe282fbe4 a few cam fixes 2020-06-13 23:39:35 +02:00
Nikolay Korolev
f78f707935 script fix 2020-06-13 02:02:59 +03:00
aap
41dac0773f little CCam cleanup; fix in CWorld sphere test 2020-06-12 21:53:39 +02:00
aap
5a961d0284 some cam cleanup; unused PS2 train cams 2020-06-10 23:50:27 +02:00
majestic
287987b8fe SmokeTrail(s) moved to Fluff, variables' names fixed, floats rounded 2020-06-10 13:47:48 -07:00
majestic
a99da7b94e more original cheats
- CSmokeTrails and CSmokeTrail classes added in new files
- more cheats added
2020-06-10 13:19:05 -07:00
Sergeanur
85d845c5ce
Merge pull request #623 from Sergeanur/VC/MissionAudio
Mission audio
2020-06-08 17:32:57 +03:00
Sergeanur
8cd87236c9 miamification of some audio structs 2020-06-08 14:29:55 +03:00
aap
f8b4c0ee1d bla 2020-06-08 13:23:08 +02:00
aap
d5515c9d0e cleaned up and updated animviewer; fixed animation bug 2020-06-08 13:01:23 +02:00
aap
94e5b24fc8 cleaned up and fixed animviewer 2020-06-08 13:01:20 +02:00
Nikolay Korolev
16a5c2f676 fixes 2020-06-08 01:21:49 +03:00
eray orçunus
e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00