834 Commits

Author	SHA1	Message	Date
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
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	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	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
aap	989ded6052	removed cutscene heads	2020-05-09 13:00:39 +02:00
eray orçunus	b80c4bae6b	Menu map fixes and resizable window on GLFW	2020-05-09 13:58:31 +03: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
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	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	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	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
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	19b21cafcd	CZoneInfo mostly done; not its dependencies	2020-05-07 17:53:38 +02:00
Nikolay Korolev	5780b4503e	sync with upstream	2020-05-07 16:59:40 +03:00
Nikolay Korolev	40888e9486	car control and friends	2020-05-07 16:57:49 +03:00
aap	5c30b3a188	got rid of superfluous enum; update librw	2020-05-07 12:48:57 +02: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
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
aap	965ea93a61	checked some of streaming for VC changes	2020-05-06 21:54:43 +02: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
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	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	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	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
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	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
aap	b3b9be5e8c	merged master	2020-05-05 14:21:13 +02:00
Sergeanur	4cc1bb92e7	Make CBaseModelInfo fields protected	2020-05-05 15:06:55 +03:00
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	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
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
Sergeanur	ff4af35292	Fix pad Y axis	2020-05-03 01:42:05 +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
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	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
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	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
eray orçunus	97b288c1e4	Screen mode selector and persistent map target fix	2020-05-01 21:16:02 +03: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	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	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	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
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	f399fd1050	little support for gl3 textures; txd.img enabled again	2020-04-27 20:56:44 +02: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
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
eray orçunus	6c1a1f7cd2	Initial GLFW support	2020-04-26 13:29:50 +03:00
Nikolay Korolev	ae8deff131	helis done + cheats	2020-04-25 21:25:14 +03:00
Nikolay Korolev	7ddfc40675	Merge remote-tracking branch 'upstream/master'	2020-04-25 16:48:03 +03: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
Nikolay Korolev	2be2899034	Merge remote-tracking branch 'upstream/master'	2020-04-25 12:25:40 +03:00
Nikolay Korolev	34ef766c67	Merge remote-tracking branch 'upstream/master'	2020-04-25 12:15:29 +03:00
aap	ac19de45b8	few fixes	2020-04-25 00:41:17 +02: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
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
Fire_Head	ff46dc1c6c	Merge branch 'master' into master	2020-04-23 11:50:06 +03:00
Fire-Head	75acd78190	ps2 particles, sampman oal started	2020-04-23 11:24:03 +03:00
eray orçunus	c80403a2e0	Crossplatform work continues	2020-04-22 05:24:02 +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	556a6df401	camerapickup ps2 code	2020-04-20 08:17:08 +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
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
eray orçunus	1ffc37735e	Struct cleanup, various fixes, enable PS2 rand	2020-04-19 16:44:35 +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
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	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
Filip Gawin	63951d9b95	Part one	2020-04-17 19:30:57 +02:00
Sergeanur	599164006a	Remove patches	2020-04-17 16:31:11 +03:00
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
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
eray orçunus	c22e59abab	Various fixes	2020-04-16 05:07:32 +03:00
Sergeanur	d455cd8a62	Default native resolution mode and small camera fixes	2020-04-16 00:46:09 +03:00
Sergeanur	3e460d94ac	More japanese	2020-04-16 00:24:49 +03:00
aap	afce2e1bb3	Merge branch 'master' of github.com:gtamodding/re3	2020-04-15 22:36:21 +02:00
Nikolay Korolev	5cb7e2e42a	Merge pull request #440 from Fire-Head/master ... CWeapon done, fixes	2020-04-15 23:28:09 +03:00
Nikolay Korolev	a43ca86542	Merge pull request #429 from Nick007J/master ... Scene edit	2020-04-15 23:27:23 +03:00
eray orçunus	4da1879975	Many fixes and cleanup	2020-04-15 19:19:45 +03:00
aap	90be379bed	implemented most of librw wrapper	2020-04-15 14:05:40 +02:00
Fire-Head	daed13485e	CWeapon done, ps2 cheats fix	2020-04-15 08:03:53 +03:00
Sergeanur	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
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
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
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
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
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
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
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
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
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
Sergeanur	0ddc04743c	Fix cutscene camera latency	2020-04-11 13:21:21 +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
Nikolay Korolev	be260b49b1	Merge branch 'master' into garages_dev	2020-04-10 21:17:00 +03:00
aap	c5d61392ea	implemented CTrafficLights	2020-04-10 18:36:39 +02: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