Commit graph

379 commits

Author SHA1 Message Date
Nikolay Korolev
42ff0f7c58 bug fixes 2020-01-01 23:55:01 +03:00
Nikolay Korolev
b307893c9d bug fix 2020-01-01 15:16:38 +03:00
Nikolay Korolev
402ecd6305 fix merge with upstream 2020-01-01 02:55:00 +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
bb5e31470d CPlayerPed & fixes 2019-12-28 23:05:49 +03:00
eray orçunus
04499bfbb6 CEmergencyPed done 2019-12-22 18:28:16 +03:00
eray orçunus
dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +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
030f64daf1 Frontend, Peds & logic and overflow fixes 2019-11-13 01:16:23 +03:00
Nikolay Korolev
5ef291ddf2 Merge remote-tracking branch 'upstream/master' into script_dev 2019-11-09 16:44:36 +03:00
Nikolay Korolev
cc9a49d061 script stubs 2019-11-09 16:44:17 +03:00
eray orçunus
5bb217fcb6 Script fix 2019-11-01 12:32:31 +03:00
erorcun
34090ab4d6
Merge pull request #255 from Nick007J/master
script 500-599
2019-10-30 03:20:15 +03:00
Sergeanur
cce3aac4c3 Audio fixes 2019-10-27 19:04:13 +02:00
Nikolay Korolev
6224060627 Merge remote-tracking branch 'upstream/master' into script_dev 2019-10-27 12:51:24 +03:00
Nikolay Korolev
5e77e9d0ea script 600-699 2019-10-27 12:51:09 +03:00
Sergeanur
998adfab90 Fixed use of boolean type for in CGameLogic 2019-10-26 21:24:26 +03:00
Nikolay Korolev
dcd2a94367 fix pager build 2019-10-26 17:27:48 +03:00
Nikolay Korolev
3dee880c29 merge 2019-10-26 17:20:31 +03:00
Nikolay Korolev
542e746f66 script 500-599 2019-10-26 17:16:39 +03:00
Sergeanur
d5a72fa597 Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode 2019-10-26 15:20:12 +03:00
Sergeanur
b6cb716452 Fixed CGameLogic::PassTime types 2019-10-26 14:35:45 +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
43866a4f70 Fix rebasing 2019-10-26 13:05:00 +02:00
Filip Gawin
12ee71e4f7 audio7 2019-10-26 13:05:00 +02: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
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
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
f56684d04e CGame::Process() && CGame::ReloadIPLs 2019-10-19 01:23:40 +03:00
nmzik
32f2f3511c CPopulation::Initialise() 2019-10-18 15:36:40 +03:00
Sergeanur
3ba57c5f6a Gangs save and missed sound enums 2019-10-17 13:21:31 +03:00
Sergeanur
5b1ffb0912 Some CPool and CPools funcs, restoring original logic of pool lookup loops 2019-10-17 00:53:25 +03:00
erorcun
38565a47a1
Merge branch 'master' into master 2019-10-16 23:42:04 +03:00
Sergeanur
5c36eae89f More PathFind fixes 2019-10-14 22:58:22 +03:00
Sergeanur
9d2b7a99b3 Some PathFind fixes (not all) 2019-10-14 21:13:23 +03:00
Nikolay Korolev
f93285df79 Merge remote-tracking branch 'upstream/master' into script_dev 2019-10-14 00:44:48 +03:00
eray orçunus
37f0bbc05e PathFind fix and some Peds 2019-10-14 00:33:18 +03:00
Sergeanur
26c8c56623 Fixed unsigned time check in CDarkel 2019-10-13 22:44:39 +03:00
Nikolay Korolev
545bd3322c
quick fix 2019-10-13 20:13:39 +03:00
Nikolay Korolev
2411558bab copypaste error 2019-10-13 20:12:15 +03:00
Nikolay Korolev
8eda735918 400-499 2019-10-13 14:46:09 +03:00
Nikolay Korolev
a1700eeaa4 Merge branch 'master' into script_dev 2019-10-12 22:24:58 +03:00
Nikolay Korolev
225ad5d78e
Merge pull request #237 from Nick007J/master
fixes
2019-10-12 22:23:37 +03:00
Nikolay Korolev
bd6ded198b fixes 2019-10-12 22:19:54 +03:00
Sergeanur
1fed8e9482 Fixed floating package pickups 2019-10-12 22:03:44 +03:00
Nikolay Korolev
c78fff8d54 script 400-499 start 2019-10-12 22:00:31 +03:00
Sergeanur
47e98306c7
Merge pull request #231 from Sergeanur/Restart
Full CRestart
2019-10-12 17:32:10 +03:00
Sergeanur
03833f9e11 Fixed iteration typo 2019-10-12 17:28:38 +03:00
Nikolay Korolev
a34870645a blunder 2019-10-12 13:42:34 +03:00
Sergeanur
7c6c649823 Fix typo in CCarAI::GetCarToGoToCoors 2019-10-12 12:16:39 +03:00
Sergeanur
2977164918 Typo fix 2019-10-12 12:05:38 +03:00
erorcun
f70c2ad54f
Merge pull request #230 from Nick007J/master
CCarAI, CCurves, CAutoPilot
2019-10-11 02:39:16 +03:00
Sergeanur
3768473cd6 Full CRestart 2019-10-11 01:54:08 +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
Nikolay Korolev
803412f33b CCarAI + bugfixes 2019-10-11 00:02:55 +03:00
Sergeanur
ffed52b94f CMoneyMessages moved to SpecialFX.cpp 2019-10-10 19:17:35 +03:00
Sergeanur
aa173a454c Fix CCarGenerator Load/Save 2019-10-10 17:18:19 +03:00
Nikolay Korolev
80a74d2e77 fixed stupid bug 2019-10-09 01:00:51 +03:00
Nikolay Korolev
9e5a5f2ab6 Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-10-08 23:57:58 +03:00
Nikolay Korolev
4b4e5abffd fixed bugs 2019-10-08 23:57:21 +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
eray orçunus
d5d1c7ec5f Peds 2019-10-07 00:39:25 +03:00
Sergeanur
dfe7edfad7 CGarages::PrintMessages drawing fixes 2019-10-06 17:33:07 +03:00
Nikolay Korolev
e10f5ee6a3 merge 2019-10-06 14:26:50 +03:00
Nikolay Korolev
26f7691031 car AI 2019-10-06 14:25:13 +03:00
Sergeanur
96eee4f10f Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFile 2019-10-06 02:41:35 +03:00
eray orçunus
aa4e7ad5eb CDarkel, walkaround fix 2019-10-05 17:06:01 +03:00
Sergeanur
cf0edb3eb7 Fix warnings 2019-10-04 02:18:23 +03:00
Sergeanur
47e6cbe65e Fix formatting mistakes 2019-10-03 23:38:21 +03:00
Sergeanur
999765aadd Fixed some formatting 2019-10-03 23:34:02 +03:00
Sergeanur
679f7bbcfa Checks rewritten 2019-10-03 23:32:31 +03:00
Sergeanur
2cf94348f5 Drop w's 2019-10-03 22:51:38 +03:00
Sergeanur
72e12f6aae CPickups 2019-10-03 22:37:13 +03:00
aap
0346d44626
Merge pull request #218 from erorcun/erorcun
Fixes & peds
2019-10-03 10:19:57 +02:00
eray orçunus
0ee5a46f71 Fixes & peds 2019-10-03 04:02:02 +03:00
Sergeanur
bd6e109441 Fix typo in CCarCtrl::WeaveThroughPedsSectorList 2019-10-03 02:39:23 +03:00
Sergeanur
9149367f86 Fix CPickup 2019-10-01 19:53:25 +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
7234e6e698 CAutoPilot and CCurves 2019-09-15 13:29:38 +03:00
Nikolay Korolev
368ce0d4e5 CCarCtrl 2019-09-15 02:28:07 +03:00
Nikolay Korolev
67701df91f fix debug 2019-09-14 21:06:10 +03:00
Nikolay Korolev
fbe09534d9 fix typo 2019-09-14 20:58:09 +03:00
Nikolay Korolev
84186e7b0f Merge branch 'carctrl_dev' 2019-09-14 20:54:56 +03:00
Nikolay Korolev
57f24ad533 more CCarCtrl 2019-09-14 20:53:04 +03:00
eray orçunus
88f0ef75e8 P.e.d.s. 2019-09-14 02:24:53 +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
426efa9ecb make ATTEMPTS_TO_FIND_NEXT_NODE a define 2019-09-11 22:12:43 +03:00
Nikolay Korolev
05b01c5ff5 ccarctrl 2019-09-11 21:42:34 +03:00
Nikolay Korolev
c86c9b3118 Merge remote-tracking branch 'upstream/master' 2019-09-11 17:52:07 +03:00
Nikolay Korolev
448d5a8857 ccarctrl 2019-09-11 17:51:40 +03:00
eray orçunus
24d9773ae0 Peds 2019-09-07 01:27:07 +03:00
Nikolay Korolev
b2236d8951 More CCarCtrl 2019-09-02 19:04:09 +03:00
Nikolay Korolev
3c0bbb10f3 CCarCtrl Weave stuff done 2019-09-01 20:38:35 +03:00
Nikolay Korolev
cd30a76dc5 CCarCtrl stuff 2019-09-01 17:02:23 +03:00
Filip Gawin
5a36d46692 Audio fixes 2019-08-27 23:45:27 +02: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
Nikolay Korolev
64cef333c8 more CCarCtrl 2019-08-25 16:47:22 +03:00
Nikolay Korolev
13233ccaed merge 2019-08-17 15:46:19 +03:00
Nikolay Korolev
c16849d4a2 more CCarCtrl 2019-08-17 15:44:25 +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
437a817505 fix 2019-08-15 05:27:38 +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
Nikolay Korolev
291f73e3c7 pathetic errors 2019-08-14 22:35:02 +03:00
Nikolay Korolev
1497dbaa8d
appveyor fix 2019-08-11 23:43:11 +03:00
Nikolay Korolev
14b945ba08 more CCarCtrl 2019-08-11 20:11:54 +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
eray orçunus
2ba54983a2 Peds 2019-08-08 14:46:49 +03:00
Nikolay Korolev
c2a7c448ba Minor fixes 2019-08-07 00:42:38 +03:00
Nikolay Korolev
4ae4bc94c6 CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
Nikolay Korolev
20d1381a0f
fixed COMMAND_ADD_BLIP_FOR_COORD_OLD 2019-08-06 00:13:01 +03:00
Nikolay Korolev
537f0dfc16 fixed heading calculation 2019-08-03 18:51:19 +03:00
Nikolay Korolev
ebbcd92de2 RunningScript, part 4, plus some fixes 2019-08-03 16:01:13 +03:00
eray orçunus
875cdd845d The Peds 2019-08-02 01:30:40 +03:00
Nikolay Korolev
6fa6837baa fixed phones 2019-07-28 15:49:42 +03:00
Nikolay Korolev
6dfb2ca79e fix debug message 2019-07-28 13:38:25 +03:00
Nikolay Korolev
6ff6305be9 fixed cargen load 2019-07-28 12:57:25 +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
Nikolay Korolev
fc5fc602ba
fixed intro skip 2019-07-27 20:44:22 +03:00
Nikolay Korolev
fe53007919 fixed remote 2019-07-26 10:44:56 +03: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
e9cafe340a bit more CAutomobile 2019-07-23 16:39:30 +02:00
eray orçunus
936acedcf0 CPed continues, including some fixes 2019-07-21 00:32:16 +03:00
Nikolay Korolev
ef831a491e fixed script issues 2019-07-20 16:30:11 +03:00
Nikolay Korolev
60e5b8a8a9 fixed replay 2019-07-20 16:18:56 +03:00
Filip Gawin
a04d8f24be ComputeDopplerEffectedFrequency 2019-07-19 16:22:46 +02:00
aap
fd01f9b25c CAutomobile::ProcessControl done 2019-07-18 15:41:09 +02:00
aap
82be466013
Merge pull request #147 from erorcun/erorcun
The Peds, mainly dying/injuring
2019-07-18 15:19:34 +02:00
Nikolay Korolev
0f160d110f fixed car AI bug 2019-07-18 13:23:50 +03:00
eray orçunus
993944c05c Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-18 05:28:06 +03:00