Commit Graph

211 Commits

Author SHA1 Message Date
Nikolay Korolev
40ec636291 fixed flight control code 2020-04-25 16:47:39 +03:00
Nikolay Korolev
34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
Nikolay Korolev
f3ae4fa184 undo 2020-04-25 12:14:51 +03:00
Nikolay Korolev
c8fd0385cf flying control 2020-04-25 12:14:21 +03:00
Nikolay Korolev
4b883f2b40
disable mouse steering by default 2020-04-24 20:50:00 +03:00
Nikolay Korolev
458eb3a4f0
removed fix that made no sense 2020-04-23 16:40:19 +03:00
Fire-Head
75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
erorcun
0f07a323c9
Merge pull request #474 from Nick007J/master
Bug fixes, mostly replay; added RegisterReference for player ped pointer
2020-04-19 16:56:39 +03:00
eray orçunus
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev
4c133a95bd Merge remote-tracking branch 'upstream/master' 2020-04-18 23:50:58 +03:00
Nikolay Korolev
c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
eray orçunus
2f63e5e751 Vc ped ports and Frontend fixes 2020-04-18 21:30:03 +03:00
Sergeanur
555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Sergeanur
83cbe4e39e More refs removed 2020-04-16 15:30:47 +03:00
erorcun
647cfbfd45
Merge pull request #446 from erorcun/erorcun
Many fixes and cleanup
2020-04-15 19:22:28 +03:00
eray orçunus
4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
aap
eccc4a3a5b fixed bug and weirdness in CHeli 2020-04-15 16:17:18 +02:00
Sergeanur
eb0b9f6255 fix CTheCarGenerators::SaveAllCarGenerators 2020-04-14 17:24:31 +03:00
Sergeanur
a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
Nikolay Korolev
3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
aap
3aae52d220 finished CBoat 2020-04-13 00:20:44 +02:00
Nikolay Korolev
cbb298c8dd sync with master 2020-04-12 12:08:30 +03:00
Nikolay Korolev
fa0f5542cc
Merge pull request #402 from Nick007J/master
Record
2020-04-12 12:06:12 +03:00
Nikolay Korolev
38dee74a5a CPools 2020-04-11 21:01:39 +03:00
Nikolay Korolev
92b6d775d6 Record 2020-04-11 02:03:42 +03:00
saml1er
a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
aap
6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
Sergeanur
cb262c791e Finished CExplosion 2020-04-09 13:28:17 +03:00
aap
51512db006 implemented CRubbish 2020-04-07 17:16:58 +02:00
aap
5e9ae94298
Merge pull request #378 from aap/master
finished CCamera
2020-04-05 14:30:28 +02: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
eray orçunus
5e2fe749bd Mouse free cam for peds&cars (under FREE_CAM) 2020-03-31 06:05:49 +03:00
Nikolay Korolev
24b8c7819c merge with upstream 2020-03-29 18:51:18 +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
101c21e064 merge with master 2020-03-28 20:55:15 +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
739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
blingu
0e91015940
Update Vehicle.cpp 2020-03-26 14:19:55 +01:00
blingu
be2aca47cf
added InflictDamage() declaration 2020-03-25 22:58:20 +01:00
blingu
93a4bc31fa
added wrapper for InflictDamage() 2020-03-25 22:57:34 +01:00
eray orçunus
934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +03:00
eray orçunus
ae523a09a7 fixes 2020-03-01 04:44:58 +03:00
eray orçunus
b2d062ef2d some fixes 2020-02-23 01:48:21 +03:00
Nikolay Korolev
85d815cf9d bug fixes 2020-02-15 23:30:51 +03:00
eray orçunus
ce0687db27 A bug fix and VC ports for veh. enter/exit 2020-02-03 21:03:48 +03:00
Nikolay Korolev
c794b59a7c
fixed firetruck crash 2020-02-02 15:22:17 +03:00
Sergeanur
0c581ce86a Fix boat component 2020-01-31 21:02:08 +02:00
Sergeanur
6ff06ff7c6 Partial CBoat 2020-01-24 10:41:40 +02:00
Sergeanur
18f80a02fc Fixing some plane funcs declarations 2020-01-23 17:43:19 +02:00
Sergeanur
9eb599ff58 Plane crashfix and more 2020-01-23 17:29:36 +02:00
Nikolay Korolev
42ff0f7c58 bug fixes 2020-01-01 23:55:01 +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
Filip Gawin
c7e9ddb566 Audio fixes for erorcun review 2019-12-01 20:44:57 +01:00
eray orçunus
680fe0f7e6 CCivilianPed done & restore peds running to phone 2019-11-26 02:35:05 +03:00
eray orçunus
be7d1d1a63 Frontend, Peds & logic and overflow fixes 2019-11-12 23:34:28 +01:00
Nikolay Korolev
5ef291ddf2 Merge remote-tracking branch 'upstream/master' into script_dev 2019-11-09 16:44:36 +03:00
eray orçunus
d5619fb5ae Peds & a few fixes 2019-11-05 03:52:06 +03: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
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
Sergeanur
d5a72fa597 Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode 2019-10-26 15:20:12 +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
Nikolay Korolev
483dfbbf1b
fixed planes 2019-10-13 18:15:14 +03:00
eray orçunus
0562a6e983 Peds&fixes 2019-10-13 07:17:53 +03:00
Sergeanur
be2e01c6fb Fixed wrong CAutomobile field type 2019-10-12 17:06:15 +03:00
Sergeanur
35add59b34 Removed !this check in CVehicle::IsWrecked, added CPed::IsNotInWreckedVehicle instead 2019-10-12 17:03:32 +03:00
erorcun
f70c2ad54f
Merge pull request #230 from Nick007J/master
CCarAI, CCurves, CAutoPilot
2019-10-11 02:39:16 +03:00
Nikolay Korolev
803412f33b CCarAI + bugfixes 2019-10-11 00:02:55 +03:00
Sergeanur
fd1edbc0c8 Single-wagon train fix 2019-10-10 20:55:12 +03:00
Nikolay Korolev
9e5a5f2ab6 Merge remote-tracking branch 'upstream/master' into carctrl_dev 2019-10-08 23:57:58 +03:00
Sergeanur
dd602eb4a4 Fixing ColPoints again 2019-10-06 15:49:01 +03:00
Sergeanur
90aa16b9b0 Possible fix for wheel bug 2019-10-06 15:42:48 +03:00
Nikolay Korolev
26f7691031 car AI 2019-10-06 14:25:13 +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
a3aea359b2 DragCarToPoint 2019-09-12 13:11:13 +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
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
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
Fire_Head
6909fa283a
Merge branch 'master' into master 2019-08-15 05:06:52 +03:00