1109 commits

Author	SHA1	Message	Date
Nikolay Korolev	c75c4603fc	bad stuff	2021-01-01 23:06:20 +03:00
Nikolay Korolev	29b76fc4f5	small thing	2021-01-01 22:57:17 +03:00
Nikolay Korolev	b4b9f9601b	Merge branch 'miami' into lcs-dev	2021-01-01 14:55:00 +03:00
Nikolay Korolev	9fd93e8e57	merge master to miami	2021-01-01 14:53:20 +03:00
Nikolay Korolev	2f05c64470	actual struct name	2021-01-01 13:35:23 +03:00
Nikolay Korolev	575845772f	Merge branch 'miami' into lcs-dev	2021-01-01 13:21:42 +03:00
Nikolay Korolev	56ea1c7be7	fixed some bugs (saves might be broken though)	2020-12-31 19:29:13 +03:00
Sergeanur	9c2f1b0833	More bike leftovers	2020-12-28 14:00:44 +02:00
Nikolay Korolev	149aef929d	fixed replay	2020-12-26 12:56:20 +03:00
Sergeanur	e00b8a93bf	Fix use of strncmp	2020-12-25 15:18:48 +02:00
Sergeanur	b12eef1d56	Fix use of strncmp	2020-12-25 15:18:13 +02:00
Nikolay Korolev	5f98b4fdca	Merge remote-tracking branch 'upstream/miami' into miami	2020-12-25 12:12:09 +03:00
Nikolay Korolev	86f04884de	fix garage	2020-12-25 12:11:22 +03:00
Sergeanur	6a2edcea46	Small type use fixes ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/vehicles/Cranes.cpp	2020-12-25 09:03:13 +02:00
Sergeanur	de31bdc89f	Small type use fixes	2020-12-25 08:59:32 +02:00
Nikolay Korolev	dcb28bfd53	fix	2020-12-20 17:12:34 +03:00
Nikolay Korolev	fc72ff24d0	implemented collectives in script	2020-12-20 17:07:58 +03:00
Fire-Head	0bea6d039b	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-12-19 22:33:17 +03:00
Fire-Head	140fa2a21c	restore original code, fixes, ps2 font	2020-12-19 21:25:45 +03:00
Nikolay Korolev	76a564df2e	fixed review stuff	2020-12-19 14:33:22 +03:00
Nikolay Korolev	8d1996833b	merge attempt	2020-12-19 03:21:04 +03:00
aap	55cf1a37cb	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-12-18 13:50:37 +01:00
aap	a7050458ae	little cleanup and synch on templates and config	2020-12-18 13:50:26 +01:00
Sergeanur	cfda5eb148	PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes	2020-12-18 02:58:09 +02:00
Sergeanur	e9a5670348	PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes	2020-12-18 02:57:54 +02:00
Sergeanur	2903ebe296	Fix placement of some script functions ... # Conflicts: # src/control/Script5.cpp	2020-12-16 23:29:17 +02:00
Sergeanur	9a9b1e7574	Fix placement of some script functions	2020-12-16 23:28:06 +02:00
Sergeanur	f76dfaee82	Use SetPedState	2020-12-15 05:11:02 +02:00
Sergeanur	ac95138c18	More fixes	2020-12-15 04:16:29 +02:00
Sergeanur	ab3e258f19	SetPedState fixes	2020-12-15 03:25:05 +02:00
shfil	3b8ac474a2	Implement COMMAND_IS_CAR_PASSENGER_SEAT_FREE ... Fixes 881	2020-12-14 15:33:16 +01:00
Seemann	0563478de0	Fix some formatting issues	2020-12-14 11:18:46 +02:00
Sergeanur	f42a01f653	CPed::SetWeaponLockOnTarget	2020-12-14 09:47:07 +02:00
Nikolay Korolev	8fb461b873	removed obsolete ifdef (since we have GTA_REPLAY)	2020-12-13 00:20:44 +03:00
Nikolay Korolev	01c95378e1	fixed some replay bugs	2020-12-12 23:05:12 +03:00
Nikolay Korolev	bfe382c315	better fix	2020-12-12 21:06:14 +03:00
Nikolay Korolev	229b8f304a	fixed a bug	2020-12-12 20:37:26 +03:00
Nikolay Korolev	82c40b73ca	fixed a bug	2020-12-12 20:35:17 +03:00
Nikolay Korolev	4197498e2d	fixed garages + minor fixes	2020-12-12 12:24:55 +03:00
aap	ccbbde549e	Merge pull request #869 from Nick007J/miami ... garages revision + fixes	2020-12-09 09:55:50 +01:00
erorcun	ac3484b82e	Merge pull request #872 from withmorten/sized-enums-miami ... Get rid of sized enums 2: Electric Boogaloo	2020-12-09 03:31:03 +03:00
erorcun	6b654094a5	Merge pull request #871 from withmorten/sized-enums ... Get rid of sized enums	2020-12-09 03:15:20 +03:00
Nikolay Korolev	016ff5b4aa	sync with upstream	2020-12-08 12:00:24 +03:00
Sergeanur	f3e9c82432	Pool fixes from master	2020-12-08 07:52:03 +02:00
Sergeanur	b13b26b5fb	GenerateOneRandomCar cleanup	2020-12-08 03:33:56 +02:00
Sergeanur	aae4f3319f	Fixes	2020-12-08 03:29:08 +02:00
Sergeanur	8d3864a4e5	Fix CRecordDataForChase::ShouldThisPadBeLeftAlone	2020-12-08 02:56:20 +02:00
Sergeanur	84cc31fea3	Fix wrong define	2020-12-08 02:27:35 +02:00
Fire-Head	87bca997a4	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-12-07 21:50:18 +03:00
Fire-Head	c5fbb594a5	ps2 hud, restore original code	2020-12-07 21:12:13 +03:00
withmorten	7e11f639aa	don't cast script param to uint8	2020-12-07 02:02:59 +01:00
withmorten	4c0744260d	uint8 enums fixed	2020-12-07 01:59:17 +01:00
withmorten	912e71be53	int8 enums fixed	2020-12-07 01:30:38 +01:00
withmorten	afdf8c25a0	int8 enums fixed	2020-12-07 00:56:12 +01:00
withmorten	4696e3f9c8	uint8 enums fixed	2020-12-07 00:36:40 +01:00
Nikolay Korolev	406f646949	pool stuff fix	2020-12-06 21:28:40 +03:00
Nikolay Korolev	17a939e38d	quick fix	2020-12-06 19:34:43 +03:00
Nikolay Korolev	fe918d41c2	garages revision + some fixes	2020-12-06 19:30:51 +03:00
Nikolay	14eb0cd286	fixed parenthesis	2020-12-06 15:27:42 +03:00
Nikolay	efb28b888d	fixed ANCHOR_BOAT	2020-12-05 22:26:45 +03:00
Nikolay Korolev	a82188ac07	lil fix	2020-12-05 12:12:56 +03:00
Nikolay Korolev	0bd373cd56	script from other platforms and unused commands	2020-12-05 02:49:32 +03:00
aap	a6c4d9b77c	forgot to wrap in FIX_BUGS	2020-12-03 16:07:16 +01:00
aap	955698d2d3	kludge to prevent dodo unique jumps	2020-12-03 16:05:28 +01:00
erorcun	774aa1570f	Merge pull request #853 from erorcun/miami ... PlayerPed and "Redefine controls" menu done, fixes	2020-12-02 14:35:06 +03:00
erorcun	bd8b907d13	PlayerPed and "Redefine controls" menu done, fixes	2020-12-02 14:21:46 +03:00
aap	1172056833	cam lod dist fix	2020-12-02 10:39:23 +01:00
aap	f576311814	Merge branch 'master' of github.com:GTAmodding/re3	2020-12-02 10:38:39 +01:00
aap	fba657ff0c	better cam lod dist fix	2020-12-02 10:38:27 +01:00
Nikolay Korolev	fda58fb1df	added GTA_SCENE_EDIT	2020-12-02 02:34:51 +03:00
Sergeanur	24b5406a1d	Add GTA_REPLAY ... # Conflicts: # src/control/Replay.cpp # src/control/Replay.h	2020-12-01 22:53:09 +02:00
Sergeanur	e33ab44b7d	Add GTA_REPLAY	2020-12-01 22:08:05 +02:00
aap	56c471d02e	Merge pull request #854 from Nick007J/master ... small garages + templates revision	2020-12-01 11:25:02 +01:00
Nikolay Korolev	8f05ccd6c4	small garages revision + small template stuff	2020-11-30 02:15:03 +03:00
aap	d5bc382cb5	GTA_VERSION define and some config.h cleanup	2020-11-29 21:29:48 +01:00
Nikolay Korolev	8cb3c07151	some nasty FIX_BUGS for SLIDE_OBJECT	2020-11-28 21:26:38 +03:00
Zach Charo	b47c505438	Update Script.cpp ... Case sensitivity fix. Causes compile issue on linux.	2020-11-28 13:36:38 +02:00
Nikolay Korolev	f50a53e290	fix garages	2020-11-27 19:18:51 +03:00
Sergeanur	164f16c85b	Some TODOs done in Peds code	2020-11-25 19:39:57 +02:00
Sergeanur	a35b3b4602	Script commands split to original files	2020-11-24 14:06:48 +02:00
Sergeanur	bd3d09fef5	Script commands split to original files	2020-11-24 12:58:11 +02:00
Sergeanur	833bf4a619	Add some TODO stubs for unused code to be reversed	2020-11-23 18:59:50 +02:00
Sergeanur	3289bfaa87	Darkel done	2020-11-22 23:18:35 +02:00
Nikolay	2b53f267a7	one more fix ... # Conflicts: # src/control/Restart.cpp	2020-11-22 23:13:43 +02:00
Nikolay	6a6551f39b	small improvement ... # Conflicts: # src/control/Restart.cpp	2020-11-22 23:13:23 +02:00
Nikolay	222e7f56ff	one more fix	2020-11-22 02:31:52 +03:00
Nikolay	d24e1ee592	small improvement	2020-11-22 02:29:17 +03:00
aap	15ae9e2a3e	Merge pull request #823 from aap/master ... Neo screen droplets	2020-11-22 00:12:34 +01:00
aap	b9b7d5ac21	Merge pull request #825 from aap/miami ... neo screen droplets	2020-11-22 00:12:31 +01:00
Sergeanur	fe40f65703	Reorganize CPed functions into their original cpp files	2020-11-20 01:18:37 +02:00
Sergeanur	9e45feb4fa	Reorganize CPed functions into their original cpp files	2020-11-19 21:12:20 +02:00
aap	07fe099b4e	neo screen droplets	2020-11-19 19:07:32 +01:00
aap	02c7f8381b	neo screen droplets	2020-11-19 16:23:52 +01:00
erorcun	b58a54527e	Merge pull request #820 from withmorten/mission-switcher ... add mission switcher from miami	2020-11-18 01:45:12 +03:00
Nikolay Korolev	b9b9dabd75	lcs car ctrl 2	2020-11-16 22:20:56 +03:00
Sergeanur	6bc2ed74fe	Add debug code to CPathFind::PreparePathDataForType	2020-11-16 14:56:07 +02:00
Nikolay	b508458f37	small fix	2020-11-16 15:13:30 +03:00
Nikolay Korolev	ed5a9d5dc1	Merge branch 'miami' into lcs-dev	2020-11-16 12:48:28 +03:00
Nikolay Korolev	15b7126243	small fix of fix	2020-11-16 12:28:20 +03:00
Nikolay Korolev	0ac621588e	small fix	2020-11-16 12:22:55 +03:00
Nikolay Korolev	7339ebce60	lcs car ctrl 1	2020-11-16 12:21:50 +03:00
withmorten	abcda2ce29	add mission switcher from miami	2020-11-16 00:41:03 +01:00
Nikolay Korolev	26c6908d25	car AI revision	2020-11-14 14:21:56 +03:00
Nikolay Korolev	6682e56f71	small fix	2020-11-13 17:53:03 +03:00
Nikolay Korolev	3048a77a05	fix	2020-11-13 16:02:06 +03:00
Nikolay	a76c6b2307	damn	2020-11-11 13:40:11 +03:00
Nikolay	a8b5303207	Update src/control/Pickups.cpp ... Co-authored-by: Sergeanur <s.anureev@yandex.ua>	2020-11-11 13:19:21 +03:00
Nikolay Korolev	612a6dd06c	Merge remote-tracking branch 'upstream/miami' into miami	2020-11-11 00:08:54 +03:00
Nikolay Korolev	ef2089cafb	CWorld done	2020-11-11 00:08:32 +03:00
Sergeanur	5c64dba65a	Merge pull request #771 from theR4K/miamiDev ... more audio for god of audio	2020-11-10 22:32:12 +02:00
erorcun	59f9c009ef	Font: Hud: Use orig. text dimensions, fix right-align calculations	2020-11-10 01:50:34 +03:00
Sergeanur	51e7f44433	Pickup fix	2020-11-08 22:40:05 +02:00
erorcun	f8367ebdef	Revert "Font: Fix text dimensions" ... This reverts commit 6729de49b1.	2020-11-08 21:11:55 +03:00
erorcun	fe5d0c9cdf	Font: Hud: Use orig. text dimensions, fix right-align calculations	2020-11-08 20:49:47 +03:00
Roman Masanin	95bd5b073a	pointers into referencies!	2020-11-08 20:31:24 +03:00
Roman Masanin	23d23f6462	merge upstream	2020-11-08 16:23:05 +03:00
Sergeanur	a2e0373d22	Pickups fix	2020-11-08 15:00:54 +02:00
Nikolay Korolev	e473123a6a	fixes	2020-11-03 00:07:25 +03:00
Nikolay Korolev	0ccc70c843	embarassing	2020-11-02 23:53:52 +03:00
Nikolay Korolev	bae6c24209	fix	2020-11-02 15:54:42 +03:00
Roman Masanin	55c4346610	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev	2020-11-01 22:35:46 +03:00
Nikolay Korolev	5edd9e75da	finished script and replay	2020-11-01 18:21:05 +03:00
Nikolay Korolev	45c09224f7	fixed KYFC	2020-11-01 16:34:39 +03:00
Nikolay Korolev	63a27fbc5f	overflow fix	2020-11-01 13:55:29 +03:00
Nikolay Korolev	f21cfef8fb	remove autosave at end of mission under MISSION_REPLAY	2020-11-01 12:33:16 +03:00
Sergeanur	9a3758bfc1	Fix undefined colorId for pickups	2020-10-26 16:39:43 +02:00
erorcun	6729de49b1	Font: Fix text dimensions	2020-10-25 20:57:24 +03:00
Roman Masanin	a12789c632	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev	2020-10-24 22:26:56 +03:00
erorcun	07d1637342	Merge pull request #779 from Sergeanur/VC/Pickups ... Pickups Done	2020-10-24 17:56:21 +03:00
Roman Masanin	39b7075502	merge Upstream	2020-10-24 14:20:08 +03:00
Sergeanur	ca497e2cbd	ScriptSounds	2020-10-23 16:56:34 +03:00
Sergeanur	d7b9884f9d	Use audio enum	2020-10-23 16:18:46 +03:00
Sergeanur	2709531f09	Rename CObject flag	2020-10-21 21:14:40 +03:00
Sergeanur	e9a89236a2	Pickups Done	2020-10-21 21:00:13 +03:00
Sergeanur	632569cff3	Pickup fixes	2020-10-21 19:48:13 +03:00
erorcun	0750f04019	Messages, fix Font	2020-10-20 22:24:56 +03:00
Roman Masanin	0594ed5b46	peds	2020-10-18 23:03:03 +03:00
Nikolay Korolev	a1112183de	fix	2020-10-18 22:53:25 +03:00
Nikolay Korolev	6173e1dd10	fix	2020-10-18 22:52:49 +03:00
erorcun	1858904ce0	Merge pull request #769 from Sergeanur/VC/Pickups ... Partial Pickups	2020-10-18 20:01:32 +03:00
erorcun	10758088ef	Merge pull request #766 from Fire-Head/miami ... Glass	2020-10-18 19:59:11 +03:00
erorcun	70f9832e14	Merge branch 'miami' into miami	2020-10-18 19:45:11 +03:00
Sergeanur	8697eebbc2	Merge branch 'miami' into VC/Pickups ... # Conflicts: # src/control/Pickups.cpp	2020-10-18 17:17:11 +03:00
Sergeanur	0d20f1c364	Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/RoadBlocks.cpp # src/entities/Entity.h # src/entities/Physical.cpp # src/peds/Ped.cpp # src/render/Renderer.cpp # src/vehicles/Automobile.cpp # src/vehicles/CarGen.cpp # src/weapons/BulletInfo.cpp # src/weapons/Weapon.cpp	2020-10-18 17:15:49 +03:00
Sergeanur	cc0ae51631	lil fix	2020-10-18 16:55:11 +03:00
Sergeanur	b91f6a4550	Setter for bIsStatic (became virtual in SA)	2020-10-18 16:40:06 +03:00
shfil	cafe4e38db	Script.cpp missing breaks	2020-10-18 13:37:17 +03:00
Sergeanur	b3385015e5	Merge remote-tracking branch 'origin/miami' into VC/Pickups	2020-10-18 04:54:01 +03:00
shfil	82f54b946f	Script.cpp missing breaks	2020-10-18 00:56:07 +02:00
erorcun	4e4e0e8e04	Merge pull request #765 from erorcun/miami ... Radar, WaterCannon, win/glfw skels	2020-10-17 18:39:56 +03:00