Commit Graph

824 Commits

Author SHA1 Message Date
Sergeanur
e373d0526e Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-15 00:10:50 +03:00
Nikolay Korolev
fbed2c4530 fix debug stuff 2020-04-14 20:12:26 +03:00
Nikolay Korolev
f2c78e4bfb Merge branch 'master' into game_dev 2020-04-14 20:10:39 +03:00
Sergeanur
7f8a4b4867 Debug font and CProfiles 2020-04-14 10:31:37 +03:00
erorcun
313f547860
Some cleanup 2020-04-14 03:21:16 +03:00
Nikolay Korolev
f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
Nikolay Korolev
1c592c26f9 review fix 2020-04-13 21:57:13 +03:00
Nikolay Korolev
3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
Nikolay Korolev
cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
erorcun
0e056a8e01
Merge pull request #412 from whampson/save-stuff
GenericLoad() done
2020-04-13 21:49:57 +03:00
Wes Hampson
a19d5dbee1 Fixes 2020-04-13 11:20:57 -07:00
erorcun
e2fb0578b5
Merge pull request #413 from erorcun/erorcun
CFileLoader last funcs and Frontend cleanup
2020-04-13 15:36:05 +03:00
erorcun
c008eb2431
Merge pull request #410 from Sergeanur/PacManPickups
CPacManPickups
2020-04-13 12:51:30 +03:00
Sergeanur
741c9405d0 CPacManPickups 2020-04-13 12:07:07 +03:00
eray orçunus
60c412149d CFileLoader last funcs and Frontend cleanup 2020-04-13 05:42:02 +03:00
aap
3aae52d220 finished CBoat 2020-04-13 00:20:44 +02:00
erorcun
a622c9e877
Merge pull request #409 from erorcun/erorcun
Frontend fixes + triangle for back as default
2020-04-12 20:24:57 +03:00
eray orçunus
8b2138f7bd Frontend fixes + triangle for back as default 2020-04-12 20:22:28 +03:00
Nikolay Korolev
e71b000cc5 Merge branch 'master' into game_dev 2020-04-12 12:13:32 +03:00
Nikolay Korolev
1732f9b5c6 obviously forgot about it 2020-04-12 12:10:25 +03:00
Nikolay Korolev
cbb298c8dd sync with master 2020-04-12 12:08:30 +03:00
Nikolay Korolev
04c9affe2e scene init 2020-04-12 12:06:33 +03:00
Nikolay Korolev
fa0f5542cc
Merge pull request #402 from Nick007J/master
Record
2020-04-12 12:06:12 +03:00
eray orçunus
1932d98482 CDebug fix 2020-04-12 01:33:04 +03:00
erorcun
207aebc46c
Merge pull request #400 from erorcun/erorcun
CMenuManager done and CHud fixes
2020-04-12 00:57:46 +03:00
eray orçunus
f2995640bd CMenuManager done and CHud fixes 2020-04-12 00:56:27 +03:00
Sergeanur
daceee593b Link with RW libs 2020-04-11 23:37:04 +03:00
Nikolay Korolev
d010f6255a Merge branch 'master' into garages_dev 2020-04-11 21:02:31 +03:00
Nikolay Korolev
fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
Nikolay Korolev
38dee74a5a CPools 2020-04-11 21:01:39 +03:00
Sergeanur
0ddc04743c Fix cutscene camera latency 2020-04-11 13:21:21 +03:00
Nikolay Korolev
c8ac25ebfd Merge branch 'master' into garages_dev 2020-04-11 02:04:56 +03:00
Nikolay Korolev
92b6d775d6 Record 2020-04-11 02:03:42 +03:00
Sergeanur
f1413c4776 fixing r* visioned leak 2020-04-11 00:36:11 +03:00
Nikolay Korolev
be260b49b1 Merge branch 'master' into garages_dev 2020-04-10 21:17:00 +03:00
aap
c5d61392ea implemented CTrafficLights 2020-04-10 18:36:39 +02:00
Sergeanur
b76172e2dd PlayerSkin small cleanup 2020-04-10 11:41:48 +03:00
Sergeanur
8917567508 Fixing mixed IsCutsceneProcessing and IsRunning 2020-04-10 11:23:35 +03:00
Nikolay Korolev
917fa80c18 record init 2020-04-10 11:03:38 +03:00
Sergeanur
6647312660 Fix sprite vertical scale 2020-04-10 10:52:47 +03:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
Sergeanur
a5239b554f Merge remote-tracking branch 'Fire-Head/master'
# Conflicts:
#	src/core/Radar.cpp
2020-04-09 21:40:46 +03:00
aap
5b5de5d2f3
Merge pull request #393 from Sergeanur/txdimg
txd.img creator
2020-04-09 20:37:53 +02:00
aap
d8cf6258b7
Merge pull request #395 from aap/master
fixed questionable RW usage; changed radar mask to PS2 technique
2020-04-09 20:35:04 +02:00
Sergeanur
6cfc31510d CStats finished 2020-04-09 20:15:45 +03:00
aap
6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
aap
6297a9da11
Merge pull request #391 from Sergeanur/Cheats
Cheats
2020-04-09 12:30:23 +02:00
aap
a6d449a2f4
Merge pull request #390 from Sergeanur/Explosion
Finished CExplosion
2020-04-09 12:30:13 +02:00
aap
ee057cb427
Merge pull request #389 from Nick007J/master
Weather
2020-04-09 12:30:02 +02:00
Sergeanur
cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
Sergeanur
fd2152923c txd.img creator 2020-04-09 10:28:50 +03:00
Fire-Head
590ff32469 PS2 Cheats, restored R*names 2020-04-09 06:20:44 +03:00
Fire-Head
c97ff5b31a cleanup 2020-04-09 03:06:43 +03:00
Fire-Head
3769170113 (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode 2020-04-09 02:52:38 +03:00
Sergeanur
e6476bafff Cheats 2020-04-09 00:17:14 +03:00
aap
9176aef1b2 Merge branch 'master' of github.com:gtamodding/re3 2020-04-08 18:45:55 +02:00
aap
6288d36f34 implemented CSkidmarks 2020-04-08 16:35:23 +02:00
Nikolay Korolev
b075b0fccf Merge branch 'master' into garages_dev 2020-04-08 14:26:07 +03:00
Sergeanur
7439d6482f Reverting tabs back to spaces for aap 2020-04-08 10:26:31 +03:00
Sergeanur
7eee938de2 Reverting tabs back to spaces for aap 2020-04-08 10:22:34 +03:00
aap
f89df29001
Merge pull request #385 from aap/master
implemented CRubbish, CShinyTexts, CBrightLights, CMotionBlurStreaks, CSpecialFX
2020-04-08 09:12:49 +02:00
Sergeanur
560fc65538 Small camera fixes 2020-04-08 09:58:08 +03:00
Nikolay Korolev
e556ffd3f6 fixes 2020-04-08 01:52:08 +03:00
aap
daaf443cfa finished CMotionBlurStreaks, CSpecialFX 2020-04-07 22:26:01 +02:00
eray orçunus
cf8249fa05 Menu map changes
- new texture by AG
- map now centers when zoomed out too much
- background darkened a bit
- mouse wheel up/down switched
- cross add target on gamepad
- LeftStickY inverted
2020-04-07 23:20:23 +03:00
eray orçunus
1f8e073c0a Menu map 2020-04-07 20:18:24 +03:00
aap
51512db006 implemented CRubbish 2020-04-07 17:16:58 +02:00
aap
1207c2ce6f implemented CShinyTexts 2020-04-07 12:33:14 +02:00
aap
f192d7052e finished CCollision 2020-04-06 20:32:44 +02:00
aap
de706d1471 fixed typo 2020-04-06 18:49:51 +02:00
aap
f2b3be5da2
Merge pull request #379 from erorcun/erorcun
Frontend (last-3)
2020-04-06 18:37:17 +02:00
aap
f8465e0f66
Merge pull request #381 from aap/master
PS2 Frontend Controls
2020-04-06 18:36:19 +02:00
Nikolay Korolev
4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev
cf804dee91 Merge remote-tracking branch 'upstream/master' 2020-04-06 19:28:04 +03:00
Nikolay Korolev
b991fd9766
Merge branch 'master' into master 2020-04-06 19:26:04 +03:00
Nikolay Korolev
7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
aap
cbbe722b70 PS2 Frontend Controls 2020-04-05 21:21:53 +02:00
Sergeanur
4fc2f9c359 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 17:03:59 +03:00
aap
27f95d905c fixed look behind bug 2020-04-05 15:27:30 +02:00
aap
5e9ae94298
Merge pull request #378 from aap/master
finished CCamera
2020-04-05 14:30:28 +02:00
Nikolay Korolev
9436b5a8a5 Merge branch 'master' into garages_dev 2020-04-05 12:47:27 +03:00
Nikolay Korolev
057b28e39b cranes init 2020-04-05 12:35:51 +03:00
Sergeanur
2aace31b06 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 12:03:13 +03:00
Sergeanur
c0c09f2720 Japanese 2020-04-05 12:02:51 +03:00
eray orçunus
bd7a59e58e Frontend (last-3) 2020-04-04 14:49:19 +03:00
aap
3b315fec26 Merge branch 'master' of github.com:gtamodding/re3 2020-04-03 11:49:33 +02:00
aap
f56909d8b7
Merge pull request #377 from Fire-Head/master
Glass
2020-04-03 11:49:08 +02:00
aap
7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
Sergeanur
6e6912b613 fixes 2020-04-02 09:20:45 +03:00
Fire-Head
13fb853fd8 Glass done 2020-04-02 00:04:56 +03:00
Sergeanur
409663adb8 timebars 2020-03-31 16:11:45 +03:00
aap
a57d9b6797
Merge pull request #373 from erorcun/erorcun
Mouse free cam for peds&cars (under FREE_CAM)
2020-03-31 10:29:35 +02:00
eray orçunus
5e2fe749bd Mouse free cam for peds&cars (under FREE_CAM) 2020-03-31 06:05:49 +03:00
Sergeanur
2607a91d87 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-03-30 20:10:12 +03:00
Sergeanur
bb8868eba7 Add russian lang support 2020-03-30 14:50:14 +03:00
aap
8e3ee096e2
Merge pull request #366 from Nick007J/master
Garage part 1
2020-03-29 19:12:53 +02:00
erorcun
6704a62b32
Merge pull request #369 from erorcun/erorcun
CShotInfo, CWanted done, Frontend fix
2020-03-29 19:03:59 +03:00
eray orçunus
a3b519ea64 CShotInfo, CWanted done, Frontend fix 2020-03-29 19:02:26 +03:00
Nikolay Korolev
3a4e2275de fixed PS2 build 2020-03-29 18:53:58 +03:00
Nikolay Korolev
24b8c7819c merge with upstream 2020-03-29 18:51:18 +03:00
Fire_Head
a0b077574e
Merge branch 'master' into master 2020-03-29 18:39:47 +03:00
aap
82dcc34296
Merge pull request #367 from Sergeanur/wrappers_cleanup
Wrappers cleanup
2020-03-29 16:27:42 +02:00
Fire-Head
7b95dcc219 style & cosmetic fixes 2020-03-29 16:35:50 +03:00
Fire-Head
d53c151ffc style & cosmetic fixes 2020-03-29 16:32:11 +03:00
aap
ac097e6fc7 rotating FollowPed cam (disabled by default for now) 2020-03-29 14:07:38 +02:00
Sergeanur
97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
Sergeanur
db92864fe2 Fire and PlayerSkin fix 2020-03-29 08:51:30 +03:00
Fire-Head
194ddc5f40 CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names 2020-03-28 23:55:23 +03:00
Nikolay Korolev
92edf92570 Merge branch 'master' into garages_dev 2020-03-28 23:42:11 +03:00
aap
8623bc9752
Merge pull request #360 from ShFil119/impr/assembly
Cleanup patching system
2020-03-28 20:01:18 +01:00
Filip Gawin
b235c35834 Cleanup patching system 2020-03-28 19:46:09 +01:00
Nikolay Korolev
101c21e064 merge with master 2020-03-28 20:55:15 +03:00
Nikolay Korolev
775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
erorcun
c056871e07
Merge pull request #363 from erorcun/erorcun
CCopPed done and #include cleanup
2020-03-28 19:12:22 +03:00
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
aap
2833a08b96 CCam fix 2020-03-28 16:29:34 +01:00
Nikolay Korolev
9fb101fdd9 Merge branch 'master' into garages_dev 2020-03-28 15:24:55 +03:00
Nikolay Korolev
268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
aap
739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
aap
6a14457614 Merge branch 'master' of github.com:gtamodding/re3 2020-03-28 09:34:25 +01:00
aap
f5195ca185 CCam fix 2020-03-28 09:34:04 +01:00
Sergeanur
c953230237 Set Xinput version to 9.1.0 + vibration set 2020-03-28 04:53:42 +02:00
Filip Gawin
184a80cc3b Remove assembly from patcher.h 2020-03-27 21:25:39 +01:00
aap
e7c18fc17f removed windows.h for most .cpps 2020-03-27 20:53:47 +01:00
Sergeanur
43b092033c XInput 2020-03-27 21:20:57 +02:00
aap
29f69f6216
Merge pull request #357 from aap/master
Finished CCam; various smaller things
2020-03-27 18:41:22 +01: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
erorcun
9e49e5c2bd
Merge pull request #356 from blingu/master
CFire and CFireManager classes nearly done
2020-03-26 19:30:34 +03:00
blingu
79822e3f7c
Update Fire.cpp 2020-03-26 17:11:04 +01:00
blingu
853b2d0c78
Update Fire.cpp 2020-03-26 17:05:01 +01:00
blingu
edc92a7bcc
Update Fire.cpp 2020-03-26 17:00:58 +01:00
eray orçunus
0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03:00
blingu
a66db9efcb
Update Fire.cpp 2020-03-25 23:01:22 +01:00
blingu
09af0bcaf8
Update Fire.cpp 2020-03-25 22:54:14 +01:00
blingu
c3841fe5b4
m_snTimeInMilliseconds to GetTimeInMilliseconds() 2020-03-25 21:24:32 +01:00
blingu
96802f9b95
Update Fire.cpp 2020-03-25 21:13:06 +01:00
blingu
08e1c869a4
renamed field_24 to m_nNextTimeToAddFlames 2020-03-25 21:09:27 +01:00
blingu
e22ce9404c
Update Fire.cpp 2020-03-25 21:07:07 +01:00
blingu
0605e704ca
Update Fire.h 2020-03-25 21:01:38 +01:00
blingu
834f4f6d4c
Update Fire.h 2020-03-25 21:01:10 +01:00
blingu
ea9e45fcda
Update Fire.cpp 2020-03-25 21:00:38 +01:00
PerikiyoXD
1622973ffa Implement Init for Stats 2020-03-24 19:50:08 +01:00
blingu
c03bae46ea
Update Fire.cpp 2020-03-24 18:12:53 +01:00
blingu
1680d11dae
Update Fire.h 2020-03-24 17:25:14 +01:00
blingu
43fb59e356
Update Fire.h 2020-03-24 17:24:47 +01:00
Sergeanur
a12c01e10a obrstr + Debug 2020-03-24 09:56:37 +02:00
Nikolay Korolev
861506d048 merge with upstream 2020-03-22 19:47:14 +03:00
Filip Gawin
a097f225bc Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin
c88c2115e2 Remove unneeded double to float casts 2020-03-22 17:30:54 +01:00
Filip Gawin
8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
Filip Gawin
7c425ac4ac Implement ProcessGarages + small cleanup 2020-03-22 17:30:54 +01:00
Filip Gawin
67398809a3 Implement ProcessFires 2020-03-22 17:30:54 +01:00
Nikolay Korolev
d1d123dc6a missing endlines 2020-03-22 19:19:07 +03:00
Nikolay Korolev
360d9cf889 merge with master 2020-03-22 17:26:18 +03:00
Nikolay Korolev
34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03:00
Sergeanur
5e37c3e805 Console 2020-03-22 16:19:10 +02:00
aap
f9342c7e83
Merge pull request #350 from Nick007J/master
bullet traces
2020-03-22 14:41:03 +01:00
aap
398cc6bbec fixed vehicle rendering bug 2020-03-22 11:40:18 +01:00
Nikolay Korolev
7d213a1f32 bullet traces fixes 2020-03-22 13:20:36 +03:00
eray orçunus
d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
erorcun
53e65a32cd
Merge branch 'master' into Radar2 2020-03-17 20:46:37 +03:00
erorcun
7aa5d16b53
Merge pull request #347 from Nick007J/master
replay fixes + script crash fix
2020-03-17 20:41:59 +03:00
erorcun
1ab6702ea6
Merge pull request #345 from whampson/save-stuff
GenericSave() done
2020-03-17 20:35:18 +03:00
Sergeanur
e57ad65d05 Finished CRadar, a bit of CExplosion 2020-03-17 00:22:43 +02:00
Nikolay Korolev
1971b3db62 Merge remote-tracking branch 'upstream/master' 2020-03-15 18:47:36 +03:00
Nikolay Korolev
152d8c2f40 replay bug fixes, script bug fix 2020-03-15 18:47:21 +03:00
Wes Hampson
afeac54860 Spacing fix 2020-03-13 13:50:23 -07:00
Wes Hampson
8280dda9cb Add CTimeStep 2020-03-13 13:46:59 -07:00
eray orçunus
934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +03:00
Wes Hampson
018fb3a929 Style fixes 2020-03-11 14:15:27 -07:00
Wes Hampson
c7f16879df GenericSave complete, still needs some testing 2020-03-11 00:12:40 -07:00
Wes Hampson
28342405d3 Add Load/Save functions 2020-03-10 20:26:07 -07:00
Wes Hampson
4fee2cbdd9 Begin work on GenericSave 2020-03-05 01:44:42 -08:00
eray orçunus
a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
Nikolay Korolev
ceab73a053 merge with upstream 2020-03-01 14:19:42 +03:00
eray orçunus
750d3229a3 CPopulation 3 and fixes 2020-02-27 19:38:35 +03:00
Nikolay Korolev
56c83dfaae more stuff + intro fix 2020-02-24 21:17:15 +03:00
Nikolay Korolev
6260d51d44 Merge branch 'master' into script_dev 2020-02-24 12:10:59 +03:00
Nikolay Korolev
1ba696f5fc some changes 2020-02-23 13:12:44 +03:00
aap
f8cd12ffb3
Merge pull request #333 from Nick007J/master
script 1000-1154
2020-02-23 11:00:15 +01:00
eray orçunus
b2d062ef2d some fixes 2020-02-23 01:48:21 +03:00
Nikolay Korolev
a312e1ff81 merge 2020-02-22 15:36:22 +03:00
eray orçunus
090aef7de7 CPopulation 2 2020-02-19 21:14:17 +03:00
erorcun
16ea0527dd
Merge pull request #328 from erorcun/erorcun
CPopulation 1
2020-02-17 23:02:58 +03:00
eray orçunus
ff92b822b6 CPopulation 1 2020-02-17 15:57:50 +03:00
Nikolay Korolev
1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev
a361fc0ff5 sync with upstream 2020-02-15 14:54:46 +03:00
Nikolay Korolev
043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
eray orçunus
f307839a2b CPlayerPed done 2020-02-13 22:02:45 +03:00
Sergeanur
a3e5ccde47 cMusicManager 2020-02-07 02:30:00 +02:00
Sergeanur
f1863676bb CullZone fix 2020-02-04 22:21:45 +02:00
eray orçunus
03b995c6ef Some fixes and some cosmetic things 2020-02-02 16:58:52 +03:00
Nikolay Korolev
dc2516896f script 900-999 init 2020-02-02 14:47:03 +03:00
Sergeanur
afd6b43ffb Fixed wrong slot indexing in Frontend 2020-01-31 17:16:32 +02:00
aap
5794732ad4
Merge pull request #299 from Sergeanur/PedIK
CPedIK finished, bit of CCamera
2020-01-31 12:57:43 +01:00
aap
8b367e8d18
Merge pull request #298 from Sergeanur/save
save
2020-01-31 12:57:25 +01:00
Sergeanur
43bd2227a8 CRemote 2020-01-31 12:23:15 +02:00
Sergeanur
2c8cce4655 suggested fixes 2020-01-30 18:15:27 +02:00
Sergeanur
81de0e0cbd acos 2020-01-29 13:00:40 +02:00
Sergeanur
633108b2d7 camera 2020-01-29 01:54:07 +02:00
Sergeanur
fa4dbcab35 save 2020-01-27 18:22:51 +02:00
Sergeanur
0525e3930b Fix invert mouse on/off 2020-01-26 21:54:20 +02:00
Sergeanur
da253837d1 audio stuff
Collision audio and police radio stuff moved to a separate cpp's like in the original code
cPoliceRadioQueue added, code refactored correspondingly
cAudioManager::ServiceCollisions reversed
PlayOneShotScriptObject reversed
cAudioScriptObject moved to AudioScriptObject.cpp
Fixed use of numbers on non-integer types (bools, pointers)
enum is now used for ped audio calculation
Added fixes for vehicle description in the police radio (missing vehicles and wrong colors)
2020-01-25 12:48:27 +02:00
erorcun
d75b9b8257
CPlayerPed continues (#294) 2020-01-23 23:21:50 +03:00
Sergeanur
b06ad84768 Fixing possible leaks in CModelInfo::ShutDown 2020-01-23 20:08:42 +02:00
Sergeanur
9eb599ff58 Plane crashfix and more 2020-01-23 17:29:36 +02:00
Sergeanur
77515f04e0 ConstructMloClumps 2020-01-21 09:47:24 +02:00
Sergeanur
06904755d9 Refactor CCullZone::CalcDistToCullZoneSquared 2020-01-20 23:27:57 +02:00
Sergeanur
7857590990 Atan2 and Sqrt 2020-01-20 23:21:51 +02:00
Sergeanur
669374ec1a disable cullzone writer 2020-01-20 23:11:12 +02:00
Sergeanur
82becdc955 CullZone.dat writer start 2020-01-20 23:08:34 +02:00
Sergeanur
a9f39d8284 MLO, XtraCompsModelInfo, MovingThing, Solid 2020-01-20 22:58:13 +02:00
aap
9d3c73156b
Merge pull request #290 from Sergeanur/ProjectileInfo
ProjectileInfo
2020-01-12 23:19:55 +01:00
Sergeanur
d409f64980 Fixes 2020-01-12 13:31:04 +02:00
erorcun
2d00d7b3e2
Merge pull request #291 from Sergeanur/AccidentManager
AccidentManager
2020-01-12 02:11:47 +03:00
eray orçunus
5d119cf985 Fixes 2 2020-01-11 20:36:46 +03:00
Sergeanur
bbc68ffb1c AccidentManager 2020-01-11 15:14:02 +02:00
Sergeanur
8fab684283 move 2020-01-11 14:49:37 +02:00
erorcun
6af77d8514
Merge pull request #289 from erorcun/erorcun
Fixes
2020-01-11 02:02:09 +03:00
eray orçunus
8a745e4d89 Fixes 2020-01-11 01:48:05 +03:00
Sergeanur
d89d5f0d9a CUserDisplay, CPlaceName, CCurrentVehicle 2020-01-07 19:10:17 +02:00
Sergeanur
208754ac68 Finishing CDarkel 2020-01-07 17:30:29 +02:00
erorcun
f9316d9cc3
CPlayerPed & CMenuManager (#286)
Make Frontend great again!
2020-01-07 17:23:09 +03:00
Nikolay Korolev
0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Nikolay Korolev
42ff0f7c58 bug fixes 2020-01-01 23:55:01 +03:00
Nikolay Korolev
c05c516ce7 Merge remote-tracking branch 'upstream/master' into script_dev 2020-01-01 16:01:06 +03:00
Nikolay Korolev
a19a6a7c0f fixed vehicle enter crash 2020-01-01 15:59:08 +03:00
Nikolay Korolev
402ecd6305 fix merge with upstream 2020-01-01 02:55:00 +03:00
Nikolay Korolev
90233baffe fix merge 2020-01-01 02:44:13 +03:00
Nikolay Korolev
5b0cf80a76 merge with upstream 2020-01-01 02:42:00 +03:00
Nikolay Korolev
80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
eray orçunus
6cbf1db519 CPlayerInfo done 2019-12-16 07:48:44 +03:00
eray orçunus
dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +03:00
Fire_Head
c07272dfa0
fixed mouse binding 2019-12-01 01:02:34 +03:00
eray orçunus
680fe0f7e6 CCivilianPed done & restore peds running to phone 2019-11-26 02:35:05 +03:00
eray orçunus
bd68b56b5d CPed completed!
And a few fixes
2019-11-21 00:05:10 +03:00
eray orçunus
be7d1d1a63 Frontend, Peds & logic and overflow fixes 2019-11-12 23:34:28 +01:00
Sergeanur
5f92e74086 fixes 2019-11-11 16:04:06 +01:00
Sergeanur
5ba7a1b0c0 TempColModels 2019-11-11 16:04:06 +01:00
erorcun
0df15bb73d
Merge pull request #263 from Sergeanur/strcmp
Implemented faststrcmp, faststricmp, strcasecmp
2019-11-09 18:06:20 +03:00
erorcun
f6f925fb50
Readme revision (#268) 2019-11-07 01:53:54 +03:00
eray orçunus
d5619fb5ae Peds & a few fixes 2019-11-05 03:52:06 +03:00
eray orçunus
1b8533f256 Renderer fixes 2019-11-03 02:13:29 +03:00
erorcun
34090ab4d6
Merge pull request #255 from Nick007J/master
script 500-599
2019-10-30 03:20:15 +03:00
Sergeanur
c202fc3b55 Implemented faststrcmp, faststricmp, strcasecmp 2019-10-30 01:35:31 +02:00
Sergeanur
c075b863d2 CRadar::Initialise() + fixes 2019-10-30 01:18:01 +02:00
Sergeanur
74ca8bb608 Fixed settings loading, added TopLineEmptyFile 2019-10-30 01:14:59 +02:00
Sergeanur
d84033a710 Small CPad fixes 2019-10-29 17:21:02 +02:00
Filip Gawin
a2e59564c8 Implement PreloadMissionAudio + small fixes 2019-10-27 22:46:37 +01:00
Sergeanur
ce53c4a00a const fix 2019-10-27 13:46:58 +02:00
Sergeanur
7b26bfdd76 Simplify CControllerConfigManager::InitialiseControllerActionNameArray 2019-10-27 13:40:28 +02:00
Fire_Head
ff02fc1a19
fix Pad.h 2019-10-27 07:43:58 +03:00
Fire_Head
6a46cc6c3b
Merge branch 'master' into master 2019-10-27 06:36:58 +03:00
Fire-Head
537aaca5c2 ControllerConfig done
Fix Cam enum
2019-10-27 06:17:30 +03:00
Nikolay Korolev
3dee880c29 merge 2019-10-26 17:20:31 +03:00
Sergeanur
428b407ad5 A bit more enums for ChangeMusicMode 2019-10-26 16:02:59 +03:00
Sergeanur
d5a72fa597 Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode 2019-10-26 15:20:12 +03:00
Sergeanur
832572664c Added timing to RwTextureGtaStreamRead 2019-10-26 14:40:52 +03:00
Filip Gawin
8808e6fdfe Fixes for aap review (audio8) 2019-10-26 13:05:00 +02:00
Filip Gawin
d822417cfc Fixes for nitpicks 2019-10-26 13:05:00 +02:00
Filip Gawin
d2941b0368 More audio (to hook and test) 2019-10-26 13:05:00 +02:00
Filip Gawin
003ac856c6 More work 2019-10-26 13:05:00 +02:00
Filip Gawin
12ee71e4f7 audio7 2019-10-26 13:05:00 +02:00
eray orçunus
2d998b2416 Fixes&Peds 2019-10-25 22:17:55 +03:00
erorcun
d61430fbba
Merge pull request #247 from Sergeanur/3dMarkers
Full C3dMarkers
2019-10-24 00:45:16 +03:00
erorcun
1ef0f8fdd9
Merge pull request #252 from Sergeanur/MessagesPagerText
Full CMessages, full CPager, CText fixes
2019-10-24 00:45:05 +03:00
Nikolay Korolev
d579ee1b64 script 500-599 plus bugfix 2019-10-22 00:39:59 +03:00
Sergeanur
8baf410669 CGame::FinalShutdown 2019-10-21 16:47:08 +03:00
Sergeanur
4844b3a3f8
Merge pull request #246 from Sergeanur/Pools
Some CPool and CPools funcs, restoring original logic of pool lookup loops
2019-10-21 16:09:44 +03:00
Sergeanur
e35780df43 Full Messages 2019-10-21 01:11:47 +03:00
Sergeanur
c97a28b385 Full CPager 2019-10-20 20:34:16 +03:00
Sergeanur
383f70d1e7 Move Messages 2019-10-20 20:33:16 +03:00
Sergeanur
bc0ddc6b18 CText encoding fixes 2019-10-20 20:31:59 +03:00
aap
0759dbc1e1
Merge pull request #248 from Nmzik/master
CPopulation::Initialise() && CGame::Process() && CGame::ReloadIPLs()
2019-10-20 14:33:43 +02:00
Sergeanur
9d4140734f Moved CCutsceneMgr::ms_cutsceneProcessing to private 2019-10-19 16:47:30 +03:00
nmzik
86284ee7f9 typo fix 2019-10-19 14:20:51 +03:00
nmzik
49ce64d6ac getter and enum fix 2019-10-19 14:12:18 +03:00
nmzik
f56684d04e CGame::Process() && CGame::ReloadIPLs 2019-10-19 01:23:40 +03:00
Sergeanur
3ff7fc8355 Fixed nasty warnings 2019-10-17 17:28:24 +03:00
Sergeanur
3ba57c5f6a Gangs save and missed sound enums 2019-10-17 13:21:31 +03:00
Sergeanur
8987934123 Full C3dMarkers 2019-10-17 02:39:01 +03:00
Sergeanur
5b1ffb0912 Some CPool and CPools funcs, restoring original logic of pool lookup loops 2019-10-17 00:53:25 +03:00
Nikolay Korolev
f93285df79 Merge remote-tracking branch 'upstream/master' into script_dev 2019-10-14 00:44:48 +03:00
Sergeanur
8d4cceb2e4 Fixed widescreen turning off during cutscenes 2019-10-13 22:19:51 +03:00
Nikolay Korolev
8eda735918 400-499 2019-10-13 14:46:09 +03:00
Sergeanur
0600edd49d Fixed save game Load/Save failed assertion on Debug build 2019-10-12 00:06:30 +03:00
Sergeanur
0408b30a9f
Merge pull request #229 from Sergeanur/SaveLoadTemplates
Added read/write template functions for save data
2019-10-11 01:51:25 +03:00
Sergeanur
c83cf31910 CalculateBoundingSphereRadiusCB 2019-10-10 19:07:16 +03:00
Sergeanur
101192dd32 Added read/write template functions for save data, small Load/Save arguments unification 2019-10-08 23:07:11 +03:00
Sergeanur
69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
Sergeanur
9fa799522e Fixing typo for cursor coords 2019-10-07 15:33:21 +03:00
Sergeanur
1df8e7976f Aspect ratio fix for player skin menu 2019-10-07 15:08:39 +03:00
eray orçunus
c9d92a7d1b Little fix 2019-10-07 01:13:18 +03:00
eray orçunus
d5d1c7ec5f Peds 2019-10-07 00:39:25 +03:00
Sergeanur
fe2ae13c80 Fixed player blip heading when looking left/right/behind 2019-10-06 02:42:22 +03:00
Sergeanur
96eee4f10f Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFile 2019-10-06 02:41:35 +03:00
erorcun
c7d3b302f5
Merge pull request #225 from erorcun/erorcun
Fixes
2019-10-05 21:54:39 +03:00
eray orçunus
42fbe50739 Fixes 2019-10-05 21:50:02 +03:00
aap
c06f139530
Merge pull request #223 from Sergeanur/fix/WideCorona
Corona widescreen fix
2019-10-05 17:17:29 +02:00
Sergeanur
365f9e9caf Triangular radar blips 2019-10-05 17:32:01 +03:00
eray orçunus
aa4e7ad5eb CDarkel, walkaround fix 2019-10-05 17:06:01 +03:00
Sergeanur
cc621ba099 Corona widescreen fix 2019-10-05 16:04:27 +03:00
eray orçunus
54f36ad960 Fix radar 2019-10-04 01:19:07 +03:00
Sergeanur
72e12f6aae CPickups 2019-10-03 22:37:13 +03:00
Sergeanur
5b119ca78d Added missed config.h 2019-10-03 13:21:00 +03:00
eray orçunus
0ee5a46f71 Fixes & peds 2019-10-03 04:02:02 +03:00
Sergeanur
90f085c1ca zero check 2019-09-28 22:07:05 +03:00
Sergeanur
5854016ec5 PlayerSkin 2019-09-28 21:49:41 +03:00
Sergeanur
b13c4de6a4 Added CUTSCENEDIRSIZE to Config enum and CUTSCENENAMESIZE macro 2019-09-28 18:16:52 +03:00
Sergeanur
ef65ad81ce Added f for floats, removed checks for delete 2019-09-28 18:01:05 +03:00
Sergeanur
45ead4d0bf Refactoring 2019-09-28 17:31:14 +03:00
Sergeanur
6362ceeff3 Full CCutsceneMgr 2019-09-28 17:03:00 +03:00
eray orçunus
0c385195d8 Peds, ProcessObjective and fixes 2019-09-27 00:01:50 +03:00
eray orçunus
0f9178568b Peds, a fix and a tad of VC 2019-09-17 23:22:34 +03:00
Nikolay Korolev
368ce0d4e5 CCarCtrl 2019-09-15 02:28:07 +03:00
Nikolay Korolev
fbe09534d9 fix typo 2019-09-14 20:58:09 +03:00
Nikolay Korolev
3e71c15b33 Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-09-12 19:15:13 +03:00
Nikolay Korolev
4041159855
fixed launch in space bug 2019-09-12 19:13:32 +03:00
aap
dec134c881
Merge pull request #205 from erorcun/erorcun
Little cleanup
2019-09-12 14:39:47 +02:00
eray orçunus
643f8e14a0 Little cleanup 2019-09-12 15:35:05 +03:00
Nikolay Korolev
571e65db4f Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-09-12 13:12:22 +03:00
Nikolay Korolev
a3aea359b2 DragCarToPoint 2019-09-12 13:11:13 +03:00
aap
4299e307d6
Merge pull request #204 from erorcun/erorcun
World and Peds
2019-09-12 10:08:15 +02:00
eray orçunus
14c7c1d7ca World and Peds 2019-09-12 03:46:15 +03:00
Nikolay Korolev
05b01c5ff5 ccarctrl 2019-09-11 21:42:34 +03:00
eray orçunus
0f028edae9 Fix and cancellable car enter 2019-09-05 23:07:37 +03:00
eray orçunus
e232b664be CPed::ProcessControl and some cleanup 2019-09-03 23:05:17 +03:00
Filip Gawin
01ac2929cd Cleanup 2019-08-27 22:29:23 +02:00
Filip Gawin
2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
Filip Gawin
458fc63f01 Cleanup 2019-08-27 21:14:28 +02:00
Filip Gawin
af5bd951ae More audio ped 2019-08-27 21:13:17 +02:00
eray orçunus
e5df72a1e9 Peds 2019-08-23 01:53:53 +03:00
eray orçunus
39223901bf AnimViewer messages, Particle fix, Peds 2019-08-17 22:21:10 +03:00
eray orçunus
cf8b27c453 Little CPed fixes & Peddebug 2019-08-16 19:25:02 +03:00
eray orçunus
82dc813ab3 AnimViewer fixes 2019-08-15 18:59:09 +03:00
eray orçunus
8f18f84836 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-08-15 17:54:49 +03:00
eray orçunus
5bea16c7cc AnimViewer! 2019-08-15 17:51:39 +03:00
Fire_Head
6909fa283a
Merge branch 'master' into master 2019-08-15 05:06:52 +03:00
Fire-Head
6093d855b0 CParticleObject done, cDMAudio done 2019-08-15 04:43:00 +03:00
aap
b7471489fa
Merge pull request #186 from Nick007J/master
more CCarCtrl
2019-08-11 22:15:31 +02:00
eray orçunus
be1c7b0761 P.e.d.s. and fixes 2019-08-11 20:31:36 +03:00
Nikolay Korolev
6a7fdadeaa Merge remote-tracking branch 'upstream/master' 2019-08-10 10:44:39 +03:00
Nikolay Korolev
0303955de3 More CCarCtrl 2019-08-10 10:44:19 +03:00
aap
0bd681abc5 finished CPathFind 2019-08-09 19:42:18 +02:00
Nikolay Korolev
4ae4bc94c6 CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
eray orçunus
2fc69a0aa5 CPed part 218 2019-08-05 16:07:10 +03:00
aap
a3e3527a3b implemented CHeli 2019-08-04 00:31:00 +02:00
Nikolay Korolev
d3ddfd8e40 fixed collision 2019-08-03 21:43:07 +03:00
Nikolay Korolev
a3bdaccafb Merge remote-tracking branch 'upstream/master' 2019-08-03 16:02:09 +03:00
Nikolay Korolev
ebbcd92de2 RunningScript, part 4, plus some fixes 2019-08-03 16:01:13 +03:00
aap
a890a8a3b4
Merge pull request #178 from Fire-Head/master
sampman done
2019-08-02 23:09:37 +02:00
Fire-Head
73e2a4b035 Merge branch 'master' of github.com:Fire-Head/re3 2019-08-02 23:23:05 +03:00
Fire-Head
6ba2b05443 sampman done 2019-08-02 23:20:12 +03:00
eray orçunus
875cdd845d The Peds 2019-08-02 01:30:40 +03:00
aap
78c15c4828 implemented CPlane 2019-07-31 23:57:18 +02:00
aap
5f6b235301 implemented CTrain 2019-07-31 14:33:27 +02:00
Nikolay Korolev
128d31746d fixed wanted 2019-07-28 13:35:24 +03:00
Nikolay Korolev
d62225968b Merge remote-tracking branch 'upstream/master' 2019-07-27 21:28:42 +03:00
Nikolay Korolev
345b8553a7 cargen + some script 2019-07-27 21:28:18 +03:00
aap
e200eb1a2f CAutomobile effect stuff 2019-07-26 18:48:14 +02:00
Nikolay Korolev
4658ebfdc2 fixed wanted 2019-07-26 17:29:28 +03:00
aap
9a50a59a3c CAutomobile::FireTruckControl and HydraulicControl 2019-07-26 14:27:13 +02:00
aap
8804aafc6a
Merge branch 'master' into master 2019-07-26 01:34:32 +02:00
eray orçunus
8fd63e5ca6 Ped & fixes, including peds dive into danger fix 2019-07-25 23:37:50 +03:00
Nikolay Korolev
5acce16261 Running script part 3 2019-07-25 23:34:29 +03:00
aap
3bb607f9cb implemented CAutomobile::TankControl 2019-07-25 16:33:37 +02:00
aap
60364f11da fixed dinput 2019-07-25 12:38:25 +02:00
Fire_Head
b79f77634d
Merge branch 'master' into master 2019-07-24 20:59:16 +03:00
Fire-Head
0c0e564019 update 2019-07-24 20:30:09 +03:00
Fire-Head
b4ecb3e3da shadows done 2019-07-24 19:55:43 +03:00
aap
e9cafe340a bit more CAutomobile 2019-07-23 16:39:30 +02:00
Nikolay Korolev
a951996943 added CPool<cAudioScriptObject, cAudioScriptObject> 2019-07-20 18:00:57 +03:00
aap
60045ec6cd couple of fixes 2019-07-20 14:39:38 +02:00
Filip Gawin
a04d8f24be ComputeDopplerEffectedFrequency 2019-07-19 16:22:46 +02:00
aap
0ad39c020c implemented col line rendering 2019-07-19 13:58:19 +02:00
aap
59145cea83 CAutomobile ctor, car spawner, fixes 2019-07-19 11:57:12 +02:00
aap
26502ee30a *cough* 2019-07-19 10:51:42 +02:00
aap
f63c614d6a fixed eventlist bug 2019-07-19 10:09:08 +02:00
aap
fd01f9b25c CAutomobile::ProcessControl done 2019-07-18 15:41:09 +02:00
aap
ba242bcf58 more CAutomobile::ProcessControl 2019-07-17 23:58:06 +02:00
guard3
94fb33b60c Fluff 2019-07-17 22:44:22 +03:00
Nikolay Korolev
682e3f5984 fix fix 2019-07-17 13:24:55 +03:00
Nikolay Korolev
a9a62a8641 script fix, bomb fix, flying components fix 2019-07-17 13:24:04 +03:00
aap
36f3a517f9 more fixes; started CAutomobile::ProcessControl 2019-07-16 19:48:50 +02:00
aap
9477aca836
Merge branch 'master' into erorcun 2019-07-16 18:31:18 +02:00
eray orçunus
2c138b2b77 Phone, World, Ped 2019-07-15 15:11:40 +03:00
Nikolay Korolev
a6ca999ed4 test 2019-07-15 12:21:24 +03:00
Nikolay Korolev
68d850087c Merge remote-tracking branch 'upstream/master' 2019-07-14 20:33:41 +03:00
Nikolay Korolev
b77a9ce955 RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes) 2019-07-14 14:49:27 +03:00
aap
424487854b started making frontend accurate to game 2019-07-14 12:46:36 +02:00
Nikolay Korolev
be110db5c4 Merge remote-tracking branch 'upstream/master' 2019-07-14 12:49:27 +03:00
Nikolay Korolev
41dbd754de Partial RunningScript part2 2019-07-14 12:49:03 +03:00
aap
c6afa42f9b
Merge pull request #131 from gennariarmando/master
Frontend fixes.
2019-07-14 10:22:52 +02:00
Nikolay Korolev
51c71fffeb fixed policeDontCare 2019-07-13 19:12:51 +03:00
aap
60711154ba more CWanted; added CEventList 2019-07-12 18:01:22 +02:00
_AG
7ba5f6a13a Frontend fixes.
Fix #125 #119 #105 #98 #54.
2019-07-11 23:43:37 +02:00
aap
0548476ba6 CAutomobile::ProcessControlInputs 2019-07-11 12:48:49 +02:00
Fire_Head
aa449b6fe1
Merge branch 'master' into master 2019-07-11 03:48:36 +03:00
Fire-Head
aed8218ef1 WaterLevel done 2019-07-11 03:33:28 +03:00
aap
f1951acd6e tried to fix CMenuManager::Process but still issues 2019-07-10 22:57:19 +02:00
aap
90e093cd47 and of course the last commit didnt fix everything 2019-07-10 17:34:11 +02:00
aap
4a36d64f15 added wrappers around math functions 2019-07-10 17:18:26 +02:00
eray orçunus
2ef5e4cd66 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-10 15:56:56 +03:00
eray orçunus
86681c6f18 Phone start, ped spinning and cop car fix, and some love to CPed
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-07-10 15:56:29 +03:00
aap
d360229b5b fixed some stuff in frontend, badly broke others; disabled reversed frontend for the moment 2019-07-10 13:42:48 +02:00
aap
0d3cdcc01c
Merge pull request #127 from gennariarmando/master
More frontend inputs.
2019-07-10 11:08:31 +02:00
aap
50cc7c7932
Merge pull request #126 from Nick007J/master
RunningScript part 1
2019-07-10 11:06:27 +02:00
_AG
5b04393bb4 More frontend inputs. 2019-07-10 10:03:06 +02:00
aap
702cd00765 more CVehicle 2019-07-09 23:49:44 +02:00
Nikolay Korolev
ca4c7d9a4b sync with upstream 2019-07-09 23:39:29 +03:00
Nikolay Korolev
11ae1b06ae RunningScript: 1/12 2019-07-09 23:38:05 +03:00
aap
a65dd41da7 yet more CAutomobile 2019-07-09 18:50:35 +02:00
aap
74fcbc8c0a more CAutomobile 2019-07-09 09:57:44 +02:00
aap
b26e83fc6e Merge branch 'master' of github.com:GTAmodding/re3 2019-07-08 22:55:57 +02:00
eray orçunus
69ee4acc97 One driver owns all the cars fix
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-07-08 23:03:50 +03:00
aap
2ae112fdf6 more CAutomobile 2019-07-08 21:37:47 +02:00
aap
edf5ac2626 little changes; one more function of CAutomobile 2019-07-08 17:07:34 +02:00
aap
12af85ca3d cleaned up patching of virtual functions; started CAutomobile 2019-07-08 08:46:42 +02:00
aap
6ec421fe7b
Merge pull request #111 from gennariarmando/master
Darkel/Wanted update.
2019-07-07 21:09:40 +02:00
Nikolay Korolev
ee0494b2d8 IntoTheScripts! 2019-07-07 19:00:02 +03:00
_AG
0c34fb1bb2 blah 2019-07-07 15:26:59 +02:00
_AG
d1c6a6aaa6 Merge branch 'master' of https://github.com/gtamodding/re3 2019-07-07 15:16:54 +02:00
aap
53023eb65b the great reorganization 2019-07-07 13:09:11 +02:00