mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-02 22:55:42 +00:00
Code Issues Projects Releases Wiki Activity
2721 commits 3 branches 0 tags 63 MiB
Commit graph

2259 commits

Author SHA1 Message Date
Nikolay Korolev
49a8dd7459
fixed typo 2020-07-03 15:21:11 +03:00
Nikolay Korolev
9bb8b39956
fixed typo 2020-07-03 15:17:02 +03:00
Nikolay Korolev
85e899c1a5
fixed typo 2020-07-03 15:15:42 +03:00
Nikolay Korolev
48ebbb7292 ice cream attractor + bike respray 2020-07-03 11:08:19 +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
aap
575f35f2c4 fixes to CBoat 2020-07-01 18:03:59 +02:00
Nikolay Korolev
389123cff3 fix 2020-07-01 16:06:16 +03:00
Nikolay Korolev
ade5dff217 script logging for miami 2020-07-01 15:43:19 +03:00
Nikolay Korolev
a1356f1001
copypaste bug 2020-07-01 15:38:32 +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
Nikolay Korolev
779d4e02a4 little fix 2020-07-01 15:12:25 +03:00
Sergeanur
8045bec6a5 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2020-06-30 19:12:06 +03:00
Sergeanur
da93b0a078 Audio fixes 2020-06-30 19:06:58 +03:00
Sergeanur
cbed027c0e Merge branch 'master' into miami 2020-06-30 08:24:05 +03:00
Sergeanur
a15f3ddb8b Fix glfw build 2020-06-30 08:08:50 +03:00
Sergeanur
87fa69385c remove TheText.Load() from CGame::Initialise 2020-06-30 07:48:09 +03:00
Sergeanur
1d2d5fe6ae Merge branch 'master' into miami 
# Conflicts:
#	src/render/MBlur.cpp
#	src/render/MBlur.h
 2020-06-30 07:45:54 +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
Sergeanur
6d396ba73b Fix MBlur 2020-06-30 07:43:20 +03:00
Filip Gawin
6cf698badd Fix glfw.cpp 2020-06-29 16:24:40 +02:00
aap
b072cbca93 cleanup 2020-06-29 12:12:52 +02: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
7b22b7e2af
Update MemoryCard.cpp 2020-06-29 11:38:30 +03:00
Fire-Head
3b3324de38 Update MBlur.cpp 2020-06-29 11:14:00 +03:00
Fire-Head
d9cb9583bf update glfw.cpp 2020-06-29 11:04:30 +03:00
Fire-Head
2f12d0e231 Update MBlur.cpp 2020-06-29 10:40:06 +03:00
Fire-Head
fcac1f9a34 fix linux build? 2020-06-29 10:36:35 +03:00
Fire-Head
63fdcf7e64 menu fixes 2020-06-29 10:29:02 +03:00
Fire_Head
0cd2ac7e5e
Update AudioLogic.cpp 2020-06-29 09:41:56 +03:00
Fire_Head
860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Nikolay Korolev
209b7891d1 Merge remote-tracking branch 'upstream/master' 2020-06-28 16:24:37 +03:00
Nikolay Korolev
920bc0a1bf fix 2020-06-28 16:24:09 +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
1f1782c587 restore Text.cpp 2020-06-28 08:32:56 +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
eray orçunus
c72fab15b4 fix anims again 2020-06-25 16:20:20 +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
fe77b2ac53 Merge remote-tracking branch 'upstream/master' 2020-06-22 14:07:49 +03:00
Nikolay Korolev
ba3fe38f2e fixes 2020-06-22 14:07:19 +03:00
Nikolay Korolev
043f09f3fb
Merge pull request #637 from Nick007J/master 
script logging
 2020-06-22 13:27:25 +03:00
aap
3989e3df18 anim fix 2020-06-22 08:58:49 +02: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
0ab4496423 copypaste 2020-06-21 13:51:20 +03: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
cc60ad1946 ducking & anim fix 2020-06-20 20:26:27 +03:00
eray orçunus
2d2833f2e4 more weapon fixes 2020-06-20 17:30:28 +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
7700970c93
Merge pull request #636 from aap/miami 
CCamera done
 2020-06-20 15:03:00 +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
Nikolay Korolev
144f12525e fix 2020-06-20 13:51:39 +03:00
Nikolay Korolev
eab6741afe fix 2020-06-20 13:26:27 +03:00
aap
4cd4f91e57 ccamera cleanup 2020-06-19 09:15:23 +02:00
Nikolay Korolev
e9e533b0cb bikes in garages + bugfix 2020-06-18 00:03:43 +03:00
eray orçunus
e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
eray orçunus
e9d5d42ea9 fix clipped subtitles 2020-06-17 11:11:44 +03:00
Nikolay Korolev
f54af8b973 fixed bar brawl 2020-06-17 02:33:03 +03:00
erorcun
d322a8033e
Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
erorcun
812b26b668
Update ModelIndices.h 2020-06-16 22:58:42 +03:00
eray orçunus
a822692c26 fix crash-VC pickup scaling 2020-06-16 22:55:28 +03:00
erorcun
7ae0b8ef06
Merge pull request #633 from aap/miami 
CCam done
 2020-06-16 20:48:46 +03:00
