427 Commits

Author	SHA1	Message	Date
Nikolay Korolev	9067469f7c	more attractor fixes	2020-05-16 11:30:58 +03:00
Nikolay Korolev	cf5db73117	a few fixes	2020-05-16 11:22:12 +03:00
Nikolay Korolev	03c4a979c8	removed duplicate code	2020-05-16 10:53:20 +03:00
Nikolay Korolev	5abd466b5d	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 10:52:58 +03:00
Nikolay Korolev	5491a51daa	remove debug	2020-05-16 10:39:18 +03:00
Sergeanur	76dd769085	Merge branch 'master' into miami	2020-05-16 05:07:39 +03:00
Sergeanur	ec1b91e527	Remove unused audio enum	2020-05-16 05:06:51 +03:00
Nikolay Korolev	a4562c5720	fixed spaces/tabs	2020-05-16 02:15:24 +03:00
Nikolay Korolev	f864698696	ped attractors	2020-05-16 02:10:23 +03:00
Nikolay Korolev	21329b8440	sync with upstream	2020-05-16 01:50:45 +03:00
Nikolay Korolev	08b2138c7e	ped attractors done	2020-05-16 01:49:30 +03:00
erorcun	8ff72f0728	Merge pull request #550 from erorcun/miami ... Weapon layer in Peds	2020-05-15 21:30:57 +03:00
eray orçunus	acd1ea9909	Weapon layer in Peds	2020-05-15 21:21:25 +03:00
aap	1fde2ba468	CPedIK	2020-05-15 19:41:44 +02:00
Nikolay Korolev	09a0207e55	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-14 22:29:23 +03:00
Sergeanur	ede6b7db6a	Fix compilation	2020-05-14 17:15:26 +03:00
Sergeanur	24875f34d0	Merge branch 'master' into miami ... # Conflicts: # src/modelinfo/ClumpModelInfo.cpp	2020-05-14 17:05:42 +03:00
aap	704a5c158f	Merge pull request #547 from Nick007J/master ... a few bugfixes	2020-05-14 14:39:23 +02:00
aap	c21061a199	fixed RotateTorso	2020-05-14 14:29:39 +02:00
Nikolay Korolev	9d4d83db0d	some fixes	2020-05-14 14:01:24 +03:00
Nikolay Korolev	d031943f2a	more pedattractor	2020-05-14 13:46:11 +03:00
Nikolay Korolev	d426588496	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-13 17:55:12 +03:00
Sergeanur	3f1001b86b	More save/load alignment fixes	2020-05-13 16:24:00 +03:00
Nikolay Korolev	81ea6f0258	ped attractor: start	2020-05-13 11:38:05 +03:00
Sergeanur	7c2b9478d5	Merge branch 'master' into miami ... # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp	2020-05-13 00:55:52 +03:00
Sergeanur	33dfaf7da1	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp	2020-05-13 00:27:15 +03:00
Filip Gawin	c2ac6b3759	Fix linux warnings	2020-05-12 23:18:54 +02:00
Sergeanur	0aa7f13c32	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h	2020-05-11 21:07:12 +03:00
eray orçunus	8a4fa58cd4	Linux build support	2020-05-11 21:00:55 +03:00
bigbossbro08	bd302ecca1	Merge remote-tracking branch 'upstream/master'	2020-05-10 22:05:45 +06:00
bigbossbro08	b4abb6ddd8	fixed few more typos	2020-05-10 22:04:36 +06:00
bigbossbro08	c798e1bacd	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
aap	5b605c1271	some fixes and cosmetic changes	2020-05-10 17:09:57 +02:00
bigbossbro08	af6e132b37	defined out asserts.	2020-05-10 19:54:37 +06:00
aap	f7300c7a27	CPedModelInfo	2020-05-10 13:08:02 +02:00
Nikolay Korolev	a827f0dd55	sync with upstream	2020-05-10 12:26:32 +03:00
Nikolay Korolev	2f7d2fa3ad	more car control	2020-05-10 12:25:30 +03:00
Sergeanur	35c41208f5	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h	2020-05-10 01:26:12 +03:00
aap	97d5698e0c	peds starting to work	2020-05-09 17:05:26 +02:00
Sergeanur	1b599b2d35	Fix compilation error	2020-05-09 15:41:00 +03:00
aap	ea053467b5	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-09 12:45:27 +02:00
aap	e8c0619226	named anim assoc flags	2020-05-09 09:51:31 +02:00
aap	3f09ec0744	named anim assoc flags	2020-05-09 09:50:00 +02:00
Nikolay Korolev	7e753c2596	CCarCtrl::GenerateOneRandomCar	2020-05-08 23:29:43 +03:00
Nikolay Korolev	b99346e6ca	sync with upstream	2020-05-07 23:22:15 +03:00
aap	19b21cafcd	CZoneInfo mostly done; not its dependencies	2020-05-07 17:53:38 +02:00
Nikolay Korolev	5780b4503e	sync with upstream	2020-05-07 16:59:40 +03:00
Nikolay Korolev	40888e9486	car control and friends	2020-05-07 16:57:49 +03:00
aap	05a1d64fbb	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
Sergeanur	6ad66fb2d7	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/render/Renderer.cpp	2020-05-06 19:32:57 +03:00
Nikolay Korolev	a24b65cbde	IsStatic	2020-05-06 19:17:47 +03:00
aap	c11912a8ec	sorted out object collision enums	2020-05-06 17:14:34 +02:00
aap	a2b89c6a18	sorted out object collision enums	2020-05-06 17:13:46 +02:00
aap	e0568a19d5	new zone stuff	2020-05-06 12:23:57 +02:00
aap	cbfc45b3f7	some work on zones	2020-05-06 12:23:26 +02:00
aap	68d3ea9c42	getting the vice city map to work	2020-05-05 23:27:43 +02:00
aap	e81652c2fc	cleaned up MIAMI ifdefs	2020-05-05 18:06:38 +02:00
Sergeanur	1eb817de77	Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL	2020-05-05 18:32:46 +03:00
Sergeanur	c2b9ddc5b8	Revert "Remove Miami stuff" ... This reverts commit 9960c41193.	2020-05-05 18:04:43 +03:00
Sergeanur	9960c41193	Remove Miami stuff	2020-05-05 18:04:18 +03:00
aap	b3b9be5e8c	merged master	2020-05-05 14:21:13 +02:00
Sergeanur	4cc1bb92e7	Make CBaseModelInfo fields protected	2020-05-05 15:06:55 +03:00
Sergeanur	e9b334d7bf	More use of GetModelIndex	2020-05-05 14:48:35 +03:00
aap	b44df26d3e	implemented most of streamed collisions and big buildings	2020-05-05 13:02:42 +02:00
Sergeanur	84c9484e55	SetPosition, final part	2020-05-05 04:45:18 +03:00
aap	702da55ec9	implemented most of vice city path system	2020-05-03 16:09:37 +02:00
Nikolay Korolev	7d067684ff	Merge remote-tracking branch 'upstream/master'	2020-05-02 18:02:45 +03:00
Nikolay Korolev	f372ce156d	changed saving compatibility	2020-05-02 18:02:17 +03:00
Sergeanur	d23b2c423e	SetPosition, part 1	2020-05-02 15:13:09 +03:00
Sergeanur	e14733367e	Rename m_phy_flagA80 to bSkipLineCol	2020-04-30 18:58:15 +03:00
Sergeanur	81094f2cd7	Rename m_ped_flagA2 into bWasStanding	2020-04-30 18:13:38 +03:00
Sergeanur	7d758f3a9f	Adding getters and setters for type and status	2020-04-30 16:45:45 +03:00
Sergeanur	c94ccce6d6	Audio structs moved to their AudioManager.h	2020-04-27 20:06:54 +03:00
Sergeanur	669bbe3cc7	Workaround for a crash on release	2020-04-27 01:55:06 +03:00
aap	f03b4eec4c	implemented skinned peds, no cutscene hands yet	2020-04-24 11:42:38 +02: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	bcc3a8b6c7	missing ifded	2020-04-19 01:20:14 +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
Filip Gawin	d6314f9564	Revert "Part one" ... This reverts commit 63951d9b95.	2020-04-18 12:29:28 +02:00
Filip Gawin	2b1570de70	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-04-18 12:08:38 +02:00
Sergeanur	555f933780	Remove padding fields	2020-04-18 11:31:53 +03:00
eray orçunus	812b9e7eda	Various fixes	2020-04-18 05:58:43 +03:00
Filip Gawin	63951d9b95	Part one	2020-04-17 19:30:57 +02:00
Sergeanur	599164006a	Remove patches	2020-04-17 16:31:11 +03:00
eray orçunus	425395ad25	Ped fixes and ref removal	2020-04-17 07:01:54 +03:00
aap	89b7085353	Merge branch 'master' of github.com:gtamodding/re3	2020-04-16 09:23:31 +02:00
Nikolay Korolev	5993c66efb	Fixed bridge despawns	2020-04-16 01:59:19 +03:00
aap	afce2e1bb3	Merge branch 'master' of github.com:gtamodding/re3	2020-04-15 22:36:21 +02:00
Nikolay Korolev	5cb7e2e42a	Merge pull request #440 from Fire-Head/master ... CWeapon done, fixes	2020-04-15 23:28:09 +03:00
Fire-Head	c3647ee51e	rem comment	2020-04-15 20:34:58 +03:00
eray orçunus	4da1879975	Many fixes and cleanup	2020-04-15 19:19:45 +03:00
aap	90be379bed	implemented most of librw wrapper	2020-04-15 14:05:40 +02:00
Fire-Head	daed13485e	CWeapon done, ps2 cheats fix	2020-04-15 08:03:53 +03:00
Sergeanur	a19fa8764f	CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement	2020-04-14 13:08:03 +03:00
erorcun	313f547860	Some cleanup	2020-04-14 03:21:16 +03:00
erorcun	9044f57a0e	Merge pull request #408 from erorcun/erorcun ... Revert "fix"	2020-04-12 18:53:24 +03:00
eray orçunus	bde3ef4f43	Revert "fix"	2020-04-12 18:51:46 +03:00
erorcun	0caceec1de	Merge pull request #407 from erorcun/erorcun ... Ped fix	2020-04-12 18:39:23 +03:00
eray orçunus	8476283174	Ped fix	2020-04-12 18:37:59 +03:00
Nikolay Korolev	c593599fc5	Merge pull request #399 from saml1er/master ... CObject complete	2020-04-12 12:05:49 +03:00
eray orçunus	f2995640bd	CMenuManager done and CHud fixes	2020-04-12 00:56:27 +03:00
Sergeanur	3a4442eca4	disabling the code that freezes gang members	2020-04-10 16:14:05 +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	e6476bafff	Cheats	2020-04-09 00:17:14 +03:00
aap	7ff5a3a65c	CCamera fixes	2020-04-03 09:26:10 +02:00
eray orçunus	5e2fe749bd	Mouse free cam for peds&cars (under FREE_CAM)	2020-03-31 06:05: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
eray orçunus	112685ebac	CCopPed done and #include cleanup	2020-03-28 18:52:25 +03:00
aap	739e80614d	remove include <new> from common.h	2020-03-28 09:37:04 +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	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	c7bdecdd90	fix and cleanup in AddToPopulation	2020-03-24 09:02:41 +01: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
Nikolay Korolev	861506d048	merge with upstream	2020-03-22 19:47:14 +03: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
Nikolay Korolev	d1d123dc6a	missing endlines	2020-03-22 19:19:07 +03:00
Nikolay Korolev	34b1881528	CGame::Initialise	2020-03-22 17:23:40 +03:00
eray orçunus	d5a6e17079	ProcessButtonPresses and fixes	2020-03-21 14:58:54 +03:00
eray orçunus	934e9db4fc	CPopulation done, CCopPed and fixes	2020-03-12 00:48:33 +03:00
Nikolay Korolev	8c13eab30a	fixed dummyobject bug	2020-03-04 23:13:45 +03:00
eray orçunus	a718e699ad	Fixes and cleanup	2020-03-02 03:06:52 +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	a122d558a2	merge + bug fix	2020-02-22 15:53:41 +03:00
Nikolay Korolev	a312e1ff81	merge	2020-02-22 15:36:22 +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	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
eray orçunus	9896217608	few little things	2020-02-04 00:27:48 +03:00
eray orçunus	ce0687db27	A bug fix and VC ports for veh. enter/exit	2020-02-03 21:03:48 +03:00
eray orçunus	03b995c6ef	Some fixes and some cosmetic things	2020-02-02 16:58:52 +03:00
Sergeanur	2c8cce4655	suggested fixes	2020-01-30 18:15:27 +02:00
Sergeanur	81de0e0cbd	acos	2020-01-29 13:00:40 +02:00
Sergeanur	8a6cec8bed	CPedIK finished	2020-01-29 01:53:58 +02:00
Sergeanur	1561ab6440	Fixed autoaiming camera	2020-01-29 01:11:44 +02:00
erorcun	d75b9b8257	CPlayerPed continues (#294)	2020-01-23 23:21:50 +03:00
erorcun	2d00d7b3e2	Merge pull request #291 from Sergeanur/AccidentManager ... AccidentManager	2020-01-12 02:11:47 +03:00
eray orçunus	5d119cf985	Fixes 2	2020-01-11 20:36:46 +03:00
Sergeanur	bbc68ffb1c	AccidentManager	2020-01-11 15:14:02 +02:00
erorcun	f9316d9cc3	CPlayerPed & CMenuManager (#286) ... Make Frontend great again!	2020-01-07 17:23:09 +03:00
erorcun	18de44e038	Merge pull request #285 from Nick007J/script_dev ... 600-799 script commands; bug fixes	2020-01-07 17:08:51 +03:00
Sergeanur	71889de1be	Use CGeneral::faststricmp in CPed::ServiceTalking	2020-01-07 15:43:56 +02:00
Nikolay Korolev	0723dade76	script 800-899	2020-01-03 19:48:13 +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	6cbf1db519	CPlayerInfo done	2019-12-16 07:48:44 +03:00
eray orçunus	dad7782ff0	CPhone, CPlayerInfo, CFire, CWorld	2019-12-06 00:55:23 +03:00
Filip Gawin	c7e9ddb566	Audio fixes for erorcun review	2019-12-01 20:44:57 +01:00
eray orçunus	6496143022	Shadow/blood fade and scale fix	2019-11-28 00:22:38 +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
erorcun	0df15bb73d	Merge pull request #263 from Sergeanur/strcmp ... Implemented faststrcmp, faststricmp, strcasecmp	2019-11-09 18:06:20 +03:00
eray orçunus	d5619fb5ae	Peds & a few fixes	2019-11-05 03:52:06 +03:00
eray orçunus	ad69a319cb	The Peds	2019-10-30 02:41:47 +03:00
Sergeanur	c202fc3b55	Implemented faststrcmp, faststricmp, strcasecmp	2019-10-30 01:35:31 +02:00
eray orçunus	36e136a06c	Fall damage fix	2019-10-27 18:00:31 +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
eray orçunus	5fa56e4173	Gang attack fix & SeekCar	2019-10-26 18:43:25 +03:00
Sergeanur	d5a72fa597	Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode	2019-10-26 15:20:12 +03:00
Sergeanur	f62555c28e	CPedIK limb movement info reversed	2019-10-26 14:13:00 +03:00
Filip Gawin	8808e6fdfe	Fixes for aap review (audio8)	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
eray orçunus	2d998b2416	Fixes&Peds	2019-10-25 22:17:55 +03:00
Nikolay Korolev	63e39fd8bf	fixed adrenaline	2019-10-19 12:37:31 +03:00
erorcun	38565a47a1	Merge branch 'master' into master	2019-10-16 23:42:04 +03:00
eray orçunus	b43ad08c03	Peds	2019-10-16 20:18:03 +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
Nikolay Korolev	8eda735918	400-499	2019-10-13 14:46:09 +03:00
eray orçunus	0562a6e983	Peds&fixes	2019-10-13 07:17:53 +03:00
Sergeanur	4ca7304e43	Fix uninitialized orderInCat	2019-10-12 23:10:25 +03:00
Nikolay Korolev	a1700eeaa4	Merge branch 'master' into script_dev	2019-10-12 22:24:58 +03:00
Nikolay Korolev	c78fff8d54	script 400-499 start	2019-10-12 22:00:31 +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	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
Sergeanur	3e25726697	Fixed crash when aboarding train	2019-10-08 02:19:44 +03:00
eray orçunus	c9d92a7d1b	Little fix	2019-10-07 01:13:18 +03:00
eray orçunus	d5d1c7ec5f	Peds	2019-10-07 00:39:25 +03:00