1247 Commits

Author	SHA1	Message	Date
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
Sergeanur	a5c7151656	AddExplosion shadow fix	2020-04-09 16:15:30 +03: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
aap	26fb53472e	Merge pull request #387 from aap/master ... implemented CSkidmarks	2020-04-09 12:29:52 +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
Nikolay Korolev	6b06ee21ad	Merge remote-tracking branch 'upstream/master'	2020-04-08 23:51:39 +03:00
Nikolay Korolev	42d5f65c55	fix bug	2020-04-08 23:50:45 +03:00
Nikolay Korolev	d5f34e425e	fixed random number retrieval	2020-04-08 21:56:33 +03:00
Nikolay Korolev	b9a20da7d8	review fix	2020-04-08 21:47:58 +03:00
Nikolay Korolev	ebba8519d9	review fixes	2020-04-08 21:40:02 +03:00
Nikolay Korolev	cf36e09d39	final fixes	2020-04-08 21:18:19 +03:00
Nikolay Korolev	3e1062392e	Merge branch 'master' into garages_dev	2020-04-08 20:32:56 +03:00
Nikolay Korolev	b3571706d1	fix	2020-04-08 20:30:45 +03:00
aap	9176aef1b2	Merge branch 'master' of github.com:gtamodding/re3	2020-04-08 18:45:55 +02:00
Sergeanur	5a034097c9	Fix target sprite size	2020-04-08 19:05:22 +03:00
aap	6288d36f34	implemented CSkidmarks	2020-04-08 16:35:23 +02:00
Nikolay Korolev	5966e627f0	fix bug	2020-04-08 15:17:07 +03:00
Nikolay Korolev	b075b0fccf	Merge branch 'master' into garages_dev	2020-04-08 14:26:07 +03:00
Nikolay Korolev	24fc11a137	rain fix	2020-04-08 14:25:23 +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	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
Nikolay Korolev	48e13ce6c9	Merge branch 'master' into garages_dev	2020-04-07 23:44:30 +03:00
Nikolay Korolev	f7ac85e492	weather stuff	2020-04-07 23:43:19 +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
erorcun	6a2d675467	Merge pull request #384 from erorcun/erorcun ... Menu map	2020-04-07 20:37:27 +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
Filip Gawin	95e4466846	Fix CI build	2020-04-07 15:53:51 +02:00
Filip Gawin	bf2316bd54	Cleanup audiocode and fix for ComputeDopplerEffectedFrequency	2020-04-07 15:44:31 +02:00
aap	1207c2ce6f	implemented CShinyTexts	2020-04-07 12:33:14 +02:00
aap	2100bdd529	implemented CRubbish	2020-04-07 01:19:24 +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	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
aap	cbbe722b70	PS2 Frontend Controls	2020-04-05 21:21:53 +02: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	5cbcaa57d7	Merge remote-tracking branch 'upstream/master'	2020-04-05 12:45:30 +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
eray orçunus	bd7a59e58e	Frontend (last-3)	2020-04-04 14:49:19 +03:00
aap	f56909d8b7	Merge pull request #377 from Fire-Head/master ... Glass	2020-04-03 11:49:08 +02:00
aap	db804f99d9	Merge pull request #376 from Nick007J/master ... final vehicles functions, some other fixes	2020-04-03 11:48:49 +02:00
aap	7ff5a3a65c	CCamera fixes	2020-04-03 09:26:10 +02:00
Sergeanur	92ec403191	Fix CFont type uint16 -> wchar	2020-04-02 09:51:35 +03:00
Sergeanur	6e6912b613	fixes	2020-04-02 09:20:45 +03:00
Fire_Head	c394bd2a6e	Glass cosmetic fixes	2020-04-02 05:37:22 +03:00
Fire-Head	13fb853fd8	Glass done	2020-04-02 00:04:56 +03:00
Nikolay Korolev	bd0cd13be1	Merge remote-tracking branch 'upstream/master'	2020-04-01 23:47:57 +03:00
Sergeanur	62ae7245ab	AudioScriptObject finished	2020-04-01 06:09:25 +03: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	e2ed468018	Merge remote-tracking branch 'upstream/master'	2020-03-31 23:54:39 +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
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	1b0368ee7d	Merge branch 'master' into garages_dev	2020-03-31 00:01:52 +03:00
Nikolay Korolev	50b43b680e	finished garages	2020-03-31 00:01:03 +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	23c6a28324	Merge branch 'master' into garages_dev	2020-03-29 18:54: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
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
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
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	92edf92570	Merge branch 'master' into garages_dev	2020-03-28 23:42:11 +03:00
Nikolay Korolev	93417853ed	fixes	2020-03-28 23:41:37 +03:00
erorcun	7242d8a440	Merge pull request #364 from erorcun/erorcun ... Limit frontend FPS to 100	2020-03-28 23:29:28 +03:00
eray orçunus	39c9a05827	Limit frontend FPS to 100	2020-03-28 23:28:36 +03:00
Filip Gawin	d13afe5cc1	audio16 fixes for review	2020-03-28 20:18:54 +01:00
Filip Gawin	58ec4b2157	ProcessVehicleEngine and ProcessActiveQueues ... Also some smaller fixes, thx erorcun for help.	2020-03-28 20:18:54 +01: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	a58bceb1a7	Merge pull request #362 from Fire-Head/master ... WaterCannon done, resource ico	2020-03-28 16:47:20 +01:00
aap	2833a08b96	CCam fix	2020-03-28 16:29:34 +01:00
Fire-Head	a81233429d	WaterCannon uv macros	2020-03-28 18:24:21 +03:00
Fire-Head	3366cd0ff8	WaterCannon done, resource ico	2020-03-28 17:02:44 +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
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	cd913404a3	Fix Text n Pager	2020-03-28 04:58:58 +02: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	0e91015940	Update Vehicle.cpp	2020-03-26 14:19:55 +01:00
blingu	a66db9efcb	Update Fire.cpp	2020-03-25 23:01:22 +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
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
aap	8703758a7b	Merge pull request #353 from Sergeanur/Debug ... obrstr + Debug	2020-03-25 09:08:33 +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
aap	4e7c186285	change default script to story	2020-03-24 11:58:09 +01:00
aap	c7bdecdd90	fix and cleanup in AddToPopulation	2020-03-24 09:02:41 +01:00
Sergeanur	a12c01e10a	obrstr + Debug	2020-03-24 09:56:37 +02:00
aap	55b62e2134	added an assert to CPed::BuildPedLists, but too many peds still crash the game	2020-03-24 08:49:55 +01:00
aap	4070cad4a7	Merge pull request #352 from Nick007J/master ... CGame::Initialise	2020-03-23 00:34:41 +01:00
Filip Gawin	da2d25c020	Fix order of math operations on integers (fires)	2020-03-22 19:32:01 +01:00
Nikolay Korolev	861506d048	merge with upstream	2020-03-22 19:47:14 +03:00
Filip Gawin	0e817230af	Remove all constexpr	2020-03-22 17:30:54 +01:00
Filip Gawin	b57e4febb0	fix include	2020-03-22 17:30:54 +01:00
Filip Gawin	39462a3865	Fixes for review	2020-03-22 17:30:54 +01:00
Filip Gawin	a097f225bc	Fixes for review	2020-03-22 17:30:54 +01: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	7c425ac4ac	Implement ProcessGarages + small cleanup	2020-03-22 17:30:54 +01:00
Filip Gawin	3b8a177470	Implement SetupJumboEngineSound	2020-03-22 17:30:54 +01:00
Filip Gawin	67398809a3	Implement ProcessFires	2020-03-22 17:30:54 +01:00
Filip Gawin	0d1f42add1	Implement ProcessCrane	2020-03-22 17:30:54 +01:00
Filip Gawin	31382bc22c	Implement ProcessCesna	2020-03-22 17:30:54 +01:00
Nikolay Korolev	d1d123dc6a	missing endlines	2020-03-22 19:19:07 +03:00
Nikolay Korolev	c29a85a443	console init	2020-03-22 18:48:16 +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
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	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	f35758a8f1	Use WriteDataToBufferPointer	2020-03-13 21:23:03 -07:00
Wes Hampson	afeac54860	Spacing fix	2020-03-13 13:50:23 -07:00
Wes Hampson	3862cda231	Style fix, use CTimeStep	2020-03-13 13:47:53 -07:00
Wes Hampson	8280dda9cb	Add CTimeStep	2020-03-13 13:46:59 -07: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	018fb3a929	Style fixes	2020-03-11 14:15:27 -07:00
Wes Hampson	81c4f75c63	Bugfixes, GenericSave() works now!	2020-03-11 14:08:10 -07:00
Wes Hampson	c7f16879df	GenericSave complete, still needs some testing	2020-03-11 00:12:40 -07:00
Wes Hampson	5bc51f8462	Save SimpleVars, Scripts, and a few others	2020-03-10 20:27:41 -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
Nikolay Korolev	1d8b3a216c	more utils	2020-03-05 01:10:09 +03:00
Nikolay Korolev	24ad650eb3	Merge branch 'master' into script_dev	2020-03-04 23:14:54 +03:00
Nikolay Korolev	8c13eab30a	fixed dummyobject bug	2020-03-04 23:13:45 +03:00
Nikolay Korolev	2058ca6bbb	more utils	2020-03-04 23:12:16 +03:00
Nikolay Korolev	0a3211d0cf	Merge branch 'master' into script_dev	2020-03-02 22:54:47 +03:00
Nikolay Korolev	d492390fec	script utils	2020-03-02 22:54:13 +03:00
eray orçunus	a718e699ad	Fixes and cleanup	2020-03-02 03:06:52 +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
aap	f8cd12ffb3	Merge pull request #333 from Nick007J/master ... script 1000-1154	2020-02-23 11:00:15 +01:00
Nikolay Korolev	aa5266b1b3	some cosmetic stuff	2020-02-23 02:29:38 +03:00
eray orçunus	b2d062ef2d	some fixes	2020-02-23 01:48:21 +03:00
Filip Gawin	c92dfb0064	Fix police radio condition ... thx @Nick007J	2020-02-22 19:47:42 +01:00
Nikolay Korolev	bc139e0702	ARRAY_SIZE	2020-02-22 17:53:28 +03:00
Nikolay Korolev	1366c58d59	removed extra include	2020-02-22 17:19:56 +03:00
Nikolay Korolev	a122d558a2	merge + bug fix	2020-02-22 15:53:41 +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	89be27734b	a fix	2020-02-13 23:34:36 +03:00
eray orçunus	f307839a2b	CPlayerPed done	2020-02-13 22:02:45 +03:00
Sergeanur	d1700b3257	Fixed random sound volume	2020-02-07 21:40:10 +02:00