eray orçunus
c6bb1f5d0d some cutscene opcodes and heli guns 2020-06-16 20:35:09 +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
eray orçunus
3a600b4684 Bike anim. fix 2020-06-16 00:20:08 +03:00
aap
dc7d4e1134 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-15 22:51:47 +02:00
eray orçunus
595576b151 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-15 23:49:59 +03:00
eray orçunus
c4e129509b Peds & fixes continues 2020-06-15 23:43:20 +03: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
b77d044729 fixed boat wake 2020-06-14 09:50:00 +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
eray orçunus
3231c6c3dd ProcessTrainAnnouncements fix 2020-06-13 17:33:30 +03:00
Sergeanur
beb6f3bf80 small fixes 2020-06-13 13:57:25 +03:00
Nikolay Korolev
f78f707935 script fix 2020-06-13 02:02:59 +03:00
Nikolay Korolev
d415c4edd3
minor fix 2020-06-13 00:16:10 +03:00
aap
41dac0773f little CCam cleanup; fix in CWorld sphere test 2020-06-12 21:53:39 +02:00
Nikolay Korolev
3900366a6b debug fix 2020-06-12 22:39:33 +03:00
Nikolay Korolev
17dd26e1ca heli AI fix 2020-06-12 22:38:37 +03:00
majestic
2cc8ecbb90 removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun 2020-06-11 01:36:45 -07:00
majestic
94e3c30054 original multiplying rotational cords for minigun 2020-06-11 00:59:23 -07:00
majestic
669db1a293 minigun rotation fix 2020-06-10 23:26:51 -07:00
aap
5a961d0284 some cam cleanup; unused PS2 train cams 2020-06-10 23:50:27 +02:00
majestic
cf8fcada6e m_density renamed to m_opacity 2020-06-10 14:01:37 -07: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
aap
b07b1f0b51
Merge pull request #624 from erorcun/miami 
Peds, bike center of mass and reversing fixes
 2020-06-09 15:43:25 +02:00
eray orçunus
dba2b052a6 Peds, bike center of mass and reversing fixes 2020-06-09 01:29:55 +03:00
Sergeanur
85d845c5ce
Merge pull request #623 from Sergeanur/VC/MissionAudio 
Mission audio
 2020-06-08 17:32:57 +03:00
Sergeanur
95e9fe7693 fixes 2020-06-08 16:22:49 +03:00
Sergeanur
03f3b4fc5a remove numbers from enum 2020-06-08 14:33:10 +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
Sergeanur
5942f1a8f9 Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/render/Font.cpp
 2020-06-08 10:36:37 +03:00
Sergeanur
36a6d124aa Mission audio slots 2020-06-08 10:34:31 +03:00
Sergeanur
be9954ecc6 IsMissionAudioSamplePlaying (from VC) 2020-06-08 10:33:32 +03:00
Sergeanur
0afb1d9e24 Scale font shadow 2020-06-08 10:30:09 +03:00
Nikolay Korolev
2de3c6d67b some fixes to heli AI (not all yet) 2020-06-08 02:34:53 +03:00
Nikolay Korolev
b498ad800c Merge remote-tracking branch 'upstream/miami' into miami 2020-06-08 02:04:58 +03:00
Nikolay Korolev
d48749f797 fixed attached ped 2020-06-08 02:04:37 +03:00
eray orçunus
94e9101ce0 more fixes 2020-06-08 01:51:11 +03:00
Nikolay Korolev
16a5c2f676 fixes 2020-06-08 01:21:49 +03:00
Nikolay Korolev
af564d865c fixes 2020-06-08 01:16:21 +03:00
Nikolay Korolev
5ec46bcdfb Merge remote-tracking branch 'upstream/miami' into miami 2020-06-08 01:01:39 +03:00
eray orçunus
a77b181e32 CarCtrl fixes 2020-06-08 00:59:43 +03:00
Nikolay Korolev
5a09eeea27 more accurate code 2020-06-08 00:53:25 +03:00
eray orçunus
e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Nikolay Korolev
23f20ceaf8 fix 2020-06-07 19:35:05 +03:00
Nikolay Korolev
27eaa10873 Merge remote-tracking branch 'upstream/miami' into miami 2020-06-07 19:32:51 +03:00
Nikolay Korolev
2f9becbac6 fix 2020-06-07 19:31:15 +03:00
eray orçunus
6cc39e9bdb Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 19:13:27 +03:00
eray orçunus
88f066f469 HUD sizes 2020-06-07 19:13:12 +03:00
aap
dda9d03e54 nother bike bug 2020-06-07 17:35:22 +02:00
aap
464b232321 accidental shadowing in CBike::ProcessControl 2020-06-07 17:27:23 +02:00
Nikolay Korolev
c5a24eaf70 Merge remote-tracking branch 'upstream/miami' into miami 2020-06-07 18:20:00 +03:00
Nikolay Korolev
1748aabd69 fix 2020-06-07 18:19:44 +03:00
aap
3f5ecbe007
Merge pull request #622 from Sergeanur/VC/Font 
some font stuff
 2020-06-07 17:19:12 +02:00
