3168 commits

Author	SHA1	Message	Date
eray orçunus	ceb1defc4e	fixes from master, menu helper text	2020-07-04 23:50:43 +03:00
aap	2c50cf8ac6	Merge pull request #648 from Nick007J/miami ... ice cream attractor + bike respray	2020-07-04 21:24:23 +02:00
aap	0acade08ca	Merge pull request #647 from Fire-Head/miami ... miami CParticleObject	2020-07-04 21:24:17 +02:00
aap	1e679dcb8d	Merge pull request #641 from aap/miami ... CBoat and friends	2020-07-04 21:24:11 +02:00
eray orçunus	1cea84d2b1	Remove console and fix sth	2020-07-04 16:01:07 +03:00
eray orçunus	716740f918	Peds & fixes	2020-07-04 15:31:28 +03:00
Fire-Head	4c65ec28d6	NULL->nil	2020-07-03 20:26:35 +03:00
eray orçunus	addb701638	Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun	2020-07-03 16:51:58 +03:00
eray orçunus	15548758ac	Bettah car enter canceling, fix CFO crash, ped objs. renaming	2020-07-03 16:51:33 +03:00
Nikolay Korolev	49a8dd7459	fixed typo	2020-07-03 15:21:11 +03:00
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	ed036df3ce	Re-enable console for debugging frontend	2020-07-03 05:40:22 +03:00
Fire-Head	d4004805f5	miami pobj	2020-07-03 02:18:06 +03:00
Nikolay Korolev	01b15fe807	reenabled script logging	2020-07-03 01:28:41 +03:00
Filip Gawin	bf2624692c	Fix displaying stats	2020-07-03 00:04:49 +02: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
aap	2141247e08	CBoat and friends	2020-07-01 18:04:02 +02:00
aap	575f35f2c4	fixes to CBoat	2020-07-01 18:03:59 +02: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	8045bec6a5	Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioManager.h	2020-06-30 19:12:06 +03:00
Sergeanur	da93b0a078	Audio fixes	2020-06-30 19:06:58 +03:00
Sergeanur	cbed027c0e	Merge branch 'master' into miami	2020-06-30 08:24:05 +03:00
Sergeanur	a15f3ddb8b	Fix glfw build	2020-06-30 08:08:50 +03:00
Sergeanur	87fa69385c	remove TheText.Load() from CGame::Initialise	2020-06-30 07:48:09 +03:00
Sergeanur	1d2d5fe6ae	Merge branch 'master' into miami ... # Conflicts: # src/render/MBlur.cpp # src/render/MBlur.h	2020-06-30 07:45:54 +03:00
Sergeanur	6f81e84bd4	Restore original code of CControllerState::CheckForInput	2020-06-30 07:44:51 +03:00
Sergeanur	c80bdf3a2a	Rename IsAnyButtonPressed to CheckForInput	2020-06-30 07:43:55 +03:00
Sergeanur	6d396ba73b	Fix MBlur	2020-06-30 07:43:20 +03:00
Filip Gawin	6cf698badd	Fix glfw.cpp	2020-06-29 16:24:40 +02:00
aap	b072cbca93	cleanup	2020-06-29 12:12:52 +02:00
aap	94ce376a76	cleanup	2020-06-29 12:12:43 +02: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	7b22b7e2af	Update MemoryCard.cpp	2020-06-29 11:38:30 +03:00
Fire-Head	3b3324de38	Update MBlur.cpp	2020-06-29 11:14:00 +03:00
Fire-Head	d9cb9583bf	update glfw.cpp	2020-06-29 11:04:30 +03:00
Fire-Head	2f12d0e231	Update MBlur.cpp	2020-06-29 10:40:06 +03:00
Fire-Head	fcac1f9a34	fix linux build?	2020-06-29 10:36:35 +03:00
Fire-Head	63fdcf7e64	menu fixes	2020-06-29 10:29:02 +03:00
Fire_Head	0cd2ac7e5e	Update AudioLogic.cpp	2020-06-29 09:41:56 +03:00
Fire_Head	860f75d66c	Merge branch 'master' into ps2menu	2020-06-29 09:37:53 +03:00
Nikolay Korolev	209b7891d1	Merge remote-tracking branch 'upstream/master'	2020-06-28 16:24:37 +03:00
Nikolay Korolev	920bc0a1bf	fix	2020-06-28 16:24:09 +03:00
aap	3370ae04cb	renamed 2dfx shadowRange to Size	2020-06-28 12:08:46 +02:00
aap	418bee9c22	renamed 2dfx shadowRange to Size	2020-06-28 12:05:42 +02:00
Nikolay Korolev	d6e111bb67	script logging fixes	2020-06-28 11:59:20 +03:00
Fire-Head	1f1782c587	restore Text.cpp	2020-06-28 08:32:56 +03:00
Fire-Head	b8f633de24	fixes	2020-06-28 01:57:01 +03:00
Fire-Head	233792e2b8	fixfixfix	2020-06-28 00:31:45 +03:00
Fire-Head	1c11a8081f	mips overdose	2020-06-28 00:01:51 +03:00
eray orçunus	c72fab15b4	fix anims again	2020-06-25 16:20:20 +03:00
aap	592a6aef0b	Merge pull request #638 from erorcun/miami ... CWanted, anim fix, ped objs renaming, remove III beta features	2020-06-25 15:15:01 +02:00
aap	2b21f92347	rename attractor flag to type	2020-06-25 15:13:33 +02:00
aap	cafe4d6f0c	rename attractor flag to type	2020-06-25 15:13:08 +02:00
aap	077bcf1c82	CPad fix	2020-06-24 19:11:33 +02:00
Nikolay Korolev	fe77b2ac53	Merge remote-tracking branch 'upstream/master'	2020-06-22 14:07:49 +03:00
Nikolay Korolev	ba3fe38f2e	fixes	2020-06-22 14:07:19 +03:00
Nikolay Korolev	043f09f3fb	Merge pull request #637 from Nick007J/master ... script logging	2020-06-22 13:27:25 +03:00
aap	3989e3df18	anim fix	2020-06-22 08:58:49 +02: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
aap	60f736f20f	FOV fix	2020-06-21 14:52:44 +02:00
aap	b81bf1e138	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-06-21 14:52:19 +02:00
aap	e563450cb6	synch with re3	2020-06-21 14:52:03 +02:00
aap	98baa36f1a	FOV fix	2020-06-21 14:50:00 +02:00
Nikolay Korolev	08af34bc99	Merge remote-tracking branch 'upstream/master'	2020-06-21 15:49:30 +03:00
aap	3859efff42	ps2 cam transitions done (hopefully)	2020-06-21 14:41:39 +02: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
aap	586e8a2ab4	tried to reconstruct bills cam	2020-06-21 11:03:20 +02:00
aap	e1c58131c4	PS2 cam transition mostly working	2020-06-21 00:40:07 +02:00
eray orçunus	d6a853bd60	killing peds increase chaos level	2020-06-20 22:44:31 +03:00
eray orçunus	cc60ad1946	ducking & anim fix	2020-06-20 20:26:27 +03:00
eray orçunus	2d2833f2e4	more weapon fixes	2020-06-20 17:30:28 +03:00
eray orçunus	fd3cd2c26a	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-20 16:23:42 +03:00
eray orçunus	0625954bb7	Ducking, shooting vehicle occupants and weapon fixes	2020-06-20 16:23:32 +03:00
aap	7700970c93	Merge pull request #636 from aap/miami ... CCamera done	2020-06-20 15:03:00 +02:00
aap	c5205a89ee	CCamera done	2020-06-20 14:54:11 +02:00
aap	5ad739f096	some PS2 cam code; fix for arrest cam	2020-06-20 14:38:21 +02: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
aap	4cd4f91e57	ccamera cleanup	2020-06-19 09:15:23 +02: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	e9d5d42ea9	fix clipped subtitles	2020-06-17 11:11:44 +03:00
Nikolay Korolev	f54af8b973	fixed bar brawl	2020-06-17 02:33:03 +03:00
erorcun	d322a8033e	Merge branch 'miami' into miami	2020-06-16 23:02:21 +03:00
erorcun	812b26b668	Update ModelIndices.h	2020-06-16 22:58:42 +03:00
eray orçunus	a822692c26	fix crash-VC pickup scaling	2020-06-16 22:55:28 +03:00
erorcun	7ae0b8ef06	Merge pull request #633 from aap/miami ... CCam done	2020-06-16 20:48:46 +03:00
eray orçunus	c6bb1f5d0d	some cutscene opcodes and heli guns	2020-06-16 20:35:09 +03:00
aap	7ceedc1d47	CCam done	2020-06-16 13:54:18 +02:00
aap	5f3eb76cff	CCam fixes yet again	2020-06-16 13:50:29 +02:00
eray orçunus	3a600b4684	Bike anim. fix	2020-06-16 00:20:08 +03:00
aap	dc7d4e1134	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-06-15 22:51:47 +02:00
eray orçunus	595576b151	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-15 23:49:59 +03:00
eray orçunus	c4e129509b	Peds & fixes continues	2020-06-15 23:43:20 +03:00
aap	62024217b7	more CCam	2020-06-15 20:50:01 +02:00
Sergeanur	655eaa36ce	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/Script.cpp # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/render/Fluff.cpp # src/render/Hud.cpp	2020-06-15 17:44:47 +03:00
eray orçunus	686d6e9834	Fix vehicle cam. zoom values	2020-06-15 16:17:22 +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
aap	e6d2b49121	more cleanup	2020-06-14 23:16:22 +02:00
aap	0741fd5b1d	some more camera stuff	2020-06-14 23:15:56 +02: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
majestic	015921522d	fixed condition in CBoat::ProcessControl and changed enum	2020-06-14 07:53:45 -07:00
aap	b77d044729	fixed boat wake	2020-06-14 09:50:00 +02:00
aap	c7a32bb83d	some camera code	2020-06-14 09:36:30 +02:00
aap	3fe282fbe4	a few cam fixes	2020-06-13 23:39:35 +02:00
eray orçunus	3231c6c3dd	ProcessTrainAnnouncements fix	2020-06-13 17:33:30 +03:00
Sergeanur	beb6f3bf80	small fixes	2020-06-13 13:57:25 +03: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
aap	41dac0773f	little CCam cleanup; fix in CWorld sphere test	2020-06-12 21:53:39 +02: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
majestic	2cc8ecbb90	removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun	2020-06-11 01:36:45 -07:00
majestic	94e3c30054	original multiplying rotational cords for minigun	2020-06-11 00:59:23 -07:00
majestic	669db1a293	minigun rotation fix	2020-06-10 23:26:51 -07:00
aap	5a961d0284	some cam cleanup; unused PS2 train cams	2020-06-10 23:50:27 +02:00
majestic	cf8fcada6e	m_density renamed to m_opacity	2020-06-10 14:01:37 -07:00
majestic	287987b8fe	SmokeTrail(s) moved to Fluff, variables' names fixed, floats rounded	2020-06-10 13:47:48 -07:00
majestic	a99da7b94e	more original cheats ... - CSmokeTrails and CSmokeTrail classes added in new files - more cheats added	2020-06-10 13:19:05 -07: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	85d845c5ce	Merge pull request #623 from Sergeanur/VC/MissionAudio ... Mission audio	2020-06-08 17:32:57 +03:00
Sergeanur	95e9fe7693	fixes	2020-06-08 16:22:49 +03:00
Sergeanur	03f3b4fc5a	remove numbers from enum	2020-06-08 14:33:10 +03:00
Sergeanur	8cd87236c9	miamification of some audio structs	2020-06-08 14:29:55 +03:00
aap	f8b4c0ee1d	bla	2020-06-08 13:23:08 +02:00
aap	d5515c9d0e	cleaned up and updated animviewer; fixed animation bug	2020-06-08 13:01:23 +02:00
aap	94e5b24fc8	cleaned up and fixed animviewer	2020-06-08 13:01:20 +02:00
Sergeanur	5942f1a8f9	Merge branch 'master' into miami ... # Conflicts: # src/control/CarCtrl.cpp # src/control/Script.cpp # src/render/Font.cpp	2020-06-08 10:36:37 +03:00
Sergeanur	36a6d124aa	Mission audio slots	2020-06-08 10:34:31 +03:00
Sergeanur	be9954ecc6	IsMissionAudioSamplePlaying (from VC)	2020-06-08 10:33:32 +03:00
Sergeanur	0afb1d9e24	Scale font shadow	2020-06-08 10:30:09 +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
Nikolay Korolev	5ec46bcdfb	Merge remote-tracking branch 'upstream/miami' into miami	2020-06-08 01:01:39 +03:00
eray orçunus	a77b181e32	CarCtrl fixes	2020-06-08 00:59:43 +03:00
Nikolay Korolev	5a09eeea27	more accurate code	2020-06-08 00:53:25 +03:00
eray orçunus	e07b6fdce7	Message box, letterbox and ped attaching	2020-06-07 21:44:54 +03:00
Nikolay Korolev	23f20ceaf8	fix	2020-06-07 19:35:05 +03:00
Nikolay Korolev	27eaa10873	Merge remote-tracking branch 'upstream/miami' into miami	2020-06-07 19:32:51 +03:00
Nikolay Korolev	2f9becbac6	fix	2020-06-07 19:31:15 +03:00
eray orçunus	6cc39e9bdb	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-07 19:13:27 +03:00
eray orçunus	88f066f469	HUD sizes	2020-06-07 19:13:12 +03:00
aap	dda9d03e54	nother bike bug	2020-06-07 17:35:22 +02:00
aap	464b232321	accidental shadowing in CBike::ProcessControl	2020-06-07 17:27:23 +02:00
Nikolay Korolev	c5a24eaf70	Merge remote-tracking branch 'upstream/miami' into miami	2020-06-07 18:20:00 +03:00
Nikolay Korolev	1748aabd69	fix	2020-06-07 18:19:44 +03:00
aap	3f5ecbe007	Merge pull request #622 from Sergeanur/VC/Font ... some font stuff	2020-06-07 17:19:12 +02:00
Nikolay Korolev	b14e034344	fix	2020-06-07 17:52:14 +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
Sergeanur	fe3a3ad8b5	cleanup	2020-06-07 15:19:29 +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
Nikolay Korolev	5fd330b35e	making it close to original	2020-06-07 11:31:52 +03:00
aap	1234fe9c1c	removed a "fix"	2020-06-07 10:24:33 +02:00
Sergeanur	a44510d1df	more font	2020-06-07 10:36:37 +03:00
Sergeanur	31569d512c	font fix	2020-06-07 09:10:09 +03:00
Sergeanur	91e2b427ef	more font stuff	2020-06-07 05:12:01 +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	fc7e35e1cd	fixes	2020-06-07 04:20:02 +03:00
Sergeanur	24bf4c2cba	Merge branch 'miami' into Font ... # Conflicts: # src/render/Font.cpp # src/render/Font.h	2020-06-07 04:16:10 +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	678a19ce3b	a bit of fonts	2020-06-07 04:11:10 +03:00
Sergeanur	552205dfba	FONT_BANK renamed to FONT_STANDARD	2020-06-07 04:10:06 +03:00
aap	44e2fcee39	disable skidding bugfix	2020-06-07 00:03:51 +02:00
aap	5711159e68	CBike done	2020-06-07 00:01:59 +02:00
eray orçunus	db9057f5a8	fix	2020-06-06 22:24:30 +03:00
eray orçunus	096ecc1d14	Some wait states	2020-06-06 22:16:59 +03:00
eray orçunus	fc0498b3a8	CFont crash workaround	2020-06-06 19:25:37 +03:00
eray orçunus	4e4a3489ef	Use KnockOffRider	2020-06-06 17:19:36 +03:00
Nikolay Korolev	e099aaaa6b	minor fixes	2020-06-06 16:36:26 +03:00
aap	d6640832f1	bla	2020-06-06 14:43:35 +02:00
aap	ef4f8ec713	more CBike functions	2020-06-06 14:42:42 +02:00
aap	c0481e7207	CBike::KnockOffRider	2020-06-06 13:22:55 +02:00
Nikolay Korolev	3f26250d73	fixing some uninitialized stuff	2020-06-06 13:31:09 +03:00
Nikolay Korolev	408f47fc9d	fixed linux saving	2020-06-06 12:58:10 +03:00
Sergeanur	afa4fa6510	Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/soundlist.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/peds/Ped.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Vehicle.h	2020-06-06 08:42:58 +03:00
Sergeanur	2016cd54b0	ps2 audio banks	2020-06-06 03:45:24 +03:00
aap	68caac1abd	Merge pull request #617 from majesticCoding/miami ... some original VC's cheats and comparator for them	2020-06-05 23:43:15 +02:00
majestic	f014b29fc4	Update Pad.cpp	2020-06-05 14:31:17 -07:00
majestic	66262b14ad	Update Pad.cpp	2020-06-05 14:20:29 -07:00
eray orçunus	d3736ccb17	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-05 23:20:16 +03:00
eray orçunus	f045ce4386	Bike riding anims, SA bike/heli cam	2020-06-05 23:13:34 +03:00
aap	1bfb01d5f5	a bit more CBike	2020-06-05 15:09:45 +02:00
aap	98de658c8f	Merge pull request #619 from ShFil119/heads ... Fix collision with peds heads	2020-06-05 13:43:07 +02:00
Nikolay Korolev	83e4023dc0	fix	2020-06-05 12:59:27 +03:00
Sergeanur	147dca44fa	ProcessTrainAnnouncements	2020-06-05 11:27:33 +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
majestic	e2cc3e1a33	some original VC's cheats and comparator for them	2020-06-04 18:19:53 -07:00
aap	647fd951ec	more CBike	2020-06-05 00:24:42 +02:00
aap	7f0474e9de	Merge pull request #615 from majesticCoding/miami ... some orig chearts	2020-06-04 21:50:00 +02:00
aap	f7612c4a49	forgot to delete debug code	2020-06-04 17:49:27 +02:00
aap	95e96c86a1	minor stuff	2020-06-04 17:39:26 +02:00
aap	3e36428568	more CBike and fixes	2020-06-04 17:38:41 +02:00
eray orçunus	016ebc0b00	fixes, mostly from miami	2020-06-04 06:03:12 +03:00
Sergeanur	07c6752cf7	Merge branch 'master' into miami ... # Conflicts: # src/peds/Ped.cpp	2020-06-04 05:10:50 +03:00
Sergeanur	2578880e1c	PedChat & PedDebug	2020-06-04 05:04:00 +03:00
Sergeanur	a6e4619378	Revert "fix accident~" ... This reverts commit 04de93796b.	2020-06-04 04:42:42 +03:00
Sergeanur	07d336ddf0	Merge branch 'master' into miami ... # Conflicts: # src/peds/Ped.cpp # src/peds/Ped.h	2020-06-04 04:32:49 +03:00
Sergeanur	12717917cc	Restore original logic of CPed::WanderRange	2020-06-04 04:31:04 +03:00
majestic	20ffcb68b6	some orig chearts ... - weapon model indices added - orig weapon cheats added - some cheats' names changed to original ones	2020-06-03 14:48:26 -07:00
aap	e1201fc6e2	fixed CPed::AddInCarAnims	2020-06-03 16:55:23 +02:00
eray orçunus	5dc410a999	Peds, eSound and PedState enum, fixes	2020-06-03 17:01:11 +03:00
aap	c498af29aa	get rid of III code	2020-06-03 09:24:26 +02:00
aap	04de93796b	fix accident~	2020-06-03 09:24:02 +02:00
aap	ad03d9543b	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-06-03 08:26:33 +02:00
aap	b73e42346e	forgot the fucking file	2020-06-03 08:26:24 +02:00
Sergeanur	2df44208dd	Range2D and Range3D	2020-06-03 04:45:25 +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
aap	2ca3c50463	some CBike code; vehicle cleanup	2020-06-02 23:35:20 +02:00
aap	04a91761df	some vehicle cleanup	2020-06-02 23:34:53 +02:00
aap	2e3cb77702	fixed radar rendering	2020-06-02 22:49:57 +02:00
aap	06c761e9ac	few bike things	2020-06-02 15:26:11 +02:00
aap	575c5466df	renamed a vehicle thing	2020-06-02 14:38:57 +02:00
aap	dbeaafbe99	initial CBike struct	2020-06-02 14:38:30 +02:00
erorcun	03d9525eb6	Merge pull request #611 from erorcun/miami ... DrawStandardMenus, VC menu array and minor fixes	2020-06-02 00:21:07 +03:00
Filip Gawin	5d90e4b2f0	Fix collision with peds heads	2020-06-01 22:10:11 +02:00
aap	bfd13d58e0	add freeroam; clean up debug menu	2020-06-01 22:02:22 +02:00
aap	fdf8f35049	CTimer fix	2020-06-01 20:51:18 +02:00
aap	c00f7a8d22	CTimer fix	2020-06-01 20:50:26 +02:00
aap	d8272b8812	hanim fix	2020-06-01 20:32:43 +02:00
aap	8bbb6a2a4a	hanim fix	2020-06-01 20:28:04 +02:00
aap	25273485d9	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-06-01 18:05:24 +02:00
eray orçunus	abef04c637	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-06-01 18:35:04 +03:00
eray orçunus	d930a25d94	DrawStandardMenus, VC menu array and minor fixes	2020-06-01 18:32:34 +03:00
aap	7c7727e7da	fixed timebar toggle	2020-06-01 13:21:19 +02:00
Nikolay Korolev	0803c821ae	fixed roadblocks	2020-06-01 12:45:03 +03:00
aap	de1018d7a6	gravity	2020-06-01 10:56:15 +02:00
aap	f69313237e	Merge pull request #607 from rollschuh2282/master ... Added toggles for the TimeBars and the "DebugStuffInRelease" to the Debug Menu	2020-06-01 10:44:45 +02:00
aap	c8b93d0575	fixed bumper colmodel	2020-06-01 10:30:01 +02:00
aap	197c49d740	fixed bumper colmodel	2020-06-01 10:29:46 +02:00
aap	12cc0e4132	getting rid of strnicmp	2020-05-31 22:35:29 +02:00
Nikolay Korolev	0631bd9d89	fix	2020-05-31 23:16:24 +03:00
Nikolay Korolev	815d3e0f61	fix	2020-05-31 22:50:32 +03:00
Nikolay Korolev	f945dbc0fb	dumb	2020-05-31 21:01:36 +03:00
Nikolay Korolev	c1c163d78c	game logic	2020-05-31 20:59:01 +03:00
aap	bae3a3e72f	fixed to CAutomobile and friends	2020-05-31 17:45:26 +02:00
aap	21ce0a4b28	CAutomobile done	2020-05-31 17:05:59 +02:00
aap	00dc86917e	some more CAutomobile	2020-05-31 17:05:59 +02:00
aap	218772c296	gahhh	2020-05-31 17:05:59 +02:00
aap	c1e13177a1	some CAutomobile	2020-05-31 17:05:59 +02: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
eray orçunus	517f0b9189	fix fix fix	2020-05-29 21:31:06 +03:00
eray orçunus	e38f2a7fb2	fix fix	2020-05-29 21:06:08 +03:00
eray orçunus	6438244540	Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun	2020-05-29 20:29:52 +03:00
eray orçunus	9adde91b3a	frontend options fix	2020-05-29 20:29:18 +03:00
Nikolay Korolev	627ffb0f82	fix	2020-05-29 16:52:02 +03:00
rollschuh2282	2d5f7d92e5	Add files via upload	2020-05-29 12:04:20 +02:00
rollschuh2282	20cacb18f0	Add files via upload	2020-05-29 12:03:32 +02:00
erorcun	e65a09ea09	Merge pull request #604 from erorcun/master ... Frontend customization functions, freecam toggle and minor things	2020-05-28 22:06:50 +03:00
eray orçunus	9acf27fc53	remove inlining attempts + reload frontend options for real	2020-05-28 17:42:40 +03:00
Nikolay Korolev	111d23beab	fix	2020-05-28 17:21:00 +03:00
eray orçunus	a61736c51b	theoretically fix linux build	2020-05-28 13:08:21 +03:00
eray orçunus	e6401bce18	Detect R and start game on menu	2020-05-28 12:46:51 +03:00
eray orçunus	98a97a32fa	config reorganization	2020-05-28 11:49:58 +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
aap	ab7a21e017	Merge pull request #603 from Fire-Head/miami ... Miami Water, Seagulls, Ships	2020-05-28 10:23:28 +02:00
Fire-Head	8280e04b23	rem unnecessary asserts	2020-05-28 02:40:23 +03:00
Nikolay Korolev	d9d57f12fc	crash fix	2020-05-28 01:00:49 +03:00
Nikolay Korolev	7e4ef2162a	Merge remote-tracking branch 'upstream/master'	2020-05-28 00:59:03 +03:00
Fire_Head	7f30a2ae1b	cockbuilding ejaculation fix	2020-05-28 00:45:45 +03:00
Fire-Head	fab2c8699c	surfacetable included	2020-05-28 00:36:52 +03:00
Fire-Head	98af5e4ddb	fix SURFACE_SAND	2020-05-28 00:28:36 +03:00
Fire-Head	895580c724	seagulls, ships	2020-05-28 00:15:37 +03:00
aap	0bc6eef55d	bla	2020-05-27 22:34:10 +02:00
aap	2a1b9281e4	automobile fixes	2020-05-27 22:32:57 +02: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
aap	717b0a6514	librw update	2020-05-27 20:42:15 +02:00
aap	d8749c2305	librw update	2020-05-27 20:41:36 +02:00
Sergeanur	53ac163a3e	Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/vehicles/Automobile.h	2020-05-27 20:50:40 +03:00
Sergeanur	3a5a122887	Fix city sound playing on restarting a new game	2020-05-27 20:48:47 +03:00
Nikolay Korolev	d4ae40ae99	crash fix	2020-05-27 19:39:04 +03:00
aap	02741dc64f	RwCameraGetCurrentCamera	2020-05-27 09:47:57 +02:00
aap	1af4edd43a	RwCameraGetCurrentCamera	2020-05-27 09:47:21 +02:00
aap	d71cbae9df	CVehicle loose ends	2020-05-27 07:43:38 +02:00
aap	c068570192	Merge pull request #600 from Fire-Head/miami ... Miami Particle	2020-05-27 07:18:47 +02:00
aap	4868bf13a8	Merge pull request #601 from Sergeanur/VC/audio3 ... Support of original mp3/wav/adf	2020-05-27 07:10:36 +02:00
Sergeanur	591c35d51b	OpenAL support	2020-05-27 07:52:45 +03:00
aap	d0d060d321	MT function for fakerw	2020-05-27 06:50:05 +02:00
aap	926281f909	MT function for fakerw	2020-05-27 06:49:38 +02:00
Sergeanur	7a79b74778	Restore original logic	2020-05-27 03:33:27 +03: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	9673ecddad	Merge remote-tracking branch 'upstream/master'	2020-05-27 00:25:33 +03:00
Nikolay Korolev	ec1d14971c	mission replay	2020-05-27 00:25:12 +03:00
aap	ea09825d10	Merge pull request #553 from Sergeanur/VC/audio ... Very basic compatibility with original sfx.raw/sdt	2020-05-26 22:02:12 +02:00
aap	4f1ce8bd42	added some unused enums	2020-05-26 20:44:03 +02:00
aap	0ac3477035	fix UB shit	2020-05-26 18:50:27 +02:00
aap	7f60be9814	fix UB shit	2020-05-26 18:50:19 +02:00
Sergeanur	1991aa388b	Very basic compatibility with original sfx.raw/sdt	2020-05-26 18:25:34 +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
Nikolay Korolev	f40677c7a4	fixed crash	2020-05-26 16:17:40 +03:00
aap	314e56b7b9	fix2	2020-05-26 12:11:04 +02:00
aap	dfa95002aa	fix	2020-05-26 12:10:08 +02: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
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
Nikolay Korolev	ad8e8f4341	switch collision with debug menu	2020-05-25 23:59:55 +03:00
Nikolay Korolev	15a99da50e	cranes fix	2020-05-25 23:34:47 +03:00
aap	3c3b1aadc0	small fixes	2020-05-25 20:36:23 +02:00
Sergeanur	52644192e3	Even more audio cleanups	2020-05-25 19:36:09 +03:00
aap	7bf8337854	CVehicle	2020-05-25 18:33:34 +02:00
Sergeanur	ad896d5f81	Ped comments cleanup	2020-05-25 19:10:15 +03:00
Sergeanur	cebc3bbd48	More audio cleanup and bugfixes	2020-05-25 18:39:16 +03:00
Sergeanur	fd06ab4db8	Fix names of static variables	2020-05-25 03:56:17 +03:00
Sergeanur	80c2018b51	cAudioManager::ProcessPlayersVehicleEngine cleanup and fixes	2020-05-25 03:40:47 +03:00
Sergeanur	56683dbed3	Clean cAudioManager::ProcessGarages up a bit	2020-05-24 20:33:30 +03:00
blingu	79c652e115	Ped.h include not needed	2020-05-24 17:48:13 +02:00
Sergeanur	e259bb6609	fixes	2020-05-24 18:43:50 +03: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
Sergeanur	e4f136344c	Merge remote-tracking branch 'origin/master' into opus	2020-05-24 18:25:53 +03: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	3fdd352ca2	CVehicle fixes	2020-05-24 15:14:56 +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	e248cbcc7d	say goodbye to your saves	2020-05-24 14:01:01 +03:00
Nikolay Korolev	9c93cc7d6f	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-24 13:48:41 +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
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
Sergeanur	13a9441d5e	Merge branch 'master' into opus	2020-05-24 01:45:10 +03:00
Sergeanur	f92770f74a	Optimize ALDeviceList	2020-05-24 01:44:10 +03:00
Sergeanur	0c4ce002f1	Merge branch 'master' into opus	2020-05-24 01:07:03 +03:00
Sergeanur	7d30878418	Fix OAL crash	2020-05-24 01:06:19 +03:00
Sergeanur	3a7651e7ab	Cleanup	2020-05-24 00:56:20 +03:00
Sergeanur	bd67db523a	Merge branch 'master' into opus ... # Conflicts: # eax/eax.h # premake5.lua # src/audio/oal/stream.cpp	2020-05-24 00:45:45 +03:00
Nikolay Korolev	6a7bd0e330	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-24 00:19:25 +03:00
Sergeanur	ac208ce02c	Even more small audio cleanup	2020-05-23 23:25:14 +03:00
Sergeanur	f2790f610b	More audio cleanup	2020-05-23 22:48:50 +03:00
Sergeanur	88b6168f1c	Merge branch 'master' into miami ... # Conflicts: # premake5.lua # src/control/Script.cpp # src/core/SurfaceTable.cpp # src/core/config.h # src/entities/Physical.cpp # src/entities/Physical.h # src/objects/Object.h # src/skel/skeleton.h # src/vehicles/Vehicle.h	2020-05-23 21:14:16 +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	100e59886d	cranes fix	2020-05-23 16:14:39 +03:00
aap	9313bfa155	skeleton typos	2020-05-23 11:34:48 +02:00
aap	e2d3ef449c	skeleton typos	2020-05-23 11:34:40 +02: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	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
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	c993e99e00	Fix linux build	2020-05-22 22:49:54 +03:00
Sergeanur	a9f332f2d9	Possibly fix travis	2020-05-22 21:26:31 +03:00
Sergeanur	e858314a9f	OpenAL configs	2020-05-22 18:01:09 +03:00
Sergeanur	ab161d12d8	Merge remote-tracking branch 'origin/master' into opus	2020-05-22 17:41:03 +03:00
Sergeanur	0af4d57408	opus support	2020-05-22 17:40:19 +03:00
erorcun	4b99d7127f	Merge pull request #579 from Xinerki/miami ... InitAfterFocusLoss compile fix	2020-05-22 16:10:35 +03:00
Xin	a878e09f0f	InitAfterFocusLoss compile fix	2020-05-22 16:04:52 +03:00
erorcun	8b82e9c40f	Merge pull request #574 from Xinerki/miami ... many additions	2020-05-22 15:49:37 +03:00
aap	21071edbfe	fixes for CPhysical and friends	2020-05-22 14:34:44 +02:00
aap	a53ca58e56	CPhysical	2020-05-22 14:27:16 +02: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
Xinerki	900d5a4ce0	focus loss improvement ... for u aap	2020-05-21 21:48:39 +03:00
Xinerki	e0345732c0	wasted/busted text color ... how did nobody change it yet	2020-05-21 17:50:08 +03:00
Xinerki	0db3d03c3c	sorry my bad	2020-05-21 17:36:12 +03:00
Xinerki	1c00e3cf2c	vehicle cheats and debug cheat string display	2020-05-21 17:28:03 +03:00
Xinerki	6692f5b2aa	make reloadables optional	2020-05-21 16:47:48 +03:00
Xinerki	6912cfe98a	menu map color change	2020-05-21 16:26:56 +03:00
Xinerki	46c6b0d29d	fancy HUD.TXD reloader ... TODO: make optional with defines, also add more reload options	2020-05-21 16:25:46 +03:00
Xinerki	3e75de9709	radardisc shadow ... thank tomasak	2020-05-21 15:46:53 +03:00
Xinerki	1cb7b9876f	scuffed InitAfterFocusLoss implementation	2020-05-21 14:23:12 +03:00
Xinerki	b4060a4789	add freecam toggle in control settings ... comes with a free config save!	2020-05-21 13:06:09 +03:00
Xinerki	2db26d304f	approach separation differently	2020-05-21 12:45:45 +03:00
Xinerki	6d32cf4a11	blip marker colors, also isolate crgba	2020-05-21 12:21:02 +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	3405cfffb7	fixed dumb	2020-05-20 23:52:17 +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	c0c8278c63	fixed ped comment	2020-05-20 20:45:07 +03: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	50f0c7a1dc	bla	2020-05-19 22:01:28 +02: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	e967db4a3c	fixed annoying bug	2020-05-19 21:10:40 +03:00
Nikolay Korolev	41d7b3244b	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-19 20:54:10 +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
aap	8a90e32f1b	Merge pull request #564 from Xinerki/miami ... fix audio menu crash	2020-05-19 13:26:43 +02:00
aap	6b0b984909	Merge pull request #561 from Nick007J/miami ... script revision	2020-05-19 13:26:21 +02:00
Xinerki	ffd175c705	fix frontend control config menu a little ... thank erorcun	2020-05-19 14:23:59 +03:00
aap	0d0f4da27a	little cleanup of handlingmgr	2020-05-19 13:09:20 +02:00
Xinerki	12b48edada	fix audio menu crash	2020-05-19 14:07:24 +03:00
aap	53cdf6ab41	HandlingMgr	2020-05-19 13:07:12 +02:00
aap	401e45d63e	Merge pull request #563 from Xinerki/miami ... match frontend to vc more; isolate crgba	2020-05-19 12:50:47 +02:00
Xinerki	9e14e8553f	match frontend to vc more; isolate crgba	2020-05-19 13:47:55 +03:00
Nikolay Korolev	ff0e039599	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-19 12:44:40 +03:00
aap	9d16df5aa8	Merge pull request #562 from Xinerki/miami ... Load VC frontend textures and use some	2020-05-19 10:41:17 +02:00
Xinerki	00ee82aba6	Zone and Vehicle text slant	2020-05-19 11:36:08 +03:00
aap	62db8cd9b0	finished CFileLoader; some COcclusion stubs	2020-05-19 10:23:08 +02:00
Xinerki	d425358181	Load VC frontend textures and use some	2020-05-19 10:07:15 +03:00
Nikolay Korolev	a27fc8d9d9	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-19 01:49:51 +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
aap	abd230dcdd	some less certainly fps fixes	2020-05-18 22:52:35 +02:00
aap	a8f4f74a76	only one sunbathe anim group	2020-05-18 22:25:06 +02:00
Nikolay Korolev	746f2aa479	script FPS fix	2020-05-18 22:43:06 +03:00
shfil	6bf79120dc	Fix string assignment (aldlist.cpp)	2020-05-18 21:08:01 +02:00
Sergeanur	e891cf858f	Remove MAX_VOLUME dups	2020-05-18 20:17:24 +03:00
aap	b05e6632be	Merge pull request #556 from Fire-Head/master ... nullsampman	2020-05-18 17:08:32 +02:00
aap	2588e69849	some less certainly fps fixes	2020-05-18 16:55:38 +02:00
aap	68f1c03a85	fixes for braking and cloud rotation at high fps	2020-05-18 16:43:40 +02:00
aap	9b09aa3384	fixes for braking and cloud rotation at high fps	2020-05-18 16:40:30 +02:00
aap	2d4861454c	Merge pull request #557 from Nick007J/miami ... script and script stubs	2020-05-18 13:08:24 +02:00
aap	8f9ce275c8	Merge pull request #558 from Sergeanur/VC/text ... CText	2020-05-18 13:07:59 +02:00
Sergeanur	af22bb1495	CText	2020-05-18 01:28:40 +03:00
Nikolay Korolev	5ab2c85e97	some debug changes	2020-05-18 00:34:24 +03:00
eray orçunus	f71cfdf8ef	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-05-18 00:27:36 +03:00
eray orçunus	96151ec0f0	TransformToNode crash fix?	2020-05-18 00:27:04 +03:00
Nikolay Korolev	ad8a8913d9	a few more stubs	2020-05-18 00:20:26 +03:00
Nikolay Korolev	fd2948f045	sync with upstream	2020-05-17 23:32:32 +03:00
Nikolay Korolev	39931a5284	some more script stubs	2020-05-17 23:31:16 +03:00
aap	d4a429d986	little cleanup on radar	2020-05-17 22:24:23 +02:00
aap	13903d7c46	radar sprites	2020-05-17 22:21:39 +02: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
Fire-Head	91fbfc1d23	nullsampman	2020-05-17 21:13:25 +03:00
eray orçunus	84f8312b86	Weapon fixes and thingies	2020-05-17 21:01:52 +03:00
aap	a0703fd9e1	loading screens	2020-05-17 19:45:21 +02:00
aap	3f2bdc096d	some HUD colors	2020-05-17 15:57:59 +02:00
aap	4ab49780b5	collect HUD colors at top of file	2020-05-17 15:33:44 +02:00
aap	405a6fcbef	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-17 15:16:27 +02:00
aap	964acba083	fix head/hand atomics	2020-05-17 15:16:12 +02:00
aap	72ccf9a0db	revert accidental commit; also update librw	2020-05-17 14:21:09 +02:00
Sergeanur	37480fb617	Fix compilation errors	2020-05-17 00:33:52 +03:00
Sergeanur	77f97ad2ad	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimManager.cpp # src/audio/AudioManager.cpp	2020-05-16 23:58:44 +03:00
Sergeanur	ad0b99231e	Remove magic consts from ms_aAnimAssocDefinitions	2020-05-16 23:54:44 +03:00
Nikolay Korolev	5c8888d2ed	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 23:09:34 +03:00
Nikolay Korolev	b587d835e8	more script stuff	2020-05-16 23:06:33 +03:00
Sergeanur	4ff0697b4d	More small audio fixes	2020-05-16 21:00:27 +03:00
Sergeanur	13a0bf1c43	Move sound processors to AudioLogic.cpp, plus small fixes	2020-05-16 20:29:13 +03:00
Sergeanur	1a42d62d3a	Merge branch 'master' into miami ... # Conflicts: # premake5.lua # src/peds/Ped.cpp # src/peds/PedIK.cpp # src/peds/PedIK.h	2020-05-16 17:09:13 +03:00
Nikolay Korolev	e3291b0cb1	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
Sergeanur	dc5ece8327	Fix audio use of number instead of enum for CAR_ACCEL	2020-05-16 16:55:37 +03:00
aap	c54d3ba2ab	fixes for 64 bit build	2020-05-16 14:34:51 +02:00
eray orçunus	40ee29fb99	Weapon fixes	2020-05-16 15:07:09 +03:00
aap	793a6a6d7e	bla	2020-05-16 13:07:08 +02:00
Nikolay Korolev	7b89baceaa	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 14:01:58 +03:00
Nikolay Korolev	c33b93793f	new horn	2020-05-16 14:01:32 +03:00
aap	9558baa353	fixed CText to be 64 bit compatible	2020-05-16 12:52:37 +02:00
aap	b21f49ad6b	fixed CText to be 64 bit compatible	2020-05-16 12:51:54 +02:00
Nikolay Korolev	6556cb0db9	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 13:40:00 +03:00
Nikolay Korolev	4defd8b75c	minimal weather stuff + multiple bugfixes	2020-05-16 13:31:23 +03:00
aap	9dc5dca209	remove some unneeded plane paths for the moment; also different exe icon	2020-05-16 11:34:51 +02: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	41e9754338	fixed hanging boot	2020-05-14 15:05:23 +02:00
aap	2fb4305a73	fixed hanging boot	2020-05-14 15:03:13 +02: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	b01987719e	fixed script error	2020-05-14 15:26:59 +03:00
Nikolay Korolev	8e0b132f43	it works differently	2020-05-14 14:03:56 +03: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
aap	9b162554ca	fixed skinned cutscene head	2020-05-14 12:32:51 +02:00
aap	f5345f59ea	blacklist for glfw "joysticks"	2020-05-14 00:09:45 +02:00
shfil	7036e80fc6	Fix calloc in CdStreamPosix	2020-05-13 17:48:07 +02:00
Nikolay Korolev	d426588496	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-13 17:55:12 +03:00
Nikolay Korolev	94bf7d9ea1	Merge remote-tracking branch 'upstream/master'	2020-05-13 17:34:09 +03:00
Nikolay Korolev	1237941180	fixed traffic lights	2020-05-13 17:33:50 +03:00
Sergeanur	3f1001b86b	More save/load alignment fixes	2020-05-13 16:24:00 +03:00
Nikolay Korolev	509d57edcb	car control and cranes fixes	2020-05-13 13:29:17 +03:00
Nikolay Korolev	81ea6f0258	ped attractor: start	2020-05-13 11:38:05 +03:00
Sergeanur	7aeac06fdb	Redoing some pool reading for better alignment	2020-05-13 05:31:14 +03:00
Sergeanur	4ac53960f5	Changing save/load for CPlayerInfo because of alignment crap	2020-05-13 03:43:20 +03:00
Filip Gawin	a0b3117ee4	Revert to memcpy	2020-05-13 02:01:42 +02: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	c40fcdf39a	fix shotgun	2020-05-12 22:48:28 +03:00
aap	bcd2f8c64c	remove debug shit	2020-05-12 20:44:37 +02:00
Nikolay Korolev	dc444b9ca0	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-12 20:31:23 +03:00
Nikolay Korolev	180a1dc42b	Merge remote-tracking branch 'upstream/master'	2020-05-12 20:23:03 +03:00
Nikolay Korolev	615bd1e878	garages fix	2020-05-12 20:22:35 +03:00
aap	98a233da43	little fixes to CClouds; disabled object clipping for SA cam	2020-05-12 16:36:23 +02:00
aap	40829b5242	CClouds; disabled object clipping for SA cam	2020-05-12 16:27:39 +02:00
Nikolay Korolev	ca6ed7f00f	fix garages	2020-05-12 16:21:00 +03:00
Nikolay Korolev	4b566c26a3	fix garages	2020-05-12 14:08:42 +03:00
Nikolay Korolev	1afe36d0d0	fix garages	2020-05-12 14:07:47 +03:00
aap	fab453efde	fixed bug in cutscene head	2020-05-12 09:45:01 +02:00
Sergeanur	8f1a2825d4	Remove odd calculations for bullet hit smoke	2020-05-12 04:31:11 +03:00
Nikolay Korolev	9647587447	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-12 02:00:26 +03:00
Nikolay Korolev	3e64274f6b	more script	2020-05-12 01:59:35 +03:00
erorcun	5f40f06bf0	Merge pull request #533 from erorcun/master ... Linux build support	2020-05-12 00:33:13 +03:00
aap	ce2071e1e6	Merge pull request #535 from Nick007J/miami ... garages, carctrl, script	2020-05-11 23:28:52 +02:00
aap	70a8234dad	RenderPedCB from VC	2020-05-11 22:24:53 +02:00
aap	0eb5f93e96	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-11 22:21:26 +02:00
aap	6e4710b717	CVisibilityPlugins	2020-05-11 22:21:18 +02:00
Nikolay Korolev	9b23e33c36	sync with upstream	2020-05-11 21:21:09 +03:00
Sergeanur	5f1c3fa208	Merge remote-tracking branch 'origin/miami' into miami	2020-05-11 21:07:36 +03: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
Nikolay Korolev	5f5babe7fe	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-11 21:05:01 +03:00
Nikolay Korolev	8fae2dcc26	garages + script	2020-05-11 21:04:35 +03:00
eray orçunus	36e2bc95d3	Fix Windows build and premake	2020-05-11 20:10:01 +03:00
eray orçunus	8a4fa58cd4	Linux build support	2020-05-11 21:00:55 +03:00
aap	95920d54f2	random fixes	2020-05-11 17:04:08 +02:00
aap	d4250fc2c7	CRenderer	2020-05-11 17:03:44 +02:00
aap	b11715608f	few fixes	2020-05-11 09:18:41 +02:00
aap	ad90a06a39	little fix for cam	2020-05-11 09:18:21 +02:00
erorcun	c66c45f4c8	Merge pull request #509 from Fire-Head/master ... OpenAL update	2020-05-11 03:23:36 +03:00
Nikolay Korolev	2f085ea5f5	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-11 01:00:50 +03:00
Nikolay Korolev	2f979a8cde	some changes	2020-05-11 01:00:41 +03:00
aap	198b80f560	RpAnimBlend and frame updates	2020-05-10 23:47:53 +02:00
aap	9e842f1628	vehicle model descriptions; a bit of heli code	2020-05-10 20:51:29 +02:00
aap	7919b92d28	force load weapons as long as we dont stream em yet	2020-05-10 19:09:49 +02:00
aap	d9a8bab631	update file loader for new VC fields	2020-05-10 18:14:14 +02: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
Nikolay Korolev	653d808417	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-10 18:26:13 +03:00
aap	5b605c1271	some fixes and cosmetic changes	2020-05-10 17:09:57 +02:00
aap	0552d49fce	CVehicleModelInfo	2020-05-10 17:09:14 +02:00
Nikolay Korolev	00cdcef36a	some updates for script	2020-05-10 17:54:13 +03:00
bigbossbro08	af6e132b37	defined out asserts.	2020-05-10 19:54:37 +06:00
Nikolay Korolev	512f5657f7	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-10 15:24:09 +03:00
Nikolay Korolev	61eb361d26	script changes	2020-05-10 15:23:56 +03:00
aap	f7aa4e108a	added some anim groups	2020-05-10 14:22:22 +02:00
aap	f7300c7a27	CPedModelInfo	2020-05-10 13:08:02 +02:00
Nikolay Korolev	4b892e9eb9	fix boats	2020-05-10 13:20:01 +03:00
Nikolay Korolev	662246b9e2	fix boat	2020-05-10 12:56:13 +03:00
Nikolay Korolev	1f3f82eedc	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-10 12:37:43 +03:00
aap	58d9e9cd59	CSimpleModelInfo	2020-05-10 11:34:26 +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
aap	1b936f6ffb	CClumpModelInfo; little fixes	2020-05-10 11:20:27 +02:00
aap	f0442960a2	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-10 10:04:27 +02:00
aap	e9fbd2ccfd	CWeaponModelInfo	2020-05-10 10:04:20 +02: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
Sergeanur	d9a3533438	Small unification	2020-05-10 01:14:00 +03:00
Nikolay Korolev	9fce6c4ed3	car control fixes	2020-05-09 22:24:31 +03:00
Nikolay Korolev	3de003a8e7	new curves + boat fix	2020-05-09 22:11:40 +03:00
Nikolay Korolev	5fd8eec42c	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-09 20:30:05 +03:00
aap	c020992e4d	back to ped.ifp	2020-05-09 19:29:31 +02:00
Nikolay Korolev	609caad7a4	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-09 20:21:36 +03:00
Nikolay Korolev	a55e738dfa	ccarctrl big fix	2020-05-09 20:21:13 +03:00
aap	f23ecfbc84	accidentally swapped reft and light	2020-05-09 17:29:13 +02:00
aap	97d5698e0c	peds starting to work	2020-05-09 17:05:26 +02:00
Sergeanur	28103775ba	Place debug menu under ifdef	2020-05-09 16:06:13 +03:00
Sergeanur	1b599b2d35	Fix compilation error	2020-05-09 15:41:00 +03:00
aap	989ded6052	removed cutscene heads	2020-05-09 13:00:39 +02:00
aap	36e1f7b4fb	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-09 13:00:07 +02:00
eray orçunus	b80c4bae6b	Menu map fixes and resizable window on GLFW	2020-05-09 13:58:31 +03:00
aap	ea053467b5	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-09 12:45:27 +02:00
aap	40cfd0576f	Merge pull request #526 from Nick007J/miami ... GenerateOneRandomCar except bikes	2020-05-09 12:45:25 +02:00
erorcun	ce4996b09c	Merge pull request #527 from erorcun/erorcun ... Menu map fixes and resizable window on GLFW	2020-05-09 13:44:43 +03:00
eray orçunus	f754da272f	Menu map fixes and resizable window on GLFW	2020-05-09 13:43:08 +03:00
aap	d26ffdd05f	fixes for anims	2020-05-09 12:04:48 +02:00
aap	e8c0619226	named anim assoc flags	2020-05-09 09:51:31 +02:00
aap	633c2a7aeb	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-09 09:50:08 +02:00
aap	3f09ec0744	named anim assoc flags	2020-05-09 09:50:00 +02:00
Sergeanur	4b8d6a3223	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssocGroup.cpp # src/animation/AnimBlendAssociation.cpp # src/animation/AnimManager.cpp # src/core/Streaming.cpp	2020-05-09 02:56:53 +03:00
Sergeanur	d686f587cc	Merge remote-tracking branch 'origin/master'	2020-05-09 02:51:40 +03:00
Sergeanur	e917cd1f46	Fix corona scaling	2020-05-09 02:50:48 +03:00
Nikolay Korolev	e30b538cd3	fix	2020-05-09 00:07:35 +03:00
Nikolay Korolev	46d891b745	fix	2020-05-09 00:00:06 +03:00
Nikolay Korolev	3d394c2f95	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-08 23:30:04 +03:00
Nikolay Korolev	7e753c2596	CCarCtrl::GenerateOneRandomCar	2020-05-08 23:29:43 +03:00
aap	10cade9f60	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-08 20:58:48 +02:00
aap	f12e76fa13	more small fixes	2020-05-08 20:58:40 +02:00
aap	08de6d487a	anims streaming	2020-05-08 20:56:42 +02:00
Nikolay Korolev	f902136b6a	fix	2020-05-08 18:50:16 +03:00
Nikolay Korolev	75943a57b2	gang	2020-05-08 18:48:44 +03:00
Sergeanur	1ef8d61f36	Merge branch 'master' into miami	2020-05-08 17:49:19 +03:00
Nikolay Korolev	756e4dd068	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-08 17:06:25 +03:00
Nikolay Korolev	6065f5e52b	fix	2020-05-08 17:05:54 +03:00
aap	2eee4c5176	most of animation system done; little stuff here and there	2020-05-08 15:59:57 +02:00
Nikolay Korolev	c11a20cb4f	zone info commands + fix	2020-05-08 16:16:46 +03:00
Sergeanur	e0b3418e65	Fix water UV on high FPS and inverted free camera	2020-05-08 14:34:21 +03:00
Nikolay Korolev	fb1f51241d	fix	2020-05-08 13:41:28 +03:00
Nikolay Korolev	db26700352	final fix	2020-05-08 11:49:40 +03:00
Nikolay Korolev	49cf53644a	reasonable spawns	2020-05-08 11:43:27 +03:00
Nikolay Korolev	44c5cdf453	tmp stuff	2020-05-08 11:11:09 +03:00
Nikolay Korolev	b99346e6ca	sync with upstream	2020-05-07 23:22:15 +03:00
Nikolay Korolev	2dc818e4d2	intermediate changes	2020-05-07 23:21:36 +03:00
aap	a8f1505517	small fixes	2020-05-07 21:56:09 +02:00
aap	c715569d1d	CBaseModelInfo done	2020-05-07 21:55:54 +02:00
aap	f80474f590	little script change	2020-05-07 18:08:17 +02:00
aap	19b21cafcd	CZoneInfo mostly done; not its dependencies	2020-05-07 17:53:38 +02:00
aap	3ae10c93ac	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-07 17:31:32 +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	8bb22b2ad8	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-07 14:41:43 +02:00
aap	6a7d08ecc2	some quick cosmetic fixes	2020-05-07 14:41:35 +02:00
Sergeanur	f13c4e6aca	Merge branch 'master' into miami	2020-05-07 14:49:29 +03:00
Sergeanur	0b848bc147	Fix looping collision sound	2020-05-07 14:48:53 +03:00
aap	54662674e6	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-07 13:38:22 +02:00
aap	dbbf390983	use water color and new water texture	2020-05-07 13:38:14 +02:00
Sergeanur	7dc649ede6	Merge branch 'master' into miami	2020-05-07 14:32:41 +03:00
Sergeanur	1ac6bea590	Fix GetDistanceSquared	2020-05-07 14:32:00 +03:00
Sergeanur	ed1bb7236f	Fixed arguments for sound collisions	2020-05-07 14:10:56 +03:00
aap	5c30b3a188	got rid of superfluous enum; update librw	2020-05-07 12:48:57 +02:00
aap	f5c0bf3b60	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-07 12:48:57 +02:00
aap	152c7c452c	few changes for vehicle model info	2020-05-07 12:48:09 +02:00
Sergeanur	bef436400d	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/modelinfo/ModelIndices.h	2020-05-07 13:42:50 +03:00
aap	aff89c6f5c	typo	2020-05-07 11:47:08 +02:00
aap	05a1d64fbb	VC vehicles just barely working now	2020-05-07 11:33:20 +02:00
aap	876e402d1e	dont hardcode first vehicle ID; little fix for roadblocks	2020-05-07 09:38:07 +02:00
Fire-Head	875c77e8b1	oal update	2020-05-07 10:13:59 +03:00
Fire-Head	12a3499ca3	oal wav/mp3 stream update	2020-05-07 09:26:16 +03:00
aap	a8d8c0690d	changed default ID ranges. old default.ide incompatible now	2020-05-06 23:39:38 +02:00
Nikolay Korolev	a7c17a329a	fixed lane offset	2020-05-07 00:27:10 +03:00
aap	3931dc795f	waterlevel with offset (from Fire_Head)	2020-05-06 23:13:12 +02:00
aap	a1c229784f	Merge pull request #518 from Nick007J/miami ... script stubs + REQUEST_COLLISION	2020-05-06 21:55:10 +02:00
aap	965ea93a61	checked some of streaming for VC changes	2020-05-06 21:54:43 +02:00
Nikolay Korolev	599b7301c8	script stubs + REQUEST_COLLISION	2020-05-06 21:15:58 +03:00
Nikolay Korolev	53107d3b71	added flag	2020-05-06 19:24:33 +03:00
Nikolay Korolev	0930d70134	IsStatic	2020-05-06 19:20:45 +03:00
Nikolay Korolev	a24b65cbde	IsStatic	2020-05-06 19:17:47 +03:00
Nikolay Korolev	d5e76471ae	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 19:04:52 +03:00
aap	f1c1f56b12	CSphere and CBox for CColModel	2020-05-06 17:56:38 +02:00
aap	a76b88da08	fixed object collision stuff at least somewhat	2020-05-06 17:17:07 +02:00
aap	c11912a8ec	sorted out object collision enums	2020-05-06 17:14:34 +02:00
aap	aa12251c6b	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-06 17:13:53 +02:00
aap	a2b89c6a18	sorted out object collision enums	2020-05-06 17:13:46 +02:00
Sergeanur	d015e09c92	Merge branch 'master' into miami	2020-05-06 18:03:36 +03:00
Sergeanur	b633288d1b	Merge remote-tracking branch 'origin/master'	2020-05-06 18:02:16 +03:00
Sergeanur	daa3b20477	Fix cAudioManager::ProcessActiveQueues loop	2020-05-06 18:01:52 +03:00
aap	224727c14d	got rid of superfluous enum	2020-05-06 16:58:57 +02:00
aap	b4bbd91921	got rid of superfluous enum	2020-05-06 16:56:59 +02:00
Nikolay Korolev	bd4d5d7c47	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 16:55:45 +03:00
Nikolay Korolev	15520fe77d	fix memory corruption	2020-05-06 16:55:04 +03:00
Nikolay Korolev	3b08efa2ad	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 16:46:33 +03:00
Sergeanur	bb55430f75	Merge remote-tracking branch 'origin/master' into miami	2020-05-06 16:44:30 +03:00
aap	13522259b8	fix for radar	2020-05-06 15:41:40 +02:00
Nikolay Korolev	88076a0050	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 15:45:13 +03:00
aap	25a4091fa8	setting some areas so objects dont disappear	2020-05-06 14:43:23 +02:00
Nikolay Korolev	4d06271a29	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 15:30:56 +03:00
aap	600cbee7d4	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-06 14:28:05 +02:00
aap	13c24a310d	little cworld bugfix	2020-05-06 14:27:57 +02:00
aap	7c356b08e6	little cworld bugfix	2020-05-06 14:27:41 +02:00
Nikolay Korolev	8c036ec671	sync with master	2020-05-06 14:42:41 +03:00
Sergeanur	c0488d9ecf	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/User.cpp # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/core/Zones.h # src/entities/Entity.cpp	2020-05-06 14:10:52 +03: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
Nikolay Korolev	98177f27ba	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 11:38:02 +03:00
aap	edd9301d7f	reverting fuckup	2020-05-06 09:59:04 +02:00
aap	8e84728f41	Merge branch 'master' of github.com:GTAmodding/re3	2020-05-06 09:24:18 +02:00
aap	bb0541404d	updated librw	2020-05-06 09:24:12 +02:00
aap	ed021431e9	updated librw	2020-05-06 09:23:31 +02:00
aap	31f9bb566b	implemented most of timecycle and mblur	2020-05-06 00:53:26 +02:00
Nikolay Korolev	a7036475c3	not needed	2020-05-06 01:16:54 +03:00
Nikolay Korolev	e5da4c2b4d	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-06 01:11:18 +03:00
Nikolay Korolev	0b104a59fe	script colstore stuff	2020-05-06 01:11:06 +03:00
aap	68d3ea9c42	getting the vice city map to work	2020-05-05 23:27:43 +02:00
Nikolay Korolev	35bf340401	colstore support in script	2020-05-06 00:21:26 +03:00
Nikolay Korolev	1291dd534b	script stuff	2020-05-05 21:45:43 +03:00
Nikolay Korolev	f45ea0a1cf	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-05 20:22:17 +03:00
Nikolay Korolev	918d6dbf56	some more miami	2020-05-05 20:22:13 +03:00
aap	7428590457	some miami limits	2020-05-05 18:31:53 +02:00
aap	e81652c2fc	cleaned up MIAMI ifdefs	2020-05-05 18:06:38 +02:00
Nikolay Korolev	6b4b708fa7	skipped one def	2020-05-05 19:06:24 +03:00
Sergeanur	22e8b0e419	Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL" ... This reverts commit 1eb817de77. # Conflicts: # src/core/Game.cpp	2020-05-05 18:34:46 +03:00
Sergeanur	12fbf8cede	Merge branch 'master' into miami ... # Conflicts: # src/core/Game.cpp	2020-05-05 18:33:32 +03:00
Sergeanur	1eb817de77	Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL	2020-05-05 18:32:46 +03:00
Nikolay Korolev	edeb8736f1	remove ifdefs	2020-05-05 18:20:10 +03:00
Sergeanur	0163a7bc46	Remove ColStore	2020-05-05 18:13:46 +03:00
Sergeanur	cb8ffbac73	Revert "Remove #endif" ... This reverts commit 7200a783ee.	2020-05-05 18:07:43 +03:00
Sergeanur	74b522af71	Merge branch 'master' into miami	2020-05-05 18:07:33 +03:00
Sergeanur	7200a783ee	Remove #endif	2020-05-05 18:07:08 +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
Sergeanur	dfe0642195	Merge pull request #512 from Nick007J/master ... MIAMI CAutoPilot + CCarAI + multiple fixes	2020-05-05 17:14:13 +03:00
Sergeanur	fcd386f55d	Merge pull request #510 from aap/master ... implemented most of streamed collisions and big buildings	2020-05-05 17:14:01 +03:00
Nikolay Korolev	fc81a8cbe2	fixed traffic lights	2020-05-05 16:10:22 +03:00
aap	b3b9be5e8c	merged master	2020-05-05 14:21:13 +02:00
Sergeanur	5580eb21a4	ModeInfoType -> ModelInfoType	2020-05-05 15:13:09 +03:00
Sergeanur	4cc1bb92e7	Make CBaseModelInfo fields protected	2020-05-05 15:06:55 +03:00
aap	fd462c9b55	implemented most of streamed collisions and big buildings	2020-05-05 14:00:20 +02:00
Sergeanur	e9b334d7bf	More use of GetModelIndex	2020-05-05 14:48:35 +03:00
Nikolay Korolev	ee261c996b	Merge remote-tracking branch 'upstream/master'	2020-05-05 14:40:56 +03:00
Nikolay Korolev	ae0c83fa01	CAutoPilot + CCarAI + fixes	2020-05-05 14:40: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
Fire-Head	73c809f616	bb std::string	2020-05-04 22:02:54 +03:00
Fire-Head	6382b6d2fc	fix typo	2020-05-04 21:32:42 +03:00
Fire-Head	0abd0c659b	openal-soft added	2020-05-04 21:06:14 +03:00
Fire-Head	8aac6060d3	oal upd	2020-05-04 20:33:48 +03:00
Nikolay Korolev	131e8af174	Merge pull request #508 from Nick007J/master ... Scripts compatible saving + CCarCtrl bug + crusher coach bug	2020-05-04 19:52:26 +03:00
Nikolay Korolev	3554ec58bb	Merge pull request #507 from aap/master ... implemented most of vice city path system, conditionals for train, bridge, cullzones	2020-05-04 19:51:56 +03:00
Nikolay Korolev	11c7050dfb	deny coach in crusher	2020-05-04 15:02:46 +03:00
Nikolay Korolev	20ffccbe2a	Merge remote-tracking branch 'upstream/master'	2020-05-04 14:58:12 +03:00
Nikolay Korolev	d1a46c35ce	fixed spawn bug	2020-05-04 14:57:49 +03:00
aap	f027c3afed	fixed fog color for librw	2020-05-04 13:41:17 +02:00
aap	a073dda5ec	GTA_ZONECULL define	2020-05-03 17:44:10 +02:00
aap	67467f15d1	GTA_BRIDGE and GTA_TRAIN defines	2020-05-03 17:28:54 +02:00
aap	702da55ec9	implemented most of vice city path system	2020-05-03 16:09:37 +02:00
Nikolay Korolev	926e216dd4	Merge remote-tracking branch 'upstream/master'	2020-05-03 01:43:12 +03:00
Nikolay Korolev	fa29804c49	script compatibility	2020-05-03 01:42:46 +03:00
Sergeanur	ff4af35292	Fix pad Y axis	2020-05-03 01:42:05 +03:00
Sergeanur	dcd1ba6578	Fix CMessages::InsertStringInString	2020-05-03 01:40:37 +03:00
Sergeanur	6a40c03442	Put camera modes compatibility under COMPATIBLE_SAVES	2020-05-03 00:15:28 +03:00
Sergeanur	7fc33d85f7	Merge pull request #504 from Sergeanur/PadInputSwitch ... Switching pad modes and cheats when player is switching between controller and kb&m	2020-05-03 00:12:54 +03:00
Sergeanur	d2712afc78	Add CURMODE macro	2020-05-03 00:11:02 +03:00
Sergeanur	9d600802fa	Revert "Disable PED_SKIN for now" ... This reverts commit d51bf48dcd.	2020-05-02 23:52:41 +03:00
Sergeanur	4448156e29	Merge pull request #494 from Nick007J/master ... pools compatibility	2020-05-02 23:48:17 +03:00
Sergeanur	89961325b2	Ceil health and armor values in hud (fix 99 health)	2020-05-02 23:38:52 +03:00
Sergeanur	c62d35fed0	Adding sound intensity consts	2020-05-02 23:31:45 +03:00
Nikolay Korolev	b095bc1b5a	Merge remote-tracking branch 'upstream/master'	2020-05-02 21:31:41 +03:00
Sergeanur	52a13e3301	Fix number of unique jumps in stat menu	2020-05-02 21:28:44 +03:00
Sergeanur	fc85bb710b	Fix COMMAND_GET_CONTROLLER_MODE	2020-05-02 19:39:36 +03:00
Sergeanur	ba8aa38654	Switching pad modes and cheats when player is switching between controller and kb&m	2020-05-02 19:39:36 +03:00
Sergeanur	d51bf48dcd	Disable PED_SKIN for now	2020-05-02 19:13:51 +03:00
Sergeanur	271517915f	Cleanup cAudioManager::ProcessVehicleSkidding	2020-05-02 18:23:48 +03: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	7ba5b3c353	A bit more audio cleanup	2020-05-02 17:10:51 +03:00
Sergeanur	853dab23f5	cleanup cAudioManager::UpdateReflections	2020-05-02 16:45:24 +03:00
Sergeanur	8d0b0051b4	AudioManager.cpp autoformat	2020-05-02 16:27:40 +03:00
Sergeanur	05b2ae10c6	Replacing >> and << to / and * in AudioManager	2020-05-02 15:56:59 +03:00
Sergeanur	52390062b3	SetPosition, part 2	2020-05-02 15:28:19 +03:00
Sergeanur	d23b2c423e	SetPosition, part 1	2020-05-02 15:13:09 +03:00
rollschuh2282	ccf7ebca9a	fixed the CIRCLE_BACK_BUTTON define.	2020-05-02 12:58:12 +02:00
Nikolay Korolev	5a916c16b7	Merge remote-tracking branch 'upstream/master'	2020-05-02 11:26:26 +03:00
aap	339365806a	update librw (vsynch)	2020-05-02 10:08:58 +02:00
Nikolay Korolev	026ed72bfc	Merge remote-tracking branch 'upstream/master'	2020-05-01 21:23:09 +03:00
erorcun	90f5a8fa8e	Merge pull request #501 from erorcun/erorcun ... Screen mode selector and persistent map target fix	2020-05-01 21:21:05 +03:00
eray orçunus	97b288c1e4	Screen mode selector and persistent map target fix	2020-05-01 21:16:02 +03:00
aap	59bfbaddfb	implemented debugmenu shutdown	2020-05-01 17:31:29 +02:00
Nikolay Korolev	0d5f56cacc	Merge remote-tracking branch 'upstream/master'	2020-05-01 15:22:56 +03:00
aap	1ef67aee22	update librw	2020-05-01 14:22:23 +02:00
Nikolay Korolev	79d66b7910	Merge remote-tracking branch 'upstream/master'	2020-05-01 13:46:36 +03:00
aap	56cb586f15	Merge pull request #499 from aap/master ... Better handling of video modes, windowed mode, fixes to glfw	2020-05-01 08:43:35 +02:00
Nikolay Korolev	063bf51bf1	updated get/set	2020-04-30 22:04:07 +03:00
Nikolay Korolev	dc12718fc2	Merge remote-tracking branch 'upstream/master'	2020-04-30 21:41:20 +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	94acee8580	Fix MakeSureSlotInObjectPoolIsEmpty	2020-04-30 16:52:37 +03:00
Sergeanur	7d758f3a9f	Adding getters and setters for type and status	2020-04-30 16:45:45 +03:00
aap	1b40693f80	improved video modes for glfw	2020-04-30 15:38:25 +02:00
aap	b714103703	fixed CVector !=	2020-04-30 11:31:49 +02:00
aap	9950d105f7	Merge branch 'master' of github.com:gtamodding/re3	2020-04-30 10:17:26 +02:00
Sergeanur	080689589c	Jap fixes	2020-04-30 02:27:15 +03:00
Nikolay Korolev	38655693f5	Merge remote-tracking branch 'upstream/master'	2020-04-29 21:56:25 +03:00
aap	3580e31ce0	Merge branch 'master' of github.com:gtamodding/re3	2020-04-29 20:53:54 +02:00
aap	804b022e67	implemented improved video modes for win.cpp	2020-04-29 18:24:25 +02:00
eray orçunus	fdb1580e15	Mouse wheel fix	2020-04-29 18:53:05 +03:00
Nikolay Korolev	1e78278b5a	Merge remote-tracking branch 'upstream/master'	2020-04-29 11:44:33 +03:00
aap	4e630a1a38	Merge pull request #495 from Sergeanur/MoreLanguages ... Japanese support	2020-04-29 10:26:36 +02:00
Nikolay Korolev	7608174224	Merge remote-tracking branch 'upstream/master'	2020-04-28 15:11:22 +03:00
Sergeanur	299bbc47ec	Changing prefixes for some audio fields	2020-04-28 14:00:38 +03:00
Nikolay Korolev	d8371dcf80	Merge remote-tracking branch 'upstream/master'	2020-04-28 12:16:50 +03:00
Nikolay Korolev	d921871a88	Allow keyboard controls for flying cheats	2020-04-28 12:05:52 +03:00
aap	c7e2845602	removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp?	2020-04-28 10:56:30 +02:00
Nikolay Korolev	fcf9011601	Merge remote-tracking branch 'upstream/master'	2020-04-28 00:47:47 +03:00
Sergeanur	fe353a7cc9	Fixes	2020-04-27 22:41:09 +03:00
aap	1180cc2947	Merge branch 'master' of github.com:gtamodding/re3	2020-04-27 20:56:53 +02:00
aap	f399fd1050	little support for gl3 textures; txd.img enabled again	2020-04-27 20:56:44 +02:00
Sergeanur	64e6af1db8	Fix tVehicleSampleData struct	2020-04-27 20:26:24 +03:00
Sergeanur	c94ccce6d6	Audio structs moved to their AudioManager.h	2020-04-27 20:06:54 +03:00
aap	d397a59951	Merge branch 'master' of github.com:gtamodding/re3	2020-04-27 12:31:49 +02:00
aap	d9c987bd8c	fix (temporary?) for black bullet traces	2020-04-27 12:31:38 +02:00
Sergeanur	7bf45124e6	Fix use of integers instead of enum/bool/nil	2020-04-27 12:41:34 +03:00
Nikolay Korolev	9df04961ce	Merge remote-tracking branch 'upstream/master'	2020-04-27 12:20:28 +03:00
Sergeanur	81fce4edab	Audio fixes	2020-04-27 02:49:07 +03:00
Sergeanur	669bbe3cc7	Workaround for a crash on release	2020-04-27 01:55:06 +03:00
Nikolay Korolev	a38a867cc5	sync with upstream	2020-04-27 00:55:22 +03:00
Nikolay Korolev	74fde1397e	pools compatibility	2020-04-27 00:54:43 +03:00
Nikolay Korolev	68bf239868	Merge pull request #489 from Nick007J/master ... 1.1 patch stuff + flying controls	2020-04-27 00:53:54 +03:00
aap	e467cb08b8	Merge branch 'master' of github.com:gtamodding/re3	2020-04-26 21:51:11 +02:00
aap	1b5616688e	tried to fix some half-pixel bugs	2020-04-26 21:50:52 +02:00
Sergeanur	f0890b1112	Merge branch 'master' into MoreLanguages ... # Conflicts: # src/core/Frontend.cpp # src/core/MenuScreens.h # src/render/Font.cpp # src/render/Font.h # src/text/Messages.cpp # src/text/Text.cpp	2020-04-26 22:03:15 +03:00
Sergeanur	4dc2f30791	Remove little hack	2020-04-26 21:58:12 +03:00
aap	41586c7cda	fixes for glfw	2020-04-26 20:16:31 +02:00
Sergeanur	b7ee3792df	Remove struct workaround in CControllerConfigManager	2020-04-26 20:11:19 +03:00
Sergeanur	1a44bcccd5	A few fixes	2020-04-26 14:18:34 +03:00
Sergeanur	4f763cba49	Fix compilation error	2020-04-26 13:59:06 +03:00
eray orçunus	6c1a1f7cd2	Initial GLFW support	2020-04-26 13:29:50 +03:00
Nikolay Korolev	fbca45239d	Merge remote-tracking branch 'upstream/master'	2020-04-25 21:46:15 +03:00
Nikolay Korolev	ae8deff131	helis done + cheats	2020-04-25 21:25:14 +03:00
aap	ea79cc4469	update librw	2020-04-25 15:56:20 +02:00
Nikolay Korolev	7ddfc40675	Merge remote-tracking branch 'upstream/master'	2020-04-25 16:48:03 +03:00
Nikolay Korolev	40ec636291	fixed flight control code	2020-04-25 16:47:39 +03:00
aap	8289b42c9e	fixed shooting target	2020-04-25 14:37:58 +02:00
aap	241352e312	real names (from LCS)	2020-04-25 14:03:20 +02:00
aap	f15a5ac0f9	using librw GS alpha test emulation	2020-04-25 12:16:50 +02:00
Nikolay Korolev	bb14d9689f	Merge remote-tracking branch 'upstream/master'	2020-04-25 12:26:37 +03:00
aap	05bba73225	Merge branch 'master' of github.com:gtamodding/re3	2020-04-25 11:26:05 +02:00
Nikolay Korolev	2be2899034	Merge remote-tracking branch 'upstream/master'	2020-04-25 12:25:40 +03:00
aap	ad9ebbd390	Merge pull request #490 from aap/debugmenu ... implemented debugmenu	2020-04-25 11:25:19 +02:00
Nikolay Korolev	34ef766c67	Merge remote-tracking branch 'upstream/master'	2020-04-25 12:15:29 +03:00
Nikolay Korolev	f3ae4fa184	undo	2020-04-25 12:14:51 +03:00
Nikolay Korolev	c8fd0385cf	flying control	2020-04-25 12:14:21 +03:00
aap	ac19de45b8	few fixes	2020-04-25 00:41:17 +02:00
Nikolay Korolev	4b883f2b40	disable mouse steering by default	2020-04-24 20:50:00 +03:00
aap	5bb4e99926	implemented debugmenu	2020-04-24 14:08:06 +02:00
aap	f03b4eec4c	implemented skinned peds, no cutscene hands yet	2020-04-24 11:42:38 +02:00
Nikolay Korolev	bed41e1bec	removed redundant checks	2020-04-24 01:40:12 +03:00
Nikolay Korolev	0fc505926f	fix annoying bug	2020-04-24 01:32:17 +03:00
Nikolay Korolev	0b12cacf15	more 1.1 patch	2020-04-24 01:01:41 +03:00
aap	6467e2003a	Merge branch 'master' of github.com:gtamodding/re3	2020-04-23 22:10:46 +02:00
Nikolay Korolev	05ddc80ea2	Merge remote-tracking branch 'upstream/master'	2020-04-23 19:12:20 +03:00
Nikolay Korolev	458eb3a4f0	removed fix that made no sense	2020-04-23 16:40:19 +03:00
Fire_Head	ff46dc1c6c	Merge branch 'master' into master	2020-04-23 11:50:06 +03:00
Fire-Head	2925b7e0c3	fix #ifdef	2020-04-23 11:35:42 +03:00
Fire-Head	75acd78190	ps2 particles, sampman oal started	2020-04-23 11:24:03 +03:00
erorcun	9660594634	Merge pull request #481 from erorcun/erorcun ... Crossplatform work continues	2020-04-22 14:08:01 +03:00
eray orçunus	c80403a2e0	Crossplatform work continues	2020-04-22 05:24:02 +03:00
Nikolay Korolev	78d6ad7348	Merge remote-tracking branch 'upstream/master'	2020-04-21 23:41:04 +03:00
Fire_Head	828dc85be5	fix RenderExtraPlayerShadows 2	2020-04-21 22:53:55 +03:00
Fire_Head	fba4c51f6b	fix RenderExtraPlayerShadows	2020-04-21 22:52:42 +03:00
aap	959f84ff95	fixed extra directory issues	2020-04-21 13:56:33 +02:00
Nikolay Korolev	7cc3410846	Merge remote-tracking branch 'upstream/master'	2020-04-21 11:55:39 +03:00
shfil	7794cca429	Merge pull request #477 from ShFil119/mingw ... Try to make code working on more platforms	2020-04-20 19:50:12 +02:00
Nikolay Korolev	35a7f89f73	Merge remote-tracking branch 'upstream/master'	2020-04-20 19:41:49 +03:00
Filip Gawin	370c4e48cd	Try to build with mingw	2020-04-20 18:18:46 +02:00
aap	98fc8ecef0	update librw (matfx)	2020-04-20 16:05:39 +02:00
Fire_Head	c9920b6a2d	Merge pull request #480 from Fire-Head/master ... camerapickup ps2 code	2020-04-20 08:21:27 +03:00
Fire-Head	556a6df401	camerapickup ps2 code	2020-04-20 08:17:08 +03:00
Fire_Head	0a07a2233b	Merge pull request #479 from Fire-Head/master ... OddJob sliding text	2020-04-20 07:46:44 +03:00
Fire-Head	83810168ee	beta OddJob(unique jump etc) sliding text	2020-04-20 07:45:17 +03:00
Nikolay Korolev	b8c34f6654	Merge remote-tracking branch 'upstream/master'	2020-04-20 01:05:20 +03:00
Nikolay Korolev	7e4c683824	fixes	2020-04-20 01:04:57 +03:00
Sergeanur	8e9c9fa445	Fix CPickups::GenerateNewOne loop	2020-04-20 00:14:48 +03:00
Fire-Head	36f08269a5	MenuScreens.h fix	2020-04-19 22:38:02 +03:00
Fire-Head	4c5edda82e	MenuScreens.h fix	2020-04-19 22:37:20 +03:00
Fire-Head	2308321805	Add polish lang support	2020-04-19 22:32:59 +03:00
Nikolay Korolev	df376a13ea	sync with master	2020-04-19 17:38:48 +03:00
Nikolay Korolev	9e65eb34ec	1.1 patch stuff	2020-04-19 17:38:10 +03: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
erorcun	f9ed50e178	Merge pull request #475 from erorcun/erorcun ... Struct cleanup, various fixes, enable PS2 rand	2020-04-19 16:54:05 +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
Sergeanur	fce2e02444	Fix savename buffer overflow	2020-04-18 23:58:43 +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	9bfcaff849	slider fix	2020-04-18 22:56:49 +03:00
eray orçunus	5320bf7964	RpClumpRemoveAtomic update	2020-04-18 21:44:07 +03:00
erorcun	6e24cb28ad	Merge pull request #472 from gennariarmando/master ... Hide Vehicle/Zone name during Wasted/Busted...	2020-04-18 21:38:33 +03:00
eray orçunus	2f63e5e751	Vc ped ports and Frontend fixes	2020-04-18 21:30:03 +03:00
gennariarmando	ffe5dce7f5	Hide Vehicle/Zone name during Wasted/Busted... ... Fixed little mistake in my latest commit.	2020-04-18 18:14:38 +02:00
gennariarmando	522d14814f	Changed extraOffset value.	2020-04-18 16:14:48 +03:00
erorcun	70ccd4c187	Merge pull request #464 from gennariarmando/master ... Fixed menu radio icons.	2020-04-18 16:14:26 +03:00
Nikolay Korolev	89688843ec	bug fixes	2020-04-18 13:56:21 +03:00
Filip Gawin	d6314f9564	Revert "Part one" ... This reverts commit 63951d9b95.	2020-04-18 12:29:28 +02:00
Filip Gawin	3f32b69a79	Fix crash in cAudioManager::ServicePoliceRadio	2020-04-18 12:20:20 +02:00
Filip Gawin	2b1570de70	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-04-18 12:08:38 +02:00
Sergeanur	eadb5a16aa	Zones save/load	2020-04-18 12:24:44 +03:00
Sergeanur	555f933780	Remove padding fields	2020-04-18 11:31:53 +03:00
gennariarmando	e41c32df43	Fixed menu radio icons.	2020-04-18 05:52:33 +02:00
eray orçunus	812b9e7eda	Various fixes	2020-04-18 05:58:43 +03:00
aap	bdf9fa2f01	implemented librw alphatest setting	2020-04-17 23:55:20 +02:00
aap	5c474b9c68	Merge branch 'master' of github.com:gtamodding/re3	2020-04-17 21:45:25 +02:00
aap	886d73b123	fixed raster from image conversion	2020-04-17 21:45:02 +02:00
Filip Gawin	63951d9b95	Part one	2020-04-17 19:30:57 +02:00
Sergeanur	64cf568691	We don't need rw.cpp anymore	2020-04-17 18:46:43 +03:00
Sergeanur	941c50ee25	Merge remote-tracking branch 'origin/master' into Standalone	2020-04-17 16:31:43 +03:00
Sergeanur	599164006a	Remove patches	2020-04-17 16:31:11 +03:00
aap	6ef7924e01	implemented CVector2D::NormaliseSafe for SkidMarks	2020-04-17 15:15:42 +02:00
Sergeanur	c8af08330a	Merge remote-tracking branch 'samler/world' into Standalone	2020-04-17 15:06:49 +03:00
saml1er	ac61da3feb	Fix CWorld::FindObjectsOfTypeInRangeSectorList bug	2020-04-17 17:04:09 +05:00
Sergeanur	4ecf56a2d7	Merge remote-tracking branches 'origin/master' and 'samler/world' into Standalone	2020-04-17 15:03:00 +03:00
saml1er	2a4717fa41	Apply clang format to CWorld	2020-04-17 16:14:59 +05:00
saml1er	ce7d6848ba	CWorld fixes	2020-04-17 16:13:55 +05:00
Sergeanur	b9c8ce0d37	Merge remote-tracking branch 'Fire-Head/master' into Standalone ... # Conflicts: # src/render/Coronas.cpp	2020-04-17 10:17:38 +03:00
Sergeanur	881d61f811	Merge remote-tracking branch 'samler/world' into Standalone	2020-04-17 10:16:30 +03:00
Fire-Head	a4922d5cb7	rem refs	2020-04-17 08:54:14 +03:00
eray orçunus	425395ad25	Ped fixes and ref removal	2020-04-17 07:01:54 +03:00
saml1er	e777f24064	More CWorld fixes	2020-04-17 05:38:05 +05:00
saml1er	03247ce98f	Fix CWorld::RepositionOneObject bugs	2020-04-17 03:54:22 +05:00
saml1er	6b1093f1c8	CWorld complete	2020-04-17 03:20:34 +05:00
eray orçunus	2c2da558ca	Some refs removed, little fixes and teleport	2020-04-16 22:19:56 +03:00
saml1er	e52a02fb9e	Merge branch 'master' into world ... # Conflicts: # src/core/World.cpp # src/core/World.h	2020-04-17 00:01:53 +05:00
saml1er	52d0d811b7	Reverse CWorld	2020-04-16 23:46:08 +05:00
Sergeanur	83cbe4e39e	More refs removed	2020-04-16 15:30:47 +03:00
aap	7bd12f4a48	add textures in correct order	2020-04-16 13:33:32 +02:00
Sergeanur	552f8c864f	Merge pull request #448 from Nick007J/master ... CBulletInfo	2020-04-16 12:57:58 +03:00
Sergeanur	69c32376fe	Increase alpha entity list capacity for wide screen	2020-04-16 12:44:04 +03:00
Sergeanur	b1fc7bc533	More refs removed	2020-04-16 11:50:45 +03:00
aap	4b602940eb	first fake RW implementation working	2020-04-16 10:26:16 +02:00
aap	89b7085353	Merge branch 'master' of github.com:gtamodding/re3	2020-04-16 09:23:31 +02:00
Fire-Head	c1fcb7bd43	Removed refs from sampman	2020-04-16 08:28:17 +03:00
eray orçunus	c22e59abab	Various fixes	2020-04-16 05:07:32 +03:00
Nikolay Korolev	22c84356b1	Merge remote-tracking branch 'upstream/master'	2020-04-16 02:00:38 +03:00
Nikolay Korolev	5993c66efb	Fixed bridge despawns	2020-04-16 01:59:19 +03:00
Sergeanur	f435455bde	Removed refs from weapons/, WeaponEffects moved	2020-04-16 01:56:15 +03:00
Sergeanur	b9a8ad9481	Fix misplaced targeting	2020-04-16 01:44:43 +03:00
Nikolay Korolev	75733f3c83	Merge remote-tracking branch 'upstream/master'	2020-04-16 01:19:45 +03:00
Nikolay Korolev	1fd7b0288c	fix Bait crash	2020-04-16 01:19:08 +03:00
Sergeanur	d455cd8a62	Default native resolution mode and small camera fixes	2020-04-16 00:46:09 +03:00
Nikolay Korolev	156177ff5a	Merge remote-tracking branch 'upstream/master'	2020-04-16 00:32:29 +03:00
Nikolay Korolev	3517f3f1a1	fix script crash	2020-04-16 00:31:57 +03:00
Sergeanur	3e460d94ac	More japanese	2020-04-16 00:24:49 +03:00
Nikolay Korolev	e0394a1558	vs botch	2020-04-16 00:00:04 +03:00
Nikolay Korolev	480573452e	definition fix	2020-04-15 23:49:23 +03:00
Nikolay Korolev	2a96846eac	anim fix	2020-04-15 23:48:08 +03:00
aap	afce2e1bb3	Merge branch 'master' of github.com:gtamodding/re3	2020-04-15 22:36:21 +02:00
Nikolay Korolev	1795f3d479	sync with master	2020-04-15 23:31:52 +03:00
Nikolay Korolev	5cb7e2e42a	Merge pull request #440 from Fire-Head/master ... CWeapon done, fixes	2020-04-15 23:28:09 +03:00
Nikolay Korolev	a43ca86542	Merge pull request #429 from Nick007J/master ... Scene edit	2020-04-15 23:27:23 +03:00
Fire-Head	190bc696d8	fixed crash	2020-04-15 21:29:00 +03:00
Fire-Head	a9713125dc	fixed uzi/ak47/m16 trace	2020-04-15 20:58:28 +03:00
Fire-Head	c3647ee51e	rem comment	2020-04-15 20:34:58 +03:00
Fire-Head	cb4e1d68e7	glass NULL->nil	2020-04-15 20:09:51 +03:00
Fire-Head	708d247c98	'fix' fix	2020-04-15 19:53:08 +03:00
Fire-Head	85fe445fef	weapon cosmetic fix	2020-04-15 19:43:16 +03:00
erorcun	e132c3fada	Merge pull request #416 from saml1er/PedPath ... CPedPath complete	2020-04-15 19:29:17 +03:00
erorcun	647cfbfd45	Merge pull request #446 from erorcun/erorcun ... Many fixes and cleanup	2020-04-15 19:22:28 +03:00
eray orçunus	4da1879975	Many fixes and cleanup	2020-04-15 19:19:45 +03:00
Nikolay Korolev	1d8484ed7d	fix	2020-04-15 17:36:38 +03:00
aap	eccc4a3a5b	fixed bug and weirdness in CHeli	2020-04-15 16:17:18 +02:00
aap	d7eee5c130	fixed clouds and sprites	2020-04-15 15:26:55 +02:00
aap	90be379bed	implemented most of librw wrapper	2020-04-15 14:05:40 +02:00
Sergeanur	27c9f7bc88	Merge remote-tracking branch 'origin/master' into MoreLanguages	2020-04-15 10:54:15 +03:00
Fire_Head	7c13d72edc	Update Weapon.cpp	2020-04-15 08:13:46 +03:00
Fire-Head	daed13485e	CWeapon done, ps2 cheats fix	2020-04-15 08:03:53 +03:00
Nikolay Korolev	f7f4e44c34	Merge branch 'master' into garages_dev	2020-04-15 01:07:17 +03:00
Nikolay Korolev	b354a72de1	Merge remote-tracking branch 'upstream/master'	2020-04-15 01:06:56 +03:00
Nikolay Korolev	b657a8e17c	bullet info	2020-04-15 01:06:32 +03:00
Nikolay Korolev	70b51d42f4	fixed crash	2020-04-15 00:33:55 +03:00
Sergeanur	e373d0526e	Merge branch 'master' into MoreLanguages ... # Conflicts: # src/core/Frontend.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Hud.h # src/text/Messages.cpp # src/text/Text.cpp	2020-04-15 00:10:50 +03:00
saml1er	6d5464b6bb	CPedPath improvements	2020-04-14 23:32:15 +05:00
Nikolay Korolev	f35d2721f5	fix	2020-04-14 20:16:02 +03:00
Nikolay Korolev	fbed2c4530	fix debug stuff	2020-04-14 20:12:26 +03:00
Nikolay Korolev	f2c78e4bfb	Merge branch 'master' into game_dev	2020-04-14 20:10:39 +03:00
Nikolay Korolev	21a11fd343	scene edit	2020-04-14 20:09:42 +03:00
Sergeanur	6d934892ec	RwMatFX support with linked RW libs	2020-04-14 18:35:07 +03:00
Sergeanur	eb0b9f6255	fix CTheCarGenerators::SaveAllCarGenerators	2020-04-14 17:24:31 +03:00
Sergeanur	9a7b833aa5	Added missing audio ctors	2020-04-14 17:13:38 +03:00
saml1er	bf040c7cd1	Remove float casts	2020-04-14 17:05:51 +05:00
saml1er	8bb23ca5d4	Refactor CPedPath::CalcPedRoute	2020-04-14 16:57:28 +05:00
Filip Gawin	41d42a3e53	Merge pull request #414 from ShFil119/audio17 ... Finish audio	2020-04-14 13:01:40 +02:00
saml1er	b4d5d5249c	CPedPath complete	2020-04-14 15:45:47 +05:00
Sergeanur	a19fa8764f	CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement	2020-04-14 13:08:03 +03:00
Sergeanur	7f8a4b4867	Debug font and CProfiles	2020-04-14 10:31:37 +03:00
erorcun	313f547860	Some cleanup	2020-04-14 03:21:16 +03:00
Nikolay Korolev	f54c83c0b5	Merge branch 'master' into game_dev	2020-04-14 01:18:53 +03:00
Filip Gawin	2e20e040cc	Merge pull request #403 from saml1er/roadblocks ... CRoadBlocks complete	2020-04-14 00:11:39 +02:00
Filip Gawin	aa3b7869e5	Merge pull request #406 from Nick007J/master ... Pools load/save	2020-04-14 00:11:22 +02:00
saml1er	60eb60de4e	Use NUMROADBLOCKS enum member in CRoadBlocks	2020-04-14 02:13:00 +05:00
Nikolay Korolev	906133d3be	fix garages	2020-04-13 22:43:41 +03:00
Sergeanur	304b574eba	added missing break	2020-04-13 22:25:24 +03:00
Nikolay Korolev	2709447073	Merge remote-tracking branch 'upstream/master'	2020-04-13 22:17:42 +03:00
Nikolay Korolev	c21529467a	fixed record	2020-04-13 22:16:51 +03:00
Filip Gawin	67055c1fbb	Cleanup cAudioManager::ProcessRainOnVehicle a bit	2020-04-13 21:13:07 +02:00
Nikolay Korolev	12d36d8710	fixed record	2020-04-13 22:12:41 +03:00
Nikolay Korolev	1c592c26f9	review fix	2020-04-13 21:57:13 +03:00
Nikolay Korolev	3b0cd93f89	Merge remote-tracking branch 'upstream/master'	2020-04-13 21:54:25 +03:00
Nikolay Korolev	cb85091d34	scene edit	2020-04-13 21:50:56 +03:00
erorcun	0e056a8e01	Merge pull request #412 from whampson/save-stuff ... GenericLoad() done	2020-04-13 21:49:57 +03:00
Filip Gawin	3b9f1255af	Finish audio code	2020-04-13 20:30:18 +02:00
Wes Hampson	a19d5dbee1	Fixes	2020-04-13 11:20:57 -07:00
erorcun	e2fb0578b5	Merge pull request #413 from erorcun/erorcun ... CFileLoader last funcs and Frontend cleanup	2020-04-13 15:36:05 +03:00
Sergeanur	d8be75ac46	Fix compilation error	2020-04-13 15:21:26 +03:00
saml1er	68f8a6a9ed	more CRoadBlocks::GenerateRoadBlocks improvements	2020-04-13 15:21:39 +05:00
erorcun	c008eb2431	Merge pull request #410 from Sergeanur/PacManPickups ... CPacManPickups	2020-04-13 12:51:30 +03:00
Sergeanur	741c9405d0	CPacManPickups	2020-04-13 12:07:07 +03:00
eray orçunus	60c412149d	CFileLoader last funcs and Frontend cleanup	2020-04-13 05:42:02 +03:00
saml1er	28fb1bdde7	Fix CRoadBlocks::GenerateRoadBlocks bugs	2020-04-13 05:52:18 +05:00
Wes Hampson	dbf6e155ff	GenericLoad() done	2020-04-12 15:47:12 -07:00
aap	3aae52d220	finished CBoat	2020-04-13 00:20:44 +02:00
erorcun	a622c9e877	Merge pull request #409 from erorcun/erorcun ... Frontend fixes + triangle for back as default	2020-04-12 20:24:57 +03:00
eray orçunus	8b2138f7bd	Frontend fixes + triangle for back as default	2020-04-12 20:22:28 +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	e71b000cc5	Merge branch 'master' into game_dev	2020-04-12 12:13:32 +03:00
Nikolay Korolev	1732f9b5c6	obviously forgot about it	2020-04-12 12:10:25 +03:00
Nikolay Korolev	cbb298c8dd	sync with master	2020-04-12 12:08:30 +03:00
Nikolay Korolev	04c9affe2e	scene init	2020-04-12 12:06:33 +03:00
Nikolay Korolev	fa0f5542cc	Merge pull request #402 from Nick007J/master ... Record	2020-04-12 12:06:12 +03:00
Nikolay Korolev	c593599fc5	Merge pull request #399 from saml1er/master ... CObject complete	2020-04-12 12:05:49 +03:00
Sergeanur	d804ad48b9	Merge pull request #388 from ShFil119/audio16 ... Yet another audio PR	2020-04-12 11:46:48 +03:00
Nikolay Korolev	9593a2c000	fixed cranes bug	2020-04-12 11:36:51 +03:00
Filip Gawin	7d137d8f2d	Cleanup audio code	2020-04-12 02:50:52 +02:00
eray orçunus	1932d98482	CDebug fix	2020-04-12 01:33:04 +03:00
erorcun	207aebc46c	Merge pull request #400 from erorcun/erorcun ... CMenuManager done and CHud fixes	2020-04-12 00:57:46 +03:00
eray orçunus	f2995640bd	CMenuManager done and CHud fixes	2020-04-12 00:56:27 +03:00
saml1er	60898f39f2	Improve CRoadBlocks code	2020-04-12 02:08:16 +05:00
Sergeanur	daceee593b	Link with RW libs	2020-04-11 23:37:04 +03:00
Nikolay Korolev	d010f6255a	Merge branch 'master' into garages_dev	2020-04-11 21:02:31 +03:00
Nikolay Korolev	fbb1bc5b0d	Merge remote-tracking branch 'upstream/master'	2020-04-11 21:02:04 +03:00
Nikolay Korolev	38dee74a5a	CPools	2020-04-11 21:01:39 +03:00
aap	c307e72fa0	Merge branch 'master' of github.com:gtamodding/re3	2020-04-11 19:33:46 +02:00
aap	3c999a1eb8	fixed traffic light position	2020-04-11 19:33:39 +02:00
saml1er	ff16ba7801	CObject fixes	2020-04-11 22:31:32 +05:00
saml1er	0d19036a42	CRoadBlocks complete	2020-04-11 21:45:49 +05:00
Sergeanur	0ddc04743c	Fix cutscene camera latency	2020-04-11 13:21:21 +03:00
Nikolay Korolev	1c0c0a0468	fixed malloc/new	2020-04-11 13:20:41 +03:00
Nikolay Korolev	bc90f958da	fix constants	2020-04-11 02:27:50 +03:00
Nikolay Korolev	c8ac25ebfd	Merge branch 'master' into garages_dev	2020-04-11 02:04:56 +03:00
Nikolay Korolev	92b6d775d6	Record	2020-04-11 02:03:42 +03:00
Sergeanur	f1413c4776	fixing r* visioned leak	2020-04-11 00:36:11 +03:00
aap	df872a26b0	fuck you git, i fixed this already	2020-04-10 23:21:34 +02:00
Nikolay Korolev	be260b49b1	Merge branch 'master' into garages_dev	2020-04-10 21:17:00 +03:00
saml1er	4f00576a8c	Addendum to previous commit	2020-04-10 21:59:49 +05:00
saml1er	16360eb6df	Refactor CObject::ObjectDamage switch statement	2020-04-10 21:52:02 +05:00
aap	c5d61392ea	implemented CTrafficLights	2020-04-10 18:36:39 +02:00
saml1er	c2b00d7ad9	Fix cast in CObject::ObjectDamage	2020-04-10 19:37:09 +05:00
saml1er	5544325acb	Refactor CObject::ObjectDamage	2020-04-10 19:32:42 +05:00
Sergeanur	3a4442eca4	disabling the code that freezes gang members	2020-04-10 16:14:05 +03:00
saml1er	bb21cff639	Fix Object.h and Object.cpp indentation	2020-04-10 17:03:02 +05:00
saml1er	a8f7bf0bec	CObject complete	2020-04-10 16:44:08 +05:00
Nikolay Korolev	a27f7359ff	fix	2020-04-10 12:20:04 +03:00
Nikolay Korolev	4864850657	Merge remote-tracking branch 'upstream/master'	2020-04-10 12:03:48 +03:00
Nikolay Korolev	314bb83b9a	fixed intro crash	2020-04-10 12:03:22 +03:00
Sergeanur	b76172e2dd	PlayerSkin small cleanup	2020-04-10 11:41:48 +03:00
Sergeanur	8917567508	Fixing mixed IsCutsceneProcessing and IsRunning	2020-04-10 11:23:35 +03:00
Nikolay Korolev	917fa80c18	record init	2020-04-10 11:03:38 +03:00
Sergeanur	6647312660	Fix sprite vertical scale	2020-04-10 10:52:47 +03:00
Nikolay Korolev	6473778c47	fix weather init	2020-04-10 02:17:32 +03:00
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