Commit graph

1117 commits

Author SHA1 Message Date
Nikolay Korolev
fa0f5542cc
Merge pull request #402 from Nick007J/master
Record
2020-04-12 12:06:12 +03:00
Nikolay Korolev
c593599fc5
Merge pull request #399 from saml1er/master
CObject complete
2020-04-12 12:05:49 +03:00
Nikolay Korolev
9593a2c000
fixed cranes bug 2020-04-12 11:36:51 +03:00
saml1er
60898f39f2 Improve CRoadBlocks code 2020-04-12 02:08:16 +05:00
Nikolay Korolev
fbb1bc5b0d Merge remote-tracking branch 'upstream/master' 2020-04-11 21:02:04 +03:00
aap
3c999a1eb8 fixed traffic light position 2020-04-11 19:33:39 +02:00
saml1er
0d19036a42 CRoadBlocks complete 2020-04-11 21:45:49 +05:00
Nikolay Korolev
1c0c0a0468 fixed malloc/new 2020-04-11 13:20:41 +03:00
Nikolay Korolev
bc90f958da fix constants 2020-04-11 02:27:50 +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
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
saml1er
a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
Nikolay Korolev
314bb83b9a fixed intro crash 2020-04-10 12:03:22 +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
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
Fire-Head
590ff32469 PS2 Cheats, restored R*names 2020-04-09 06:20:44 +03:00
Nikolay Korolev
42d5f65c55
fix bug 2020-04-08 23:50:45 +03:00
Nikolay Korolev
5966e627f0
fix bug 2020-04-08 15:17:07 +03:00
Nikolay Korolev
8ee98574ff
fix bug 2020-04-08 14:16:59 +03:00
Nikolay Korolev
8e29a5ec88
bug fix 2020-04-08 14:06:27 +03:00
Sergeanur
560fc65538 Small camera fixes 2020-04-08 09:58:08 +03:00
Nikolay Korolev
4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev
e6e51492f0 review fixes 2020-04-06 11:19:29 +03:00
Nikolay Korolev
7dc6815903 Merge branch 'master' into garages_dev 2020-04-06 02:01:45 +03:00
Nikolay Korolev
7f8a78e5de Cranes done 2020-04-06 02:01:03 +03:00
Sergeanur
4fc2f9c359 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-05 17:03:59 +03: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
30b8d7300b shoreside garage fix 2020-04-05 12:44:58 +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
aap
7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
Nikolay Korolev
347f0a0e9c vehicles missing functions + fixes 2020-04-01 01:58:40 +03:00
Nikolay Korolev
e34631adce review fixes 2020-04-01 00:07:09 +03:00
Nikolay Korolev
357d88a4a8 fix 2020-03-31 01:00:06 +03:00
Nikolay Korolev
b3bfde0db0 added forgotten function 2020-03-31 00:53:51 +03:00
Nikolay Korolev
24e4ecf5bb bug fixes, reorganisation 2020-03-31 00:46:44 +03:00
Nikolay Korolev
50b43b680e finished garages 2020-03-31 00:01:03 +03:00
Nikolay Korolev
23c6a28324 Merge branch 'master' into garages_dev 2020-03-29 18:54:26 +03:00
Nikolay Korolev
24b8c7819c merge with upstream 2020-03-29 18:51:18 +03:00
Nikolay Korolev
0db35f8275 more garages 2020-03-29 18:48:57 +03:00
Fire_Head
a0b077574e
Merge branch 'master' into master 2020-03-29 18:39:47 +03:00
Sergeanur
97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
Nikolay Korolev
02615ccd98 fix 2020-03-29 02:09:02 +03:00
Nikolay Korolev
38c2f8fbb0 fixes 2020-03-29 01:48:49 +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
93417853ed fixes 2020-03-28 23:41:37 +03: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
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03: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
e7c18fc17f removed windows.h for most .cpps 2020-03-27 20:53:47 +01: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
eray orçunus
0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03:00
aap
4e7c186285 change default script to story 2020-03-24 11:58:09 +01:00
Nikolay Korolev
861506d048 merge with upstream 2020-03-22 19:47:14 +03:00
Filip Gawin
337924c794 Cleanup audio code + 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
0d1f42add1 Implement ProcessCrane 2020-03-22 17:30:54 +01:00
Nikolay Korolev
34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03:00
Nikolay Korolev
7d213a1f32 bullet traces fixes 2020-03-22 13:20:36 +03:00
Nikolay Korolev
65e8558794 Merge remote-tracking branch 'upstream/master' 2020-03-22 13:09:18 +03:00
erorcun
b17935b89e
Merge branch 'master' into erorcun 2020-03-22 04:49:24 +03:00
Nikolay Korolev
c2f5dfdb1e bullet traces 2020-03-21 20:14:29 +03:00
Nikolay Korolev
ac610b7e6e fixed erroneous assumption 2020-03-21 15:13:38 +03:00
eray orçunus
d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
Nikolay Korolev
795e07c882 purple nines glitch fix 2020-03-21 14:29:03 +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
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
0283dbcd12 Fix merge conflict 2020-03-11 15:49:19 -07:00
erorcun
4cc0fc1696
Merge branch 'master' into erorcun 2020-03-12 00:57:35 +03:00
eray orçunus
934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +03:00
Wes Hampson
28342405d3 Add Load/Save functions 2020-03-10 20:26:07 -07:00
Nikolay Korolev
1d8b3a216c more utils 2020-03-05 01:10:09 +03:00
Nikolay Korolev
2058ca6bbb more utils 2020-03-04 23:12:16 +03:00
Nikolay Korolev
d492390fec script utils 2020-03-02 22:54:13 +03:00
Nikolay Korolev
90ff2f73eb Merge branch 'master' into script_dev 2020-03-01 17:44:37 +03:00
Nikolay Korolev
5eccf44e7a review fixes 2020-03-01 17:42:47 +03:00
Nikolay Korolev
ceab73a053 merge with upstream 2020-03-01 14:19:42 +03:00
Nikolay Korolev
64b28c0730 save/load 2020-03-01 14:18:10 +03:00
eray orçunus
ae523a09a7 fixes 2020-03-01 04:44:58 +03:00
eray orçunus
750d3229a3 CPopulation 3 and fixes 2020-02-27 19:38:35 +03:00
Nikolay Korolev
4d9853b0ce removed debug leftovers 2020-02-24 21:18:11 +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
7d78879c48 more stuff 2020-02-24 12:10:21 +03:00
eray orçunus
cbf396e6e9 script fixes 2020-02-23 18:34:53 +03:00
Nikolay Korolev
0255f5d15f more cosmetic stuff 2020-02-23 14:06:12 +03:00
Nikolay Korolev
1721a74466 stuff 2020-02-23 13:30:37 +03:00
Nikolay Korolev
1ba696f5fc some changes 2020-02-23 13:12:44 +03:00
Nikolay Korolev
aa5266b1b3 some cosmetic stuff 2020-02-23 02:29:38 +03:00
Nikolay Korolev
bc139e0702 ARRAY_SIZE 2020-02-22 17:53:28 +03:00
Nikolay Korolev
a312e1ff81 merge 2020-02-22 15:36:22 +03:00
Nikolay Korolev
3481e431c9 fixes 2020-02-22 15:35:46 +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
a36da99798 review fixes 2020-02-16 12:44:33 +03:00
Nikolay Korolev
85d815cf9d bug fixes 2020-02-15 23:30:51 +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
03b995c6ef Some fixes and some cosmetic things 2020-02-02 16:58:52 +03:00
Nikolay Korolev
2baacf0e9e Merge remote-tracking branch 'upstream/master' 2020-02-02 14:47:16 +03:00
Nikolay Korolev
dc2516896f script 900-999 init 2020-02-02 14:47:03 +03:00
Nikolay Korolev
b0e4f40f44
fixed SET_BOAT_CRUISE_SPEED 2020-02-02 14:09:39 +03:00
Nikolay Korolev
bedf19c523
fixed police ignore bug 2020-02-02 13:29:13 +03:00
Nikolay Korolev
76b8e09de5 fix ai bug (2) 2020-02-02 12:28:23 +03:00
Nikolay Korolev
c1dc66c63e fixed ai bug 2020-02-02 03:21:21 +03:00
Nikolay Korolev
e4f1ab20f1 fixed bullion run 2020-02-02 01:43:04 +02:00
Sergeanur
c8f7732832 Replay crash fix 2020-02-01 23:01:25 +02:00
Sergeanur
2ff00bd0ee Fix HAS_OBJECT_BEEN_DAMAGED 2020-02-01 21:47:04 +02:00
Sergeanur
3d69148497 Added enum to OnscreenTimer, fixed mistakes in CCarCtrl::SteerAIBoatWithPhysicsHeadingForTarget 2020-02-01 18:40:54 +02:00
Sergeanur
e2f8ad983d Fix damage bar assert crash 2020-02-01 17:22:56 +02:00
Sergeanur
6e73d9220a Fix CTheScripts::AddToInvisibilitySwapArray 2020-02-01 15:10:46 +02:00
Sergeanur
4f33668c88 Fix SET_BOAT_CRUISE_SPEED 2020-01-31 22:28:22 +02:00
Sergeanur
79d2ab7619 More fixes 2020-01-31 19:16:13 +02:00
Sergeanur
74e215458b Fixing IS_AREA_OCCUPIED command 2020-01-31 17:31:24 +02:00
Sergeanur
43bd2227a8 CRemote 2020-01-31 12:23:15 +02:00
Sergeanur
8373db1e7a RC toyz crashfix 2020-01-31 12:12:49 +02:00
Sergeanur
d52452e69f PowerPoints 2020-01-20 18:59:28 +02:00
Sergeanur
bbc68ffb1c AccidentManager 2020-01-11 15:14:02 +02:00
Sergeanur
8fab684283 move 2020-01-11 14:49:37 +02: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
Nikolay Korolev
c5e7de02fe fixes 2020-01-04 01:10:35 +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
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
eray orçunus
59671fab03 The Peds, mainly dying/injuring
There is also some reorganization
2019-07-18 05:27:29 +03:00
aap
ba242bcf58 more CAutomobile::ProcessControl 2019-07-17 23:58:06 +02:00
guard3
dbe205ad08 Fixed Bridge 2019-07-17 23:05:11 +03:00
aap
0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02: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
Nikolay Korolev
2d9ba5bb9a fix 2019-07-15 18:13:49 +03: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
5d90821a8e fix 2019-07-15 12:11:49 +03:00
Nikolay Korolev
4bfd316c4c fixed arithmetics 2019-07-14 22:59:00 +03:00
Nikolay Korolev
e16562aa6d fixed cops 2019-07-14 15:00:36 +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
Nikolay Korolev
41dbd754de Partial RunningScript part2 2019-07-14 12:49:03 +03:00
aap
60711154ba more CWanted; added CEventList 2019-07-12 18:01:22 +02:00
aap
f35b053684
Merge pull request #129 from erorcun/erorcun
Fix CPhone crash, more functions
2019-07-10 23:10:10 +02:00
eray orçunus
4f333d44a0 Fix CPhone crash, more functions 2019-07-10 23:18:22 +03: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
b14be6697b fixed COMMAND_IS_PLAYER_IN_AREA_3D 2019-07-10 14:00:10 +02:00
aap
50cc7c7932
Merge pull request #126 from Nick007J/master
RunningScript part 1
2019-07-10 11:06:27 +02:00
aap
702cd00765 more CVehicle 2019-07-09 23:49:44 +02:00
Nikolay Korolev
7174dffebc fix 2019-07-10 00:01:02 +03: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
192fb45098 Merge branch 'master' of github.com:GTAmodding/re3 2019-07-08 21:38:11 +02:00
aap
a2cecd4e97
Merge pull request #122 from Nick007J/master
More script stuff
2019-07-08 21:38:06 +02: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
Nikolay Korolev
b1d1d6f701 Added script commands 2019-07-08 00:32:54 +03:00
Nikolay Korolev
4f3d17a81c More script 2019-07-08 00:05:24 +03:00
Nikolay Korolev
4c86469cc9 Merge remote-tracking branch 'upstream/master' 2019-07-07 22:28:51 +03:00
aap
6ec421fe7b
Merge pull request #111 from gennariarmando/master
Darkel/Wanted update.
2019-07-07 21:09:40 +02:00
_AG
439f371fc3 Darkel is bored. 2019-07-07 20:59:49 +02:00
Nikolay Korolev
a4e6930bb6 More scripts 2019-07-07 20:57:00 +03:00
aap
62eaf12891
Merge pull request #121 from Nick007J/master
IntoTheScripts!
2019-07-07 19:04:59 +02:00
aap
c1f3ce8cce implemented CDoor 2019-07-07 18:36:55 +02:00
Nikolay Korolev
ee0494b2d8 IntoTheScripts! 2019-07-07 19:00:02 +03: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
aap
219a65b81a finished CPhysical 2019-07-07 11:13:12 +02:00
aap
533f265f55 made code use TimeStepIn(Milli)Seconds; purged unnecessary inlines 2019-07-07 10:16:16 +02:00
aap
b515ce4730
Merge pull request #114 from Nick007J/master
Added CUpsideDownCarCheck and CStuckCarCheck
2019-07-07 09:45:07 +02:00
_AG
0ac6d0515e
Merge branch 'master' into master 2019-07-07 09:21:44 +02:00
_AG
29767c1964 Lil update. 2019-07-07 09:13:14 +02:00
aap
00461224a9 some work on vehicles 2019-07-06 19:44:00 +02:00
Nikolay Korolev
b1500fbe03 Added CUpsideDownCarCheck and CStuckCarCheck 2019-07-06 18:06:08 +03:00
aap
2d08696190
Merge pull request #113 from erorcun/erorcun
CPed
2019-07-06 00:58:07 +02:00
eray orçunus
769c2812ff Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun
Conflicts:
	src/entities/Ped.h
	src/entities/Vehicle.h