Nikolay Korolev
b14e034344 fix 2020-06-07 17:52:14 +03:00
Nikolay Korolev
d0213e466c more script commands 2020-06-07 15:49:25 +03:00
Nikolay Korolev
0b156f1d26 some stats tweaks; saves dead again 2020-06-07 15:23:52 +03:00
Sergeanur
fe3a3ad8b5 cleanup 2020-06-07 15:19:29 +03:00
Nikolay Korolev
c50a61d52a fixed some arithmetic 2020-06-07 15:08:58 +03:00
Nikolay Korolev
be2291e44c fixed some arithmetic 2020-06-07 15:07:36 +03:00
eray orçunus
de4323f949 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 12:46:15 +03:00
eray orçunus
d1a02e6ddc New ped objectives 2020-06-07 12:45:53 +03:00
Nikolay Korolev
5fd330b35e making it close to original 2020-06-07 11:31:52 +03:00
aap
1234fe9c1c removed a "fix" 2020-06-07 10:24:33 +02:00
Sergeanur
a44510d1df more font 2020-06-07 10:36:37 +03:00
Sergeanur
31569d512c font fix 2020-06-07 09:10:09 +03:00
Sergeanur
91e2b427ef more font stuff 2020-06-07 05:12:01 +03:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD" 
This reverts commit 552205dfba.
 2020-06-07 05:03:06 +03:00
Sergeanur
fc7e35e1cd fixes 2020-06-07 04:20:02 +03:00
Sergeanur
24bf4c2cba Merge branch 'miami' into Font 
# Conflicts:
#	src/render/Font.cpp
#	src/render/Font.h
 2020-06-07 04:16:10 +03:00
Sergeanur
1c01899799 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
 2020-06-07 04:15:10 +03:00
Sergeanur
678a19ce3b a bit of fonts 2020-06-07 04:11:10 +03:00
Sergeanur
552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
aap
44e2fcee39 disable skidding bugfix 2020-06-07 00:03:51 +02:00
aap
5711159e68 CBike done 2020-06-07 00:01:59 +02:00
eray orçunus
db9057f5a8 fix 2020-06-06 22:24:30 +03:00
eray orçunus
096ecc1d14 Some wait states 2020-06-06 22:16:59 +03:00
eray orçunus
fc0498b3a8 CFont crash workaround 2020-06-06 19:25:37 +03:00
eray orçunus
4e4a3489ef Use KnockOffRider 2020-06-06 17:19:36 +03:00
Nikolay Korolev
e099aaaa6b minor fixes 2020-06-06 16:36:26 +03:00
aap
d6640832f1 bla 2020-06-06 14:43:35 +02:00
aap
ef4f8ec713 more CBike functions 2020-06-06 14:42:42 +02:00
aap
c0481e7207 CBike::KnockOffRider 2020-06-06 13:22:55 +02:00
Nikolay Korolev
3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +03:00
Nikolay Korolev
408f47fc9d fixed linux saving 2020-06-06 12:58:10 +03:00
Sergeanur
afa4fa6510 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/soundlist.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/peds/Ped.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Vehicle.h
 2020-06-06 08:42:58 +03:00
Sergeanur
2016cd54b0 ps2 audio banks 2020-06-06 03:45:24 +03:00
aap
68caac1abd
Merge pull request #617 from majesticCoding/miami 
some original VC's cheats and comparator for them
 2020-06-05 23:43:15 +02:00
majestic
f014b29fc4 Update Pad.cpp 2020-06-05 14:31:17 -07:00
majestic
66262b14ad Update Pad.cpp 2020-06-05 14:20:29 -07:00
eray orçunus
d3736ccb17 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-05 23:20:16 +03:00
eray orçunus
f045ce4386 Bike riding anims, SA bike/heli cam 2020-06-05 23:13:34 +03:00
aap
1bfb01d5f5 a bit more CBike 2020-06-05 15:09:45 +02:00
aap
98de658c8f
Merge pull request #619 from ShFil119/heads 
Fix collision with peds heads
 2020-06-05 13:43:07 +02:00
Nikolay Korolev
83e4023dc0 fix 2020-06-05 12:59:27 +03:00
Sergeanur
147dca44fa ProcessTrainAnnouncements 2020-06-05 11:27:33 +03:00
Nikolay Korolev
d325a3d247 basic bike support in traffic, script and car gen; some heli AI 2020-06-05 11:22:15 +03:00
majestic
e2cc3e1a33 some original VC's cheats and comparator for them 2020-06-04 18:19:53 -07:00
aap
647fd951ec more CBike 2020-06-05 00:24:42 +02:00
aap
7f0474e9de
Merge pull request #615 from majesticCoding/miami 
some orig chearts
 2020-06-04 21:50:00 +02:00
aap
f7612c4a49 forgot to delete debug code 2020-06-04 17:49:27 +02:00