1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-29 10:37:06 +00:00
Commit graph

68 commits

Author SHA1 Message Date
Sergeanur 3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
aap a7050458ae little cleanup and synch on templates and config 2020-12-18 13:50:26 +01: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 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
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
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
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
aap 0741fd5b1d some more camera stuff 2020-06-14 23:15:56 +02: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
aap 5a961d0284 some cam cleanup; unused PS2 train cams 2020-06-10 23:50:27 +02:00
aap 21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
eray orçunus 529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
aap 7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
aap bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
Nikolay Korolev a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
Filip Gawin c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
bigbossbro08 b4abb6ddd8 fixed few more typos 2020-05-10 22:04:36 +06:00
bigbossbro08 c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
bigbossbro08 af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Sergeanur e917cd1f46 Fix corona scaling 2020-05-09 02:50:48 +03:00
aap b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Nikolay Korolev 9e65eb34ec 1.1 patch stuff 2020-04-19 17:38:10 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Sergeanur d455cd8a62 Default native resolution mode and small camera fixes 2020-04-16 00:46:09 +03:00
Sergeanur 560fc65538 Small camera fixes 2020-04-08 09:58:08 +03:00
eray orçunus 1f8e073c0a Menu map 2020-04-07 20:18:24 +03:00
aap 7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
eray orçunus 5e2fe749bd Mouse free cam for peds&cars (under FREE_CAM) 2020-03-31 06:05:49 +03:00
aap ac097e6fc7 rotating FollowPed cam (disabled by default for now) 2020-03-29 14:07:38 +02:00
aap 22e022cc9f implemented some unused PS2 cams 2020-03-27 18:21:46 +01:00
aap f0dfaac838 Finished CCam; various smaller things 2020-03-27 10:04:45 +01:00
Nikolay Korolev 1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Sergeanur a3e5ccde47 cMusicManager 2020-02-07 02:30:00 +02:00
aap 5794732ad4
Merge pull request #299 from Sergeanur/PedIK
CPedIK finished, bit of CCamera
2020-01-31 12:57:43 +01:00
Sergeanur 43bd2227a8 CRemote 2020-01-31 12:23:15 +02:00
Sergeanur 633108b2d7 camera 2020-01-29 01:54:07 +02:00
erorcun d75b9b8257
CPlayerPed continues (#294) 2020-01-23 23:21:50 +03:00
Nikolay Korolev 0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Fire-Head 537aaca5c2 ControllerConfig done
Fix Cam enum
2019-10-27 06:17:30 +03:00
Sergeanur 8d4cceb2e4 Fixed widescreen turning off during cutscenes 2019-10-13 22:19:51 +03:00
Sergeanur 69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
Sergeanur 96eee4f10f Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFile 2019-10-06 02:41:35 +03:00