835 Commits

Author	SHA1	Message	Date
Nikolay Korolev	9bb8b39956	fixed typo	2020-07-03 15:17:02 +03:00
Nikolay Korolev	85e899c1a5	fixed typo	2020-07-03 15:15:42 +03:00
Nikolay Korolev	48ebbb7292	ice cream attractor + bike respray	2020-07-03 11:08:19 +03:00
eray orçunus	c4cd210ae0	Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes	2020-07-02 16:01:42 +03:00
Nikolay Korolev	389123cff3	fix	2020-07-01 16:06:16 +03:00
Nikolay Korolev	ade5dff217	script logging for miami	2020-07-01 15:43:19 +03:00
Nikolay Korolev	a1356f1001	copypaste bug	2020-07-01 15:38:32 +03:00
erorcun	eda50bc32b	Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)	2020-07-01 15:28:43 +03:00
Nikolay Korolev	779d4e02a4	little fix	2020-07-01 15:12:25 +03:00
Sergeanur	b26eec5daf	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp	2020-06-29 12:56:50 +03:00
Fire_Head	860f75d66c	Merge branch 'master' into ps2menu	2020-06-29 09:37:53 +03:00
Nikolay Korolev	920bc0a1bf	fix	2020-06-28 16:24:09 +03:00
Nikolay Korolev	d6e111bb67	script logging fixes	2020-06-28 11:59:20 +03:00
Fire-Head	1c11a8081f	mips overdose	2020-06-28 00:01:51 +03:00
Nikolay Korolev	ba3fe38f2e	fixes	2020-06-22 14:07:19 +03:00
eray orçunus	f3ed6659c3	CWanted, anim fix, ped objs renaming, remove III beta features	2020-06-22 04:20:56 +03:00
Nikolay Korolev	7a71a47f74	updated player control names	2020-06-21 16:00:17 +03:00
Nikolay Korolev	0ab4496423	copypaste	2020-06-21 13:51:20 +03:00
Nikolay Korolev	f5cba0ce89	script logging	2020-06-21 13:46:23 +03:00
Nikolay Korolev	144f12525e	fix	2020-06-20 13:51:39 +03:00
Nikolay Korolev	eab6741afe	fix	2020-06-20 13:26:27 +03:00
Nikolay Korolev	e9e533b0cb	bikes in garages + bugfix	2020-06-18 00:03:43 +03:00
eray orçunus	e44704dc82	Ped, Weapon and fixes	2020-06-17 21:24:59 +03:00
eray orçunus	a822692c26	fix crash-VC pickup scaling	2020-06-16 22:55:28 +03:00
eray orçunus	c6bb1f5d0d	some cutscene opcodes and heli guns	2020-06-16 20:35:09 +03:00
eray orçunus	ef4c8f53c5	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-15 00:26:27 +03:00
eray orçunus	2d976827dd	much better mission switcher	2020-06-15 00:26:19 +03:00
erorcun	f64d3ad7de	Merge pull request #631 from erorcun/miami ... Peds, mission switcher & fixes	2020-06-14 22:59:02 +03:00
eray orçunus	db6110e996	Peds, mission switcher & fixes	2020-06-14 22:57:26 +03:00
aap	c7a32bb83d	some camera code	2020-06-14 09:36:30 +02:00
Nikolay Korolev	f78f707935	script fix	2020-06-13 02:02:59 +03:00
Nikolay Korolev	d415c4edd3	minor fix	2020-06-13 00:16:10 +03:00
Nikolay Korolev	3900366a6b	debug fix	2020-06-12 22:39:33 +03:00
Nikolay Korolev	17dd26e1ca	heli AI fix	2020-06-12 22:38:37 +03:00
aap	b07b1f0b51	Merge pull request #624 from erorcun/miami ... Peds, bike center of mass and reversing fixes	2020-06-09 15:43:25 +02:00
eray orçunus	dba2b052a6	Peds, bike center of mass and reversing fixes	2020-06-09 01:29:55 +03:00
Sergeanur	95e9fe7693	fixes	2020-06-08 16:22:49 +03:00
Sergeanur	36a6d124aa	Mission audio slots	2020-06-08 10:34:31 +03:00
Nikolay Korolev	2de3c6d67b	some fixes to heli AI (not all yet)	2020-06-08 02:34:53 +03:00
Nikolay Korolev	b498ad800c	Merge remote-tracking branch 'upstream/miami' into miami	2020-06-08 02:04:58 +03:00
Nikolay Korolev	d48749f797	fixed attached ped	2020-06-08 02:04:37 +03:00
eray orçunus	94e9101ce0	more fixes	2020-06-08 01:51:11 +03:00
Nikolay Korolev	16a5c2f676	fixes	2020-06-08 01:21:49 +03:00
Nikolay Korolev	af564d865c	fixes	2020-06-08 01:16:21 +03:00
eray orçunus	a77b181e32	CarCtrl fixes	2020-06-08 00:59:43 +03:00
Nikolay Korolev	23f20ceaf8	fix	2020-06-07 19:35:05 +03:00
Nikolay Korolev	2f9becbac6	fix	2020-06-07 19:31:15 +03:00
Nikolay Korolev	d0213e466c	more script commands	2020-06-07 15:49:25 +03:00
Nikolay Korolev	0b156f1d26	some stats tweaks; saves dead again	2020-06-07 15:23:52 +03:00
Nikolay Korolev	c50a61d52a	fixed some arithmetic	2020-06-07 15:08:58 +03:00
Nikolay Korolev	be2291e44c	fixed some arithmetic	2020-06-07 15:07:36 +03:00
eray orçunus	de4323f949	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-07 12:46:15 +03:00
eray orçunus	d1a02e6ddc	New ped objectives	2020-06-07 12:45:53 +03:00
Fire-Head	9c0adf6a8f	Revert "FONT_BANK renamed to FONT_STANDARD" ... This reverts commit 552205dfba.	2020-06-07 05:03:06 +03:00
Sergeanur	1c01899799	Merge branch 'master' into miami ... # Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp	2020-06-07 04:15:10 +03:00
Sergeanur	552205dfba	FONT_BANK renamed to FONT_STANDARD	2020-06-07 04:10:06 +03:00
Nikolay Korolev	3f26250d73	fixing some uninitialized stuff	2020-06-06 13:31:09 +03:00
eray orçunus	f045ce4386	Bike riding anims, SA bike/heli cam	2020-06-05 23:13:34 +03:00
Nikolay Korolev	83e4023dc0	fix	2020-06-05 12:59:27 +03:00
Nikolay Korolev	d325a3d247	basic bike support in traffic, script and car gen; some heli AI	2020-06-05 11:22:15 +03:00
eray orçunus	5dc410a999	Peds, eSound and PedState enum, fixes	2020-06-03 17:01:11 +03:00
Sergeanur	509ca11d76	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/GameLogic.cpp # src/control/PathFind.cpp # src/control/RoadBlocks.cpp # src/control/Script.cpp # src/control/Script.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/TempColModels.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/modelinfo/VehicleModelInfo.h # src/render/Skidmarks.h # src/render/WaterLevel.cpp # src/save/GenericGameStorage.h # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/DamageManager.cpp # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h	2020-06-03 01:24:08 +03:00
Nikolay Korolev	0803c821ae	fixed roadblocks	2020-06-01 12:45:03 +03:00
Nikolay Korolev	c1c163d78c	game logic	2020-05-31 20:59:01 +03:00
Nikolay Korolev	49a897c3b3	better name	2020-05-30 20:09:58 +03:00
Nikolay Korolev	09c9e16cb1	roadblocks	2020-05-30 20:08:31 +03:00
Nikolay Korolev	e6b9c20131	fix	2020-05-30 18:07:01 +03:00
eray orçunus	dd162c3aa0	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-05-29 22:05:52 +03:00
eray orçunus	529cec5653	R to freeroam, idle anims, weapon and cam enum fix	2020-05-29 22:05:33 +03:00
Nikolay Korolev	627ffb0f82	fix	2020-05-29 16:52:02 +03:00
eray orçunus	e6401bce18	Detect R and start game on menu	2020-05-28 12:46:51 +03:00
eray orçunus	98fec63ca7	Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun	2020-05-28 11:40:56 +03:00
eray orçunus	329a387fdf	Frontend customization functions, freecam toggle, minor things	2020-05-28 11:34:12 +03:00
aap	9bcec54291	Merge pull request #599 from Nick007J/master ... Mission replay	2020-05-28 10:25:14 +02:00
Nikolay Korolev	d9d57f12fc	crash fix	2020-05-28 01:00:49 +03:00
Nikolay Korolev	d4ae40ae99	crash fix	2020-05-27 19:39:04 +03:00
aap	c068570192	Merge pull request #600 from Fire-Head/miami ... Miami Particle	2020-05-27 07:18:47 +02:00
Sergeanur	408faf8a66	Support of original mp3/wav/adf	2020-05-27 03:29:54 +03:00
Fire-Head	90947a608f	fix linux build	2020-05-27 03:18:02 +03:00
Fire-Head	6a32981ba5	VC CParticle done	2020-05-27 02:16:31 +03:00
Nikolay Korolev	ec1d14971c	mission replay	2020-05-27 00:25:12 +03:00
Sergeanur	0ce2af7a0d	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/core/SurfaceTable.cpp # src/core/SurfaceTable.h # src/core/World.cpp # src/core/main.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/Ped.cpp # src/render/Timecycle.cpp # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/Heli.cpp # src/vehicles/Vehicle.cpp # src/weapons/Weapon.cpp # src/weapons/WeaponInfo.h	2020-05-26 17:24:47 +03:00
aap	800d706935	Merge pull request #588 from blingu/miami ... fixed compiler errors	2020-05-26 11:39:16 +02:00
Nikolay Korolev	5ca0d6c6cf	fixed NE bug	2020-05-26 00:45:32 +03:00
Nikolay Korolev	38d2854226	fixed FIX_BUGS	2020-05-26 00:18:04 +03:00
aap	7bf8337854	CVehicle	2020-05-25 18:33:34 +02:00
blingu	79c652e115	Ped.h include not needed	2020-05-24 17:48:13 +02:00
nrb	d59862eb5e	fixed compiler errors	2020-05-24 17:27:12 +02:00
Nikolay Korolev	8705562559	how did saving even work in original III?	2020-05-24 15:58:25 +03:00
Nikolay Korolev	8c510a8d5b	script fix	2020-05-24 15:00:45 +03:00
Nikolay Korolev	cda3752838	comments	2020-05-24 13:48:17 +03:00
Nikolay Korolev	e95de89c9a	script fix	2020-05-24 12:01:07 +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	5357957fe1	Compatibility with VC weapon.dat + new shotguns	2020-05-23 16:53:20 +03:00
Nikolay Korolev	9c6046455e	fixed script	2020-05-23 12:17:05 +03:00
Nikolay Korolev	7b7b0fb5f2	removed debug	2020-05-23 02:18:16 +03:00
Nikolay Korolev	f8a509ffb3	fixes	2020-05-23 02:17:27 +03:00
Nikolay Korolev	7bf561d440	some fixes	2020-05-23 01:43:12 +03:00
Nikolay Korolev	e18eb0ce01	script fix	2020-05-23 00:50:15 +03:00
Nikolay Korolev	6e51ed3c53	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-22 23:35:19 +03:00
eray orçunus	a5f23a0342	VC CMenuManager struct, ctor etc.	2020-05-22 03:48:12 +03: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
Nikolay Korolev	73ff01e35b	script fix	2020-05-21 00:18:13 +03:00
Nikolay Korolev	510261cb05	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-20 23:54:22 +03:00
Nikolay Korolev	0085ed894f	script revision	2020-05-20 23:47:44 +03:00
Nikolay Korolev	b7c1784dd2	script fix	2020-05-20 23:25:01 +03:00
eray orçunus	5b953228b4	Pickup and audio fix	2020-05-20 21:22:40 +03:00
aap	71b9b2ecf9	Merge pull request #572 from erorcun/miami ... Fixes for melees and various things	2020-05-20 19:55:05 +02:00
Nikolay Korolev	f33a01e8c8	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-20 20:40:36 +03:00
Nikolay Korolev	d84650fbe5	script revision	2020-05-20 20:40:04 +03:00
eray orçunus	2ab3fb5dd0	Fixes for melees and various things	2020-05-20 20:21:27 +03:00
Sergeanur	c53b23cff0	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/core/Radar.h # src/core/World.cpp # src/core/config.h # src/entities/Entity.cpp # src/modelinfo/ModelIndices.h # src/modelinfo/PedModelInfo.cpp # src/peds/Population.cpp # src/render/Clouds.cpp # src/render/Hud.cpp # src/vehicles/HandlingMgr.h	2020-05-20 14:39:36 +03:00
aap	fd4cd3e8f1	Merge pull request #569 from aap/miami ... CEntity and friends	2020-05-20 12:41:12 +02:00
Nikolay Korolev	1b96e6c378	fixed script bug	2020-05-19 23:49:28 +03:00
Nikolay Korolev	fec0028e12	sync with upstream	2020-05-19 23:27:41 +03:00
aap	bdbe5d1080	CEntity and friends	2020-05-19 20:56:42 +02: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
Nikolay Korolev	c47292b518	script fix	2020-05-19 00:10:45 +03:00
Nikolay Korolev	746f2aa479	script FPS fix	2020-05-18 22:43:06 +03:00
Nikolay Korolev	5ab2c85e97	some debug changes	2020-05-18 00:34:24 +03:00
Nikolay Korolev	ad8a8913d9	a few more stubs	2020-05-18 00:20:26 +03:00
Nikolay Korolev	39931a5284	some more script stubs	2020-05-17 23:31:16 +03:00
eray orçunus	7bd6c70318	just in case	2020-05-17 22:17:43 +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
aap	72ccf9a0db	revert accidental commit; also update librw	2020-05-17 14:21:09 +02: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
aap	c54d3ba2ab	fixes for 64 bit build	2020-05-16 14:34:51 +02:00
Nikolay Korolev	4defd8b75c	minimal weather stuff + multiple bugfixes	2020-05-16 13:31:23 +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
eray orçunus	acd1ea9909	Weapon layer in Peds	2020-05-15 21:21:25 +03:00
Sergeanur	24875f34d0	Merge branch 'master' into miami ... # Conflicts: # src/modelinfo/ClumpModelInfo.cpp	2020-05-14 17:05:42 +03:00
Nikolay Korolev	b01987719e	fixed script error	2020-05-14 15:26:59 +03:00
Nikolay Korolev	1237941180	fixed traffic lights	2020-05-13 17:33:50 +03:00
Nikolay Korolev	509d57edcb	car control and cranes fixes	2020-05-13 13:29:17 +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
Nikolay Korolev	615bd1e878	garages fix	2020-05-12 20:22:35 +03:00
Nikolay Korolev	ca6ed7f00f	fix garages	2020-05-12 16:21:00 +03:00