743 Commits

Author	SHA1	Message	Date
majestic	1fef3e106c	Fluff done	2020-10-20 16:03:41 -07:00
majestic	b36759b586	/c/Users/misha/Documents/GitHub/re3/src/render/Fluff.cpp /c/Users/misha/Documents/GitHub/re3/src/render/Fluff.h	2020-10-20 15:49:29 -07:00
erorcun	42fbe7572e	Messages, fix Font	2020-10-20 22:19:05 +03:00
Filip Gawin	7ae25761d5	Tweak comparison in CFallingGlassPane::Render	2020-10-18 19:57:39 +02:00
erorcun	10758088ef	Merge pull request #766 from Fire-Head/miami ... Glass	2020-10-18 19:59:11 +03:00
erorcun	70f9832e14	Merge branch 'miami' into miami	2020-10-18 19:45:11 +03:00
erorcun	497c179245	Merge pull request #772 from Nick007J/miami ... Original save/load support + bugfixes	2020-10-18 19:37:49 +03:00
erorcun	a6aa782d6d	Fixes and style changes from miami	2020-10-18 19:16:37 +03:00
Sergeanur	0d20f1c364	Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/RoadBlocks.cpp # src/entities/Entity.h # src/entities/Physical.cpp # src/peds/Ped.cpp # src/render/Renderer.cpp # src/vehicles/Automobile.cpp # src/vehicles/CarGen.cpp # src/weapons/BulletInfo.cpp # src/weapons/Weapon.cpp	2020-10-18 17:15:49 +03:00
Sergeanur	b91f6a4550	Setter for bIsStatic (became virtual in SA)	2020-10-18 16:40:06 +03:00
Nikolay Korolev	720abca826	finished save/load	2020-10-17 20:45:07 +03:00
Roman Masanin	3cbccd2ad3	typo fixes	2020-10-17 19:05:41 +03:00
eray orçunus	b98864d134	Radar, WaterCannon, win/glfw skels	2020-10-17 17:35:26 +03:00
Roman Masanin	63c2b98c5e	fix build	2020-10-15 16:04:03 +03:00
Roman Masanin	07143ee73b	SpecialFX fixes	2020-10-15 15:52:37 +03:00
Roman Masanin	34b4efe242	fix bullet traces rener and some renaming	2020-10-15 15:42:10 +03:00
Fire-Head	e4ac934dbf	Miami Glass	2020-10-15 00:33:57 +03:00
Fire-Head	1e068aea73	fix AskForObjectToBeRenderedInGlass	2020-10-12 23:10:08 +03:00
erorcun	1e11c1eac6	Merge pull request #762 from Nick007J/miami ... Control update	2020-10-12 21:52:59 +03:00
Roman Masanin	417646819c	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-10-12 13:42:57 +03:00
Roman Masanin	56bb7d721a	mark file and fix screen offset	2020-10-12 13:41:57 +03:00
Roman Masanin	e6a1ea9d4f	CBrightLight::render	2020-10-12 13:28:06 +03:00
erorcun	96f36d16ae	Merge pull request #753 from majesticCoding/miami ... CWaterCreatures	2020-10-12 12:37:47 +03:00
eray orçunus	40020f4e1e	Fix forgotten wanted/busted text	2020-10-12 12:36:15 +03:00
eray orçunus	b1e235535c	Cutscene aspect ratio fix	2020-10-12 12:16:24 +03:00
Nikolay Korolev	49c48f2ec2	sync with upstream	2020-10-12 12:11:53 +03:00
erorcun	9e0b23f065	Merge pull request #758 from erorcun/miami ... Hud, Fire, OnscreenBlaBla	2020-10-12 11:13:46 +03:00
eray orçunus	8a622a0e72	Hud, Fire, OnscreenBlaBla	2020-10-12 06:42:54 +03:00
Roman Masanin	ca1d899413	final step	2020-10-11 22:29:49 +03:00
Roman Masanin	7a3e1ef19a	SpecialFX almost done	2020-10-11 21:40:11 +03:00
Nikolay Korolev	552f308e9e	sync with upstream	2020-10-11 12:58:11 +03:00
Nikolay Korolev	c4d4821327	Control updates	2020-10-11 12:56:33 +03:00
Sergeanur	b0becb5a2d	UnicodeMakeUpperCase move + arg fix	2020-10-11 10:39:04 +03:00
Sergeanur	9dba2386bb	Merge branch 'master' into VC/TextFinish ... # Conflicts: # src/text/Text.cpp	2020-10-11 10:34:47 +03:00
Sergeanur	e26e85deb8	Some unicode funcs belong to Font.cpp + small fix	2020-10-11 10:33:02 +03:00
majestic	e7ef45a606	CWaterCreatures	2020-10-10 17:49:54 -07:00
Roman Masanin	881db86895	CSpecialFX and some other classes	2020-10-09 20:29:38 +03:00
eray orçunus	a01b14f301	Fix sniper and water creatures bug, mark some files	2020-10-09 12:24:21 +03:00
majestic	c091a5c11a	CWaterCreatures	2020-10-08 19:28:31 -07:00
eray orçunus	73a3e9d5bb	Fixes, some thanks to ASan	2020-10-08 22:41:51 +03:00
majestic	7861992fe6	CWaterCreatures	2020-10-08 05:59:08 -07:00
eray orçunus	595421da39	Fixes, mouse AUX buttons, joystick detect menu	2020-09-30 20:03:01 +03:00
eray orçunus	f740588780	Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami	2020-09-30 02:44:02 +03:00
eray orçunus	f71953077d	Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes	2020-09-30 02:41:42 +03:00
erorcun	f9dc00a458	Merge pull request #718 from Nick007J/miami ... VC replays	2020-09-29 23:00:50 +03:00
erorcun	e2314c7852	Merge pull request #717 from theR4K/miami ... Helicopters not ringing, and other audio stuff	2020-09-29 01:48:11 +03:00
eray orçunus	70aac0f460	Fixes: PS2/PS2-like menu, Hud, new sliding text found	2020-09-27 19:22:21 +03:00
eray orçunus	9b76424540	Fixes	2020-09-27 04:39:25 +03:00
Roman Masanin	b956be0f44	another clamp	2020-09-27 04:22:59 +03:00
Roman Masanin	f67275be13	correction of defects and another two audio functions	2020-09-27 03:35:15 +03:00
eray orçunus	a5d6c952a7	Credits & fixes	2020-09-27 02:36:49 +03:00
Roman Masanin	bb2e601e13	Merge remote-tracking branch 'upstream/miami' into miami	2020-09-26 21:38:37 +03:00
Nikolay Korolev	f7d5021ac5	VC replays	2020-09-26 21:10:23 +03:00
Roman Masanin	4c220b1f95	return bridge, crane and fix structures in fluff.h	2020-09-26 21:07:51 +03:00
Sergeanur	4d1182bdb1	Fix coronas reflections	2020-09-26 14:24:21 +03:00
Sergeanur	05e65baabe	Fix coronas reflections	2020-09-26 14:23:34 +03:00
Roman Masanin	b2e3d90734	ProcessEscalators + some fixes	2020-09-22 19:32:05 +03:00
Sergeanur	a8a28c1512	Move a bunch of math to cpp files + small fixes ... # Conflicts: # src/control/CarCtrl.cpp # src/math/Matrix.h # src/math/Vector2D.h # src/math/math.cpp # src/render/Skidmarks.cpp	2020-09-14 21:10:23 +03:00
Sergeanur	38ec1bd50d	Move a bunch of math to cpp files + small fixes	2020-09-14 21:07:31 +03:00
erorcun	350b1ec67e	Merge pull request #698 from majesticCoding/miami ... cheats, fixes, cosmetic changes	2020-09-06 10:14:55 +03:00
majestic	9f43b1988b	cheats, fixes, cosmetic changes	2020-09-01 09:42:17 -07:00
aap	6fc6ed8635	Merge pull request #696 from Fire-Head/miami ... Miami Weapon, WeaponEffects done	2020-09-01 17:30:49 +02:00
eray orçunus	3e549a7d44	CGame done, Peds, fixes	2020-08-30 12:40:30 +03:00
Fire_Head	a8999bbf38	Merge pull request #1 from GTAmodding/miami ... Miami	2020-08-27 20:35:14 +03:00
Fire-Head	210c7b8785	bike shooting fix + trace temp fix	2020-08-27 20:27:28 +03:00
Fire-Head	a38702a7d2	weapons	2020-08-27 19:52:43 +03:00
Sergeanur	041d342faf	PlayerSkin done	2020-08-24 22:37:38 +03:00
aap	0a19925e99	finished sprites	2020-08-24 14:26:17 +02:00
aap	771235d213	weather fixes	2020-08-23 13:30:21 +02:00
aap	38a01a59fa	CWeather done	2020-08-23 13:27:56 +02:00
aap	23c52c1c86	fixed CRenderer::ScanSectorPoly again	2020-08-21 09:40:31 +02:00
aap	ac5af18891	fixed CRenderer::ScanSectorPoly again	2020-08-21 09:40:10 +02:00
aap	857cef776d	Merge pull request #693 from majesticCoding/miami ... stable CScriptPaths	2020-08-20 23:01:21 +02:00
majestic	03c90b7c40	stable CScriptPaths	2020-08-20 09:44:26 -07:00
aap	bb948904b6	small stuff	2020-08-19 21:58:00 +02:00
aap	827ba62671	neo pipelines; postfx fix	2020-08-19 16:10:22 +02:00
aap	e3405f4be4	Merge branch 'master' of github.com:gtamodding/re3	2020-08-18 11:09:50 +02:00
aap	c556cbbbe0	neo pipelines	2020-08-18 10:58:15 +02:00
Sergeanur	732681db08	Island loading and PS2 alpha test added to options	2020-08-16 17:26:44 +03:00
erorcun	07038ce88e	Merge pull request #686 from erorcun/miami ... Stats(except displaying) and PlayerInfo done, Frontend, marker fix	2020-08-15 02:28:17 +03:00
aap	85d76dc171	fixed clouds render	2020-08-14 09:28:17 +02:00
aap	2a0a508a10	fixed clouds render	2020-08-14 09:27:54 +02:00
eray orçunus	b54bb62c94	Stats(except displaying), PlayerInfo, marker fix	2020-08-14 01:14:04 +03:00
aap	cdebea71f3	fixes to HUD and sprite2d	2020-08-13 18:47:39 +02:00
aap	afed831aed	extended postfx and sniper hud fix	2020-08-13 18:14:24 +02:00
aap	0d8fcb41ee	fix render poly bug	2020-08-13 16:30:23 +02:00
aap	f0503edf62	fix render poly bug	2020-08-13 16:29:42 +02:00
aap	878ffa8998	sun reflection fix	2020-08-12 10:48:00 +02:00
aap	b468d010a8	implemented extended postfx	2020-08-11 18:40:04 +02:00
aap	c2c65207a3	Merge pull request #677 from majesticCoding/miami ... CWindModifiers	2020-08-10 17:12:32 +02:00
aap	2f987e315e	update librw (shadows are working now)	2020-08-10 17:04:57 +02:00
majestic	70029752f5	CWindModifiers	2020-08-09 21:42:12 -07:00
majestic	b73b6b8e13	CWindModifiers	2020-08-09 12:32:30 -07:00
aap	e57d450809	drunk blur done	2020-08-09 19:51:16 +02:00
aap	a149d9d511	little timecycle cleanup	2020-08-09 19:32:32 +02:00
aap	43bf854374	timecycle done	2020-08-09 19:11:44 +02:00
aap	4118d2aa55	finished skidmarks	2020-08-09 17:14:24 +02:00
aap	0bb46f3f8c	rubbish done	2020-08-09 16:49:15 +02:00
aap	59d25d3ad8	pointlight fixes	2020-08-09 15:45:54 +02:00
aap	6514bc6b39	pointlights done	2020-08-09 15:45:38 +02:00
aap	b02c7cdc44	coronas done	2020-08-09 13:17:48 +02:00
aap	5dc7ff98f2	corona fixes	2020-08-09 13:17:05 +02:00
Fire-Head	d2e090317f	static shadows fix, cutscene shadows switches	2020-08-08 15:06:45 +03:00
Sergeanur	7d8ffa9ebd	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/RoadBlocks.cpp # src/core/Collision.h # src/core/Pad.cpp # src/core/SurfaceTable.h # src/core/main.cpp # src/core/re3.cpp # src/peds/Population.cpp # src/render/Fluff.cpp # src/render/Shadows.cpp # src/render/Shadows.h # src/render/Sprite2d.cpp # src/weapons/BulletInfo.cpp	2020-08-07 12:34:41 +03:00
aap	f14b1fba09	Merge pull request #675 from erorcun/master ... Squeeze performance option, minor fixes	2020-08-07 10:18:46 +02:00
aap	0d7fa6df3c	Merge pull request #676 from aap/master ... VU0 collision	2020-08-07 10:18:40 +02:00
aap	40185161b8	Merge pull request #670 from Fire-Head/miami ... Miami Shadows	2020-08-07 10:18:35 +02:00
Fire_Head	6fcc75032e	Update CutsceneShadow.h	2020-08-05 17:13:21 +03:00
Fire-Head	89fd7759a3	fixes	2020-08-04 16:24:59 +03:00
aap	d801167637	Merge pull request #668 from majesticCoding/miami ... CEscalators done	2020-08-04 12:27:09 +02:00
majestic	394134f774	CEscalators done	2020-08-03 15:31:42 -07:00
aap	abb640c6b6	VU0 collision	2020-08-03 17:32:06 +02:00
eray orçunus	e14252914e	Squeeze performance option, minor fixes ... Fixes are already in miami	2020-08-03 16:00:32 +03:00
Fire-Head	90689a1717	shadow fixes	2020-08-03 01:25:29 +03:00
Fire-Head	f6663b01bc	Update CutsceneShadow.h	2020-07-31 21:34:52 +03:00
Fire-Head	224fd77641	NULL -> nil	2020-07-31 21:21:58 +03:00
eray orçunus	eafa9cc107	new opcodes, buyable properties, minor fixes	2020-07-30 15:32:34 +03:00
Fire-Head	e2ded2d6ce	cutsceneshadow fixes	2020-07-30 01:32:21 +03:00
Sergeanur	acdc52116e	Merge branch 'master' into miami ... # Conflicts: # src/animation/RpAnimBlend.cpp # src/audio/oal/stream.cpp # src/audio/sampman.h # src/control/Pickups.cpp # src/core/Collision.cpp # src/core/Collision.h # src/core/FileLoader.cpp # src/core/FileMgr.cpp # src/core/FileMgr.h # src/core/Streaming.cpp # src/core/Streaming.h # src/core/SurfaceTable.h # src/modelinfo/VehicleModelInfo.h # src/peds/Ped.cpp # src/rw/RwHelper.cpp # src/rw/RwHelper.h # src/skel/glfw/glfw.cpp # src/skel/platform.h # src/text/Text.cpp # src/text/Text.h # src/vehicles/CarGen.cpp # src/vehicles/Heli.cpp	2020-07-29 15:34:57 +03:00
Sergeanur	581cb5edfa	The real pickup reflection fix	2020-07-29 14:56:06 +03:00
Fire_Head	52e77c6634	Merge pull request #1 from GTAmodding/miami ... Miami	2020-07-29 12:20:02 +03:00
Fire-Head	1803dcc873	miami shadows	2020-07-29 12:17:53 +03:00
aap	6b7a8f96a6	CCollision done and fixes	2020-07-27 15:38:46 +02:00
aap	2e8048d0fe	collision fixes	2020-07-27 15:38:12 +02:00
aap	90fdc4328b	CHeli and CRopes done	2020-07-27 14:06:23 +02:00
eray orçunus	ad6094ca1d	90% fixes, 10% skel refactoring	2020-07-24 21:02:55 +03:00
eray orçunus	732b760829	64-bit on Windows	2020-07-24 20:26:33 +03:00
eray orçunus	7e32c603fc	New math wrappers ... from miami	2020-07-23 00:31:06 +03:00
eray orçunus	1dc6fbda1f	64-bit on Windows	2020-07-22 18:51:28 +03:00
erorcun	b182fa4bb8	Merge pull request #656 from erorcun/miami ... Peds, Hud, CFO 1/2, fixes - including zone names	2020-07-22 18:21:39 +03:00
eray orçunus	f40f44b14e	Peds, Hud, CFO 1/2, fixes - including zone names	2020-07-22 15:19:22 +03:00
aap	34b162d2c9	fixed to renderer	2020-07-21 11:12:15 +02:00
aap	d4d6290403	fixed to renderer	2020-07-21 11:12:10 +02:00
aap	5bedca7692	fixed COcclusion	2020-07-20 23:25:04 +02:00
aap	ee2d0ffc14	Merge pull request #650 from majesticCoding/miami ... COcclusion done, I hope	2020-07-20 19:56:18 +02:00
aap	2612c9f12c	CPlaneTrails and CPlaneBanners done	2020-07-20 19:50:20 +02:00
majestic	1ff27e3363	cosmetic fixes	2020-07-20 09:49:39 -07:00
aap	e74b569115	CPlane done	2020-07-19 00:56:30 +02:00
Sergeanur	dd717b2d93	Actual fix now xD	2020-07-18 13:27:31 +03:00
Sergeanur	cf5dd6289e	Fix TempVertexBuffer overflow	2020-07-18 13:09:21 +03:00
Sergeanur	30384bb4ef	Merge branch 'master' into miami ... # Conflicts: # src/render/Credits.cpp	2020-07-17 21:15:47 +03:00
Sergeanur	1b161275e1	Fix CalcScreenCoors... again	2020-07-17 18:23:11 +03:00
Sergeanur	27e1fa1d28	Add missing f's	2020-07-17 17:56:59 +03:00
Sergeanur	d0f5464200	Merge branch 'master' into miami ... # Conflicts: # src/control/CarAI.cpp # src/control/Phones.cpp # src/control/Phones.h # src/control/Record.cpp # src/control/Restart.cpp # src/control/Script.cpp # src/core/Collision.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.h # src/core/Streaming.cpp # src/core/TempColModels.cpp # src/core/Wanted.cpp # src/core/Zones.cpp # src/core/config.h # src/core/main.cpp # src/core/re3.cpp # src/entities/Entity.cpp # src/entities/Physical.cpp # src/extras/frontendoption.cpp # src/modelinfo/ModelInfo.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/CivilianPed.cpp # src/peds/CopPed.cpp # src/peds/EmergencyPed.cpp # src/peds/Ped.cpp # src/peds/Ped.h # src/peds/Population.cpp # src/render/Renderer.cpp # src/save/GenericGameStorage.cpp # src/skel/win/win.cpp # src/vehicles/Automobile.cpp # src/vehicles/Boat.cpp # src/vehicles/Boat.h # src/vehicles/Vehicle.cpp	2020-07-13 18:10:17 +03:00
Sergeanur	841fa5155c	Rename LEVEL_NONE to LEVEL_GENERIC	2020-07-13 17:43:09 +03:00
Sergeanur	6eb8f6ae5a	Add cutscene borders switch to the menu	2020-07-11 12:04:26 +03:00
Sergeanur	cf69f22a0c	Remove island loading	2020-07-09 19:18:42 +03:00
eray orçunus	67a3c7d2ee	VC fighting, Peds, many fixes including ghost bikes	2020-07-09 17:01:07 +03:00
Dominik	478d4246c4	Miami Colors. ... Miami colors for MissionPassed/Failed, oddjob text 1 and 2 + fixed wrong busted/wasted color (it was pink and in the original its actually green)	2020-07-07 00:32:13 +02:00
aap	2141247e08	CBoat and friends	2020-07-01 18:04:02 +02: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	1d2d5fe6ae	Merge branch 'master' into miami ... # Conflicts: # src/render/MBlur.cpp # src/render/MBlur.h	2020-06-30 07:45:54 +03:00
Sergeanur	6d396ba73b	Fix MBlur	2020-06-30 07:43:20 +03: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	3b3324de38	Update MBlur.cpp	2020-06-29 11:14:00 +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	860f75d66c	Merge branch 'master' into ps2menu	2020-06-29 09:37:53 +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
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
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
eray orçunus	f3ed6659c3	CWanted, anim fix, ped objs renaming, remove III beta features	2020-06-22 04:20:56 +03:00
aap	60f736f20f	FOV fix	2020-06-21 14:52:44 +02:00
aap	98baa36f1a	FOV fix	2020-06-21 14:50:00 +02:00
aap	c5205a89ee	CCamera done	2020-06-20 14:54:11 +02:00
eray orçunus	e9d5d42ea9	fix clipped subtitles	2020-06-17 11:11:44 +03: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
aap	c7a32bb83d	some camera code	2020-06-14 09:36:30 +02: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
majestic	2cc8ecbb90	removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun	2020-06-11 01:36:45 -07: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
Sergeanur	0afb1d9e24	Scale font shadow	2020-06-08 10:30:09 +03:00
eray orçunus	e07b6fdce7	Message box, letterbox and ped attaching	2020-06-07 21:44:54 +03:00
eray orçunus	88f066f469	HUD sizes	2020-06-07 19:13:12 +03:00
Sergeanur	fe3a3ad8b5	cleanup	2020-06-07 15:19:29 +03: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
eray orçunus	fc0498b3a8	CFont crash workaround	2020-06-06 19:25:37 +03:00
eray orçunus	016ebc0b00	fixes, mostly from miami	2020-06-04 06:03:12 +03:00
eray orçunus	5dc410a999	Peds, eSound and PedState enum, fixes	2020-06-03 17:01:11 +03:00
Sergeanur	509ca11d76	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/GameLogic.cpp # src/control/PathFind.cpp # src/control/RoadBlocks.cpp # src/control/Script.cpp # src/control/Script.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/TempColModels.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/modelinfo/VehicleModelInfo.h # src/render/Skidmarks.h # src/render/WaterLevel.cpp # src/save/GenericGameStorage.h # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/DamageManager.cpp # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h	2020-06-03 01:24:08 +03:00
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