378 Commits

Author	SHA1	Message	Date
aap	25273485d9	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-06-01 18:05:24 +02:00
eray orçunus	d930a25d94	DrawStandardMenus, VC menu array and minor fixes	2020-06-01 18:32:34 +03:00
Nikolay Korolev	c1c163d78c	game logic	2020-05-31 20:59:01 +03:00
aap	21ce0a4b28	CAutomobile done	2020-05-31 17:05:59 +02:00
eray orçunus	529cec5653	R to freeroam, idle anims, weapon and cam enum fix	2020-05-29 22:05:33 +03:00
Fire_Head	e4649b41e1	Merge pull request #2 from GTAmodding/miami ... Miami	2020-05-27 21:51:40 +03:00
Fire-Head	63d0bdc863	VC Water	2020-05-27 21:50:01 +03:00
Sergeanur	408faf8a66	Support of original mp3/wav/adf	2020-05-27 03:29:54 +03:00
aap	800d706935	Merge pull request #588 from blingu/miami ... fixed compiler errors	2020-05-26 11:39:16 +02:00
aap	7e5dde1f1a	eSurfaceType	2020-05-26 11:37:46 +02:00
aap	d8528ebbbe	eSurfaceType	2020-05-26 11:34:20 +02:00
aap	0b8f045d36	Merge pull request #586 from aap/miami ... CVehicle	2020-05-26 11:25:23 +02:00
aap	3c3b1aadc0	small fixes	2020-05-25 20:36:23 +02:00
aap	7bf8337854	CVehicle	2020-05-25 18:33:34 +02:00
blingu	55ece14f42	Update CopPed.cpp	2020-05-24 17:36:37 +02:00
nrb	d59862eb5e	fixed compiler errors	2020-05-24 17:27:12 +02:00
Nikolay Korolev	6235e2140e	fixed filename	2020-05-24 17:23:14 +03:00
eray orçunus	14755a4ff4	all my fixes live in exes	2020-05-24 16:41:29 +03:00
aap	19a0c8b462	Merge pull request #583 from erorcun/miami ... Menu borders and weapon fixes	2020-05-24 10:47:17 +02:00
eray orçunus	4870d9a31b	Menu borders and weapon fixes	2020-05-24 03:05:48 +03:00
Nikolay Korolev	2966be41ba	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-23 20:07:30 +03:00
Nikolay Korolev	607175f02a	set pieces	2020-05-23 20:06:52 +03:00
eray orçunus	c3b41d79a2	Cleanup and one needed function	2020-05-23 18:04:33 +03:00
eray orçunus	5357957fe1	Compatibility with VC weapon.dat + new shotguns	2020-05-23 16:53:20 +03:00
Nikolay Korolev	b9115b4429	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-23 01:43:17 +03:00
Nikolay Korolev	7bf561d440	some fixes	2020-05-23 01:43:12 +03:00
aap	a1e4b15bcc	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-22 23:58:59 +02:00
aap	a53ca58e56	CPhysical	2020-05-22 14:27:16 +02:00
Nikolay Korolev	864847a6fe	new script commands - mostly stubs	2020-05-22 02:42:04 +03:00
Nikolay Korolev	7e5342e9f0	script revision	2020-05-21 11:22:25 +03:00
eray orçunus	2ab3fb5dd0	Fixes for melees and various things	2020-05-20 20:21:27 +03:00
aap	fd4cd3e8f1	Merge pull request #569 from aap/miami ... CEntity and friends	2020-05-20 12:41:12 +02:00
Nikolay Korolev	fec0028e12	sync with upstream	2020-05-19 23:27:41 +03:00
aap	0b0ba49abc	small fixes	2020-05-19 21:42:55 +02:00
aap	bdbe5d1080	CEntity and friends	2020-05-19 20:56:42 +02:00
Nikolay Korolev	46d1889344	slightly restructured ped flags for convenience	2020-05-19 21:34:28 +03:00
Nikolay Korolev	4c822e8375	script revision	2020-05-19 20:54:05 +03:00
eray orçunus	99574ebfc6	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-05-19 17:46:18 +03:00
eray orçunus	a6972714b7	Melee weapons(half-working), Ped and Hud bits	2020-05-19 17:43:16 +03:00
Nikolay Korolev	6510b15704	script revision	2020-05-19 01:49:09 +03:00
aap	2d4861454c	Merge pull request #557 from Nick007J/miami ... script and script stubs	2020-05-18 13:08:24 +02:00
eray orçunus	96151ec0f0	TransformToNode crash fix?	2020-05-18 00:27:04 +03:00
Nikolay Korolev	d5d2f6a822	sync with upstream	2020-05-17 21:48:21 +03:00
Nikolay Korolev	3cc20d7962	sync with upstream	2020-05-17 21:48:12 +03:00
Nikolay Korolev	a5b84eb9fe	full script basic support	2020-05-17 21:43:11 +03:00
aap	8a7210cad1	Merge pull request #555 from erorcun/miami ... Weapon fixes and thingies	2020-05-17 20:20:14 +02:00
eray orçunus	84f8312b86	Weapon fixes and thingies	2020-05-17 21:01:52 +03:00
Nikolay Korolev	b587d835e8	more script stuff	2020-05-16 23:06:33 +03:00
Nikolay Korolev	e3291b0cb1	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
eray orçunus	40ee29fb99	Weapon fixes	2020-05-16 15:07:09 +03:00
aap	0c23166318	changed CPedIK names	2020-05-16 10:33:19 +02:00
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