2019-07-06 01:52:14 +03:00
guard3
88ce335afc CBridge 2019-07-06 01:51:32 +03:00
eray orçunus
0e7a471b82 CPed...
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-07-06 01:44:49 +03:00
aap
49d97f0033 finished CDamageManager 2019-07-05 22:20:28 +02:00
aap
396b43cbd4 implemented some CVehicle functions 2019-07-05 14:23:39 +02:00
_AG
9fed0c040c Darkel/Wanted update. 2019-07-04 22:33:19 +02:00
Nikolay Korolev
7fae683316 Script stuff + bug fixes 2019-07-04 01:16:24 +03:00
eray orçunus
3dec4a0423 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-01 02:48:31 +03:00
eray orçunus
ce28a6d298 More CPed
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-07-01 02:48:09 +03:00
Nikolay Korolev
be808bed53 Merge remote-tracking branch 'upstream/master' 2019-07-01 00:18:10 +03:00
Nikolay Korolev
02c7cbc75f Completed CReplay 2019-07-01 00:15:34 +03:00
aap
c661485ef7 little cleanup 2019-06-30 22:55:48 +02:00
Nikolay Korolev
3a763cc6e7 Changed CReplay::Display slightly 2019-06-30 23:49:32 +03:00
Nikolay Korolev
4e09f9ee39 Added camera funcs to Replay 2019-06-30 23:29:53 +03:00
aap
af2e764d81 finished CEntity 2019-06-30 21:06:55 +02:00
Nikolay Korolev
69918d4145 More replay functions, also removed pool iteration error 2019-06-30 19:22:44 +03:00
Nikolay Korolev
7c6b291860 Merge remote-tracking branch 'upstream/master' 2019-06-30 16:21:58 +03:00
Nikolay Korolev
90bcb888e8 Reactivated Store(Restore)StuffIn(From)Mem, fixed bugs 2019-06-30 16:20:11 +03:00
aap
9b5a7cd4bb
Merge pull request #78 from ShFil119/cleanup
Cleanup project a bit
2019-06-30 13:37:52 +02:00
Nikolay Korolev
e2bd3573b4 PlayBackThisFrameInterpolation and all it required... 2019-06-30 13:59:55 +03:00
Filip Gawin
2115faec38 Cleanup project a bit 2019-06-30 12:56:50 +02:00
Nikolay Korolev
b2b750bc90 ProcessCarUpdate 2019-06-29 23:15:55 +03:00
Nikolay Korolev
647db5cf34 CReplay::PlaybackThisFrame + fixes 2019-06-29 21:38:47 +03:00
Nikolay Korolev
1d620f4b67 Merged with upstream 2019-06-29 18:05:16 +03:00
Nikolay Korolev
ad76379eba more replay stuff, bug fix 2019-06-29 18:01:43 +03:00
Nikolay Korolev
62cfcd5b27 RetrievePedAnimation 2019-06-29 15:19:31 +03:00
Nikolay Korolev
9b5392d3a1 ProcessPedUpdate 2019-06-29 14:38:37 +03:00
aap
b2f8c7eb23 miscellaneous, mostly world related 2019-06-29 11:09:33 +02:00
aap
48cf8b6629 misc stuff, mostly collision 2019-06-28 19:23:28 +02:00
aap
847720aeae CStreaming DONE 2019-06-28 12:34:02 +02:00
aap
6f4e01f078
Merge pull request #59 from Nick007J/master
Added Gangs
2019-06-28 09:49:47 +02:00
Nikolay Korolev
1c7fee4b9f Changed save/load in CGang 2019-06-27 23:45:06 +03:00
aap
d74b8fa952 started filling debug menu 2019-06-27 10:58:51 +02:00
Nikolay Korolev
969d4ac48d fixed newline 2019-06-27 01:33:46 +03:00
Nikolay Korolev
c9b9d614de Merge remote-tracking branch 'upstream/master' 2019-06-27 01:32:31 +03:00
Nikolay Korolev
0d45f2fc23 Added Gangs 2019-06-27 01:30:59 +03:00
aap
0053201ea0 yet more CStreaming 2019-06-27 00:12:58 +02:00
Nikolay Korolev
a45675d4db fixed autobuild 2019-06-26 23:50:22 +03:00
Nikolay Korolev
fa132bb773 Fixed merge errors 2019-06-26 23:47:23 +03:00
Nikolay Korolev
08b053a568 Merge with upstream 2019-06-26 23:34:14 +03:00
aap
f5e31a4564 fixed PedType 2019-06-26 11:12:00 +02:00
_AG
e765dfe90a Initial commit for Frontend.
Bug fixes:
fix #40, fix #39, fix #38, fix #37, fix #21.
Code organization and cleanup...
2019-06-25 02:36:26 +02:00
Nikolay Korolev
cc731f4732 More replay stuff 2019-06-25 01:42:23 +03:00
eray orçunus
1e09bf9c30 CPed, CVehicle, mostly entering/exiting car
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-25 00:01:40 +03:00
Nikolay Korolev
a87f3188e9 CReplay::StorePedAnimation 2019-06-23 13:58:14 +03:00
Nikolay Korolev
98cc8a434c StorePedUpdate 2019-06-23 01:34:11 +03:00
Nikolay Korolev
4f9eff19b2 attempt to fix build error 2019-06-22 22:23:26 +03:00
Nikolay Korolev
057938fc6f fixed types 2019-06-22 21:42:26 +03:00
Nikolay Korolev
4e07396076 tabify 2019-06-22 21:35:23 +03:00
Nikolay Korolev
96619e239a Added newlines at end of file 2019-06-22 21:25:14 +03:00
Nikolay Korolev
8b47a5b9f4 First commit of replay system 2019-06-22 21:17:25 +03:00
_AG
f3c331ece6 Code clean up. 2019-06-20 15:18:19 +02:00
_AG
ef8e9e7f1b Update Radar.cpp 2019-06-20 11:21:27 +02:00
_AG
2ce7bcc405 Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h. 2019-06-20 02:32:36 +02:00
aap
f4146d39a2 finally finished CVehicleModelInfo 2019-06-20 01:07:57 +02:00
aap
2fcdf6fa21 implemented cHandlingDataMgr 2019-06-20 00:12:12 +02:00
aap
12f009e708 implemented cHandlingDataMgr 2019-06-19 23:56:27 +02:00
aap
2ec11b000d implemented CObjectData 2019-06-19 18:35:51 +02:00
aap
864f719b1e implemented CPedStats 2019-06-19 16:55:01 +02:00
aap
ea73d7a284 finished CPedType 2019-06-19 15:28:13 +02:00
aap
78e33785ec cleanup on CPed and CPedType 2019-06-19 14:06:13 +02:00
eray orçunus
c9f6e7bf83 CPed merge fixes
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-06-18 23:01:03 +03:00
aap
3b64bd1b4a finished CFileLoader, except a crash! 2019-06-18 09:50:26 +02:00
aap
b5fba778c4 first part of CFileLoader 2019-06-17 22:40:15 +02:00
_AG
f299e9ebd5 Update HUD stuff, bug and format fixes.
Added environment variables to premake5.lua.
Update README.md
2019-06-17 02:11:30 +02:00
aap
0add48abf5 got rid of upper case types 2019-06-17 00:23:19 +02:00
_AG
92cc1cf3af New updates for Hud.cpp and more. 2019-06-15 01:34:36 +02:00
Filip Gawin
d08912e905
Fix value of CReplay mode 2019-06-13 14:27:29 +02:00
Fire_Head
35ea1765e2
Update Replay.h 2019-06-13 03:43:57 +03:00
Fire-Head
06e48c7059 Merge branch 'master' of github.com:Fire-Head/re3
# Conflicts:
#	src/control/Replay.h
2019-06-13 03:40:46 +03:00
Fire-Head
75bca8e31e CPad done 2019-06-13 03:35:26 +03:00
aap
01babd43b1 little cleanup 2019-06-12 13:46:02 +02:00
Filip Gawin
ecd70a5f17 RE more stuff from COnscreenTimer 2019-06-12 01:23:49 +02:00
aap
188aab4196 implemented some higher level functions; added lots of stubs; switched top and bottom in CRect 2019-05-30 21:24:47 +02:00
aap
0a36d49d2c clean up 2019-05-30 00:47:33 +02:00
aap
9e496100b7 more work on CPhysical 2019-05-18 12:39:39 +02:00