2360 commits

Author	SHA1	Message	Date
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
Sergeanur	7439d6482f	Reverting tabs back to spaces for aap	2020-04-08 10:26:31 +03:00
Sergeanur	7eee938de2	Reverting tabs back to spaces for aap	2020-04-08 10:22:34 +03:00
aap	f89df29001	Merge pull request #385 from aap/master ... implemented CRubbish, CShinyTexts, CBrightLights, CMotionBlurStreaks, CSpecialFX	2020-04-08 09:12:49 +02:00
Sergeanur	560fc65538	Small camera fixes	2020-04-08 09:58:08 +03:00
Nikolay Korolev	e556ffd3f6	fixes	2020-04-08 01:52:08 +03:00
Nikolay Korolev	48e13ce6c9	Merge branch 'master' into garages_dev	2020-04-07 23:44:30 +03:00
Nikolay Korolev	f7ac85e492	weather stuff	2020-04-07 23:43:19 +03:00
aap	daaf443cfa	finished CMotionBlurStreaks, CSpecialFX	2020-04-07 22:26:01 +02:00
eray orçunus	cf8249fa05	Menu map changes ... - new texture by AG - map now centers when zoomed out too much - background darkened a bit - mouse wheel up/down switched - cross add target on gamepad - LeftStickY inverted	2020-04-07 23:20:23 +03:00
erorcun	6a2d675467	Merge pull request #384 from erorcun/erorcun ... Menu map	2020-04-07 20:37:27 +03:00
eray orçunus	1f8e073c0a	Menu map	2020-04-07 20:18:24 +03:00
aap	51512db006	implemented CRubbish	2020-04-07 17:16:58 +02:00
Filip Gawin	95e4466846	Fix CI build	2020-04-07 15:53:51 +02:00
Filip Gawin	bf2316bd54	Cleanup audiocode and fix for ComputeDopplerEffectedFrequency	2020-04-07 15:44:31 +02:00
aap	1207c2ce6f	implemented CShinyTexts	2020-04-07 12:33:14 +02:00
Sergeanur	c9ace44ca8	CFont	2020-04-07 08:20:21 +03:00
aap	2100bdd529	implemented CRubbish	2020-04-07 01:19:24 +02:00
aap	f192d7052e	finished CCollision	2020-04-06 20:32:44 +02:00
aap	de706d1471	fixed typo	2020-04-06 18:49:51 +02:00
aap	f2b3be5da2	Merge pull request #379 from erorcun/erorcun ... Frontend (last-3)	2020-04-06 18:37:17 +02:00
aap	f8465e0f66	Merge pull request #381 from aap/master ... PS2 Frontend Controls	2020-04-06 18:36:19 +02:00
Nikolay Korolev	4f1d6123dd	stats fix	2020-04-06 19:31:08 +03:00
Nikolay Korolev	cf804dee91	Merge remote-tracking branch 'upstream/master'	2020-04-06 19:28:04 +03:00
Nikolay Korolev	b991fd9766	Merge branch 'master' into master	2020-04-06 19:26:04 +03:00
Nikolay Korolev	e6e51492f0	review fixes	2020-04-06 11:19:29 +03:00
Nikolay Korolev	7dc6815903	Merge branch 'master' into garages_dev	2020-04-06 02:01:45 +03:00
Nikolay Korolev	7f8a78e5de	Cranes done	2020-04-06 02:01:03 +03:00
aap	cbbe722b70	PS2 Frontend Controls	2020-04-05 21:21:53 +02:00
Sergeanur	4fc2f9c359	Merge remote-tracking branch 'origin/master' into MoreLanguages	2020-04-05 17:03:59 +03:00
aap	27f95d905c	fixed look behind bug	2020-04-05 15:27:30 +02:00
aap	5e9ae94298	Merge pull request #378 from aap/master ... finished CCamera	2020-04-05 14:30:28 +02:00
Nikolay Korolev	9436b5a8a5	Merge branch 'master' into garages_dev	2020-04-05 12:47:27 +03:00
Nikolay Korolev	5cbcaa57d7	Merge remote-tracking branch 'upstream/master'	2020-04-05 12:45:30 +03:00
Nikolay Korolev	30b8d7300b	shoreside garage fix	2020-04-05 12:44:58 +03:00
Nikolay Korolev	057b28e39b	cranes init	2020-04-05 12:35:51 +03:00
Sergeanur	2aace31b06	Merge remote-tracking branch 'origin/master' into MoreLanguages	2020-04-05 12:03:13 +03:00
Sergeanur	c0c09f2720	Japanese	2020-04-05 12:02:51 +03:00
eray orçunus	bd7a59e58e	Frontend (last-3)	2020-04-04 14:49:19 +03:00
aap	f56909d8b7	Merge pull request #377 from Fire-Head/master ... Glass	2020-04-03 11:49:08 +02:00
aap	db804f99d9	Merge pull request #376 from Nick007J/master ... final vehicles functions, some other fixes	2020-04-03 11:48:49 +02:00
aap	7ff5a3a65c	CCamera fixes	2020-04-03 09:26:10 +02:00
Sergeanur	92ec403191	Fix CFont type uint16 -> wchar	2020-04-02 09:51:35 +03:00
Sergeanur	6e6912b613	fixes	2020-04-02 09:20:45 +03:00
Fire_Head	c394bd2a6e	Glass cosmetic fixes	2020-04-02 05:37:22 +03:00
Fire-Head	13fb853fd8	Glass done	2020-04-02 00:04:56 +03:00
Nikolay Korolev	bd0cd13be1	Merge remote-tracking branch 'upstream/master'	2020-04-01 23:47:57 +03:00
Sergeanur	62ae7245ab	AudioScriptObject finished	2020-04-01 06:09:25 +03:00
Nikolay Korolev	347f0a0e9c	vehicles missing functions + fixes	2020-04-01 01:58:40 +03:00
Nikolay Korolev	e34631adce	review fixes	2020-04-01 00:07:09 +03:00
Nikolay Korolev	e2ed468018	Merge remote-tracking branch 'upstream/master'	2020-03-31 23:54:39 +03:00
Sergeanur	409663adb8	timebars	2020-03-31 16:11:45 +03:00
aap	a57d9b6797	Merge pull request #373 from erorcun/erorcun ... Mouse free cam for peds&cars (under FREE_CAM)	2020-03-31 10:29:35 +02:00
eray orçunus	5e2fe749bd	Mouse free cam for peds&cars (under FREE_CAM)	2020-03-31 06:05:49 +03:00
Nikolay Korolev	357d88a4a8	fix	2020-03-31 01:00:06 +03:00
Nikolay Korolev	b3bfde0db0	added forgotten function	2020-03-31 00:53:51 +03:00
Nikolay Korolev	24e4ecf5bb	bug fixes, reorganisation	2020-03-31 00:46:44 +03:00
Nikolay Korolev	1b0368ee7d	Merge branch 'master' into garages_dev	2020-03-31 00:01:52 +03:00
Nikolay Korolev	50b43b680e	finished garages	2020-03-31 00:01:03 +03:00
Sergeanur	2607a91d87	Merge remote-tracking branch 'origin/master' into MoreLanguages	2020-03-30 20:10:12 +03:00
Sergeanur	bb8868eba7	Add russian lang support	2020-03-30 14:50:14 +03:00
aap	8e3ee096e2	Merge pull request #366 from Nick007J/master ... Garage part 1	2020-03-29 19:12:53 +02:00
erorcun	6704a62b32	Merge pull request #369 from erorcun/erorcun ... CShotInfo, CWanted done, Frontend fix	2020-03-29 19:03:59 +03:00
eray orçunus	a3b519ea64	CShotInfo, CWanted done, Frontend fix	2020-03-29 19:02:26 +03:00
Nikolay Korolev	23c6a28324	Merge branch 'master' into garages_dev	2020-03-29 18:54:26 +03:00
Nikolay Korolev	3a4e2275de	fixed PS2 build	2020-03-29 18:53:58 +03:00
Nikolay Korolev	24b8c7819c	merge with upstream	2020-03-29 18:51:18 +03:00
Nikolay Korolev	0db35f8275	more garages	2020-03-29 18:48:57 +03:00
Fire_Head	a0b077574e	Merge branch 'master' into master	2020-03-29 18:39:47 +03:00
aap	82dcc34296	Merge pull request #367 from Sergeanur/wrappers_cleanup ... Wrappers cleanup	2020-03-29 16:27:42 +02:00
Fire-Head	7b95dcc219	style & cosmetic fixes	2020-03-29 16:35:50 +03:00
Fire-Head	d53c151ffc	style & cosmetic fixes	2020-03-29 16:32:11 +03:00
aap	ac097e6fc7	rotating FollowPed cam (disabled by default for now)	2020-03-29 14:07:38 +02:00
Sergeanur	97ffa1a658	Wrappers cleanup	2020-03-29 08:58:08 +03:00
Sergeanur	db92864fe2	Fire and PlayerSkin fix	2020-03-29 08:51:30 +03:00
Nikolay Korolev	02615ccd98	fix	2020-03-29 02:09:02 +03:00
Nikolay Korolev	38c2f8fbb0	fixes	2020-03-29 01:48:49 +03:00
Fire-Head	194ddc5f40	CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names	2020-03-28 23:55:23 +03:00
Nikolay Korolev	92edf92570	Merge branch 'master' into garages_dev	2020-03-28 23:42:11 +03:00
Nikolay Korolev	93417853ed	fixes	2020-03-28 23:41:37 +03:00
erorcun	7242d8a440	Merge pull request #364 from erorcun/erorcun ... Limit frontend FPS to 100	2020-03-28 23:29:28 +03:00
eray orçunus	39c9a05827	Limit frontend FPS to 100	2020-03-28 23:28:36 +03:00
Filip Gawin	d13afe5cc1	audio16 fixes for review	2020-03-28 20:18:54 +01:00
Filip Gawin	58ec4b2157	ProcessVehicleEngine and ProcessActiveQueues ... Also some smaller fixes, thx erorcun for help.	2020-03-28 20:18:54 +01:00
aap	8623bc9752	Merge pull request #360 from ShFil119/impr/assembly ... Cleanup patching system	2020-03-28 20:01:18 +01:00
Filip Gawin	b235c35834	Cleanup patching system	2020-03-28 19:46:09 +01:00
Nikolay Korolev	101c21e064	merge with master	2020-03-28 20:55:15 +03:00
Nikolay Korolev	775bc3e666	garage update part 2	2020-03-28 20:52:25 +03:00
erorcun	c056871e07	Merge pull request #363 from erorcun/erorcun ... CCopPed done and #include cleanup	2020-03-28 19:12:22 +03:00
eray orçunus	112685ebac	CCopPed done and #include cleanup	2020-03-28 18:52:25 +03:00
aap	a58bceb1a7	Merge pull request #362 from Fire-Head/master ... WaterCannon done, resource ico	2020-03-28 16:47:20 +01:00
aap	2833a08b96	CCam fix	2020-03-28 16:29:34 +01:00
Fire-Head	a81233429d	WaterCannon uv macros	2020-03-28 18:24:21 +03:00
Fire-Head	3366cd0ff8	WaterCannon done, resource ico	2020-03-28 17:02:44 +03:00
Nikolay Korolev	9fb101fdd9	Merge branch 'master' into garages_dev	2020-03-28 15:24:55 +03:00
Nikolay Korolev	268f92bfbe	garages part 1	2020-03-28 15:24:13 +03:00
aap	739e80614d	remove include <new> from common.h	2020-03-28 09:37:04 +01:00
aap	6a14457614	Merge branch 'master' of github.com:gtamodding/re3	2020-03-28 09:34:25 +01:00
aap	f5195ca185	CCam fix	2020-03-28 09:34:04 +01:00
Sergeanur	cd913404a3	Fix Text n Pager	2020-03-28 04:58:58 +02:00
Sergeanur	c953230237	Set Xinput version to 9.1.0 + vibration set	2020-03-28 04:53:42 +02:00
Filip Gawin	184a80cc3b	Remove assembly from patcher.h	2020-03-27 21:25:39 +01:00
aap	e7c18fc17f	removed windows.h for most .cpps	2020-03-27 20:53:47 +01:00
Sergeanur	43b092033c	XInput	2020-03-27 21:20:57 +02:00
aap	29f69f6216	Merge pull request #357 from aap/master ... Finished CCam; various smaller things	2020-03-27 18:41:22 +01:00
aap	22e022cc9f	implemented some unused PS2 cams	2020-03-27 18:21:46 +01:00
aap	f0dfaac838	Finished CCam; various smaller things	2020-03-27 10:04:45 +01:00
erorcun	9e49e5c2bd	Merge pull request #356 from blingu/master ... CFire and CFireManager classes nearly done	2020-03-26 19:30:34 +03:00
blingu	79822e3f7c	Update Fire.cpp	2020-03-26 17:11:04 +01:00
blingu	853b2d0c78	Update Fire.cpp	2020-03-26 17:05:01 +01:00
blingu	edc92a7bcc	Update Fire.cpp	2020-03-26 17:00:58 +01:00
eray orçunus	0fe55eb543	CCopPed 2 and fixes	2020-03-26 18:54:03 +03:00
blingu	0e91015940	Update Vehicle.cpp	2020-03-26 14:19:55 +01:00
blingu	a66db9efcb	Update Fire.cpp	2020-03-25 23:01:22 +01:00
blingu	be2aca47cf	added InflictDamage() declaration	2020-03-25 22:58:20 +01:00
blingu	93a4bc31fa	added wrapper for InflictDamage()	2020-03-25 22:57:34 +01:00
blingu	09af0bcaf8	Update Fire.cpp	2020-03-25 22:54:14 +01:00
blingu	c3841fe5b4	m_snTimeInMilliseconds to GetTimeInMilliseconds()	2020-03-25 21:24:32 +01:00
blingu	96802f9b95	Update Fire.cpp	2020-03-25 21:13:06 +01:00
blingu	08e1c869a4	renamed field_24 to m_nNextTimeToAddFlames	2020-03-25 21:09:27 +01:00
blingu	e22ce9404c	Update Fire.cpp	2020-03-25 21:07:07 +01:00
blingu	0605e704ca	Update Fire.h	2020-03-25 21:01:38 +01:00
blingu	834f4f6d4c	Update Fire.h	2020-03-25 21:01:10 +01:00
blingu	ea9e45fcda	Update Fire.cpp	2020-03-25 21:00:38 +01:00
aap	8703758a7b	Merge pull request #353 from Sergeanur/Debug ... obrstr + Debug	2020-03-25 09:08:33 +01:00
PerikiyoXD	1622973ffa	Implement Init for Stats	2020-03-24 19:50:08 +01:00
blingu	c03bae46ea	Update Fire.cpp	2020-03-24 18:12:53 +01:00
blingu	1680d11dae	Update Fire.h	2020-03-24 17:25:14 +01:00
blingu	43fb59e356	Update Fire.h	2020-03-24 17:24:47 +01:00
aap	4e7c186285	change default script to story	2020-03-24 11:58:09 +01:00
aap	c7bdecdd90	fix and cleanup in AddToPopulation	2020-03-24 09:02:41 +01:00
Sergeanur	a12c01e10a	obrstr + Debug	2020-03-24 09:56:37 +02:00
aap	55b62e2134	added an assert to CPed::BuildPedLists, but too many peds still crash the game	2020-03-24 08:49:55 +01:00
aap	4070cad4a7	Merge pull request #352 from Nick007J/master ... CGame::Initialise	2020-03-23 00:34:41 +01:00
Filip Gawin	da2d25c020	Fix order of math operations on integers (fires)	2020-03-22 19:32:01 +01:00
Nikolay Korolev	861506d048	merge with upstream	2020-03-22 19:47:14 +03:00
Filip Gawin	0e817230af	Remove all constexpr	2020-03-22 17:30:54 +01:00
Filip Gawin	b57e4febb0	fix include	2020-03-22 17:30:54 +01:00
Filip Gawin	39462a3865	Fixes for review	2020-03-22 17:30:54 +01:00
Filip Gawin	a097f225bc	Fixes for review	2020-03-22 17:30:54 +01:00
Filip Gawin	337924c794	Cleanup audio code + fixes for review	2020-03-22 17:30:54 +01:00
Filip Gawin	c88c2115e2	Remove unneeded double to float casts	2020-03-22 17:30:54 +01:00
Filip Gawin	8f01eab5ab	Fixes for Serge's review	2020-03-22 17:30:54 +01:00
Filip Gawin	7c425ac4ac	Implement ProcessGarages + small cleanup	2020-03-22 17:30:54 +01:00
Filip Gawin	3b8a177470	Implement SetupJumboEngineSound	2020-03-22 17:30:54 +01:00
Filip Gawin	67398809a3	Implement ProcessFires	2020-03-22 17:30:54 +01:00
Filip Gawin	0d1f42add1	Implement ProcessCrane	2020-03-22 17:30:54 +01:00
Filip Gawin	31382bc22c	Implement ProcessCesna	2020-03-22 17:30:54 +01:00
Nikolay Korolev	d1d123dc6a	missing endlines	2020-03-22 19:19:07 +03:00
Nikolay Korolev	c29a85a443	console init	2020-03-22 18:48:16 +03:00
Nikolay Korolev	360d9cf889	merge with master	2020-03-22 17:26:18 +03:00
Nikolay Korolev	34b1881528	CGame::Initialise	2020-03-22 17:23:40 +03:00
Sergeanur	5e37c3e805	Console	2020-03-22 16:19:10 +02:00
aap	f9342c7e83	Merge pull request #350 from Nick007J/master ... bullet traces	2020-03-22 14:41:03 +01:00
aap	398cc6bbec	fixed vehicle rendering bug	2020-03-22 11:40:18 +01:00
Nikolay Korolev	7d213a1f32	bullet traces fixes	2020-03-22 13:20:36 +03:00
Nikolay Korolev	65e8558794	Merge remote-tracking branch 'upstream/master'	2020-03-22 13:09:18 +03:00
erorcun	b17935b89e	Merge branch 'master' into erorcun	2020-03-22 04:49:24 +03:00
Nikolay Korolev	c2f5dfdb1e	bullet traces	2020-03-21 20:14:29 +03:00
Nikolay Korolev	ac610b7e6e	fixed erroneous assumption	2020-03-21 15:13:38 +03:00
eray orçunus	d5a6e17079	ProcessButtonPresses and fixes	2020-03-21 14:58:54 +03:00
Nikolay Korolev	795e07c882	purple nines glitch fix	2020-03-21 14:29:03 +03:00
erorcun	53e65a32cd	Merge branch 'master' into Radar2	2020-03-17 20:46:37 +03:00
erorcun	7aa5d16b53	Merge pull request #347 from Nick007J/master ... replay fixes + script crash fix	2020-03-17 20:41:59 +03:00
erorcun	1ab6702ea6	Merge pull request #345 from whampson/save-stuff ... GenericSave() done	2020-03-17 20:35:18 +03:00
Sergeanur	e57ad65d05	Finished CRadar, a bit of CExplosion	2020-03-17 00:22:43 +02:00
Nikolay Korolev	1971b3db62	Merge remote-tracking branch 'upstream/master'	2020-03-15 18:47:36 +03:00
Nikolay Korolev	152d8c2f40	replay bug fixes, script bug fix	2020-03-15 18:47:21 +03:00
Wes Hampson	f35758a8f1	Use WriteDataToBufferPointer	2020-03-13 21:23:03 -07:00
Wes Hampson	afeac54860	Spacing fix	2020-03-13 13:50:23 -07:00
Wes Hampson	3862cda231	Style fix, use CTimeStep	2020-03-13 13:47:53 -07:00
Wes Hampson	8280dda9cb	Add CTimeStep	2020-03-13 13:46:59 -07:00
Wes Hampson	0283dbcd12	Fix merge conflict	2020-03-11 15:49:19 -07:00
erorcun	4cc0fc1696	Merge branch 'master' into erorcun	2020-03-12 00:57:35 +03:00
eray orçunus	934e9db4fc	CPopulation done, CCopPed and fixes	2020-03-12 00:48:33 +03:00
Wes Hampson	018fb3a929	Style fixes	2020-03-11 14:15:27 -07:00
Wes Hampson	81c4f75c63	Bugfixes, GenericSave() works now!	2020-03-11 14:08:10 -07:00
Wes Hampson	c7f16879df	GenericSave complete, still needs some testing	2020-03-11 00:12:40 -07:00
Wes Hampson	5bc51f8462	Save SimpleVars, Scripts, and a few others	2020-03-10 20:27:41 -07:00
Wes Hampson	28342405d3	Add Load/Save functions	2020-03-10 20:26:07 -07:00
Wes Hampson	4fee2cbdd9	Begin work on GenericSave	2020-03-05 01:44:42 -08:00
Nikolay Korolev	1d8b3a216c	more utils	2020-03-05 01:10:09 +03:00
Nikolay Korolev	24ad650eb3	Merge branch 'master' into script_dev	2020-03-04 23:14:54 +03:00
Nikolay Korolev	8c13eab30a	fixed dummyobject bug	2020-03-04 23:13:45 +03:00
Nikolay Korolev	2058ca6bbb	more utils	2020-03-04 23:12:16 +03:00
Nikolay Korolev	0a3211d0cf	Merge branch 'master' into script_dev	2020-03-02 22:54:47 +03:00
Nikolay Korolev	d492390fec	script utils	2020-03-02 22:54:13 +03:00
eray orçunus	a718e699ad	Fixes and cleanup	2020-03-02 03:06:52 +03:00
Nikolay Korolev	90ff2f73eb	Merge branch 'master' into script_dev	2020-03-01 17:44:37 +03:00
Nikolay Korolev	5eccf44e7a	review fixes	2020-03-01 17:42:47 +03:00
Nikolay Korolev	ceab73a053	merge with upstream	2020-03-01 14:19:42 +03:00
Nikolay Korolev	64b28c0730	save/load	2020-03-01 14:18:10 +03:00
eray orçunus	ae523a09a7	fixes	2020-03-01 04:44:58 +03:00
eray orçunus	750d3229a3	CPopulation 3 and fixes	2020-02-27 19:38:35 +03:00
Nikolay Korolev	4d9853b0ce	removed debug leftovers	2020-02-24 21:18:11 +03:00
Nikolay Korolev	56c83dfaae	more stuff + intro fix	2020-02-24 21:17:15 +03:00
Nikolay Korolev	6260d51d44	Merge branch 'master' into script_dev	2020-02-24 12:10:59 +03:00
Nikolay Korolev	7d78879c48	more stuff	2020-02-24 12:10:21 +03:00
eray orçunus	cbf396e6e9	script fixes	2020-02-23 18:34:53 +03:00
Nikolay Korolev	0255f5d15f	more cosmetic stuff	2020-02-23 14:06:12 +03:00
Nikolay Korolev	1721a74466	stuff	2020-02-23 13:30:37 +03:00
Nikolay Korolev	1ba696f5fc	some changes	2020-02-23 13:12:44 +03:00
aap	f8cd12ffb3	Merge pull request #333 from Nick007J/master ... script 1000-1154	2020-02-23 11:00:15 +01:00
Nikolay Korolev	aa5266b1b3	some cosmetic stuff	2020-02-23 02:29:38 +03:00
eray orçunus	b2d062ef2d	some fixes	2020-02-23 01:48:21 +03:00
Filip Gawin	c92dfb0064	Fix police radio condition ... thx @Nick007J	2020-02-22 19:47:42 +01:00
Nikolay Korolev	bc139e0702	ARRAY_SIZE	2020-02-22 17:53:28 +03:00
Nikolay Korolev	1366c58d59	removed extra include	2020-02-22 17:19:56 +03:00
Nikolay Korolev	a122d558a2	merge + bug fix	2020-02-22 15:53:41 +03:00
Nikolay Korolev	a312e1ff81	merge	2020-02-22 15:36:22 +03:00
Nikolay Korolev	3481e431c9	fixes	2020-02-22 15:35:46 +03:00
eray orçunus	090aef7de7	CPopulation 2	2020-02-19 21:14:17 +03:00
erorcun	16ea0527dd	Merge pull request #328 from erorcun/erorcun ... CPopulation 1	2020-02-17 23:02:58 +03:00
eray orçunus	ff92b822b6	CPopulation 1	2020-02-17 15:57:50 +03:00
Nikolay Korolev	1337a9b603	script 1000-1154	2020-02-16 23:08:54 +03:00
Nikolay Korolev	a36da99798	review fixes	2020-02-16 12:44:33 +03:00
Nikolay Korolev	85d815cf9d	bug fixes	2020-02-15 23:30:51 +03:00
Nikolay Korolev	a361fc0ff5	sync with upstream	2020-02-15 14:54:46 +03:00
Nikolay Korolev	043efaf082	script 900-999	2020-02-15 14:53:42 +03:00
eray orçunus	89be27734b	a fix	2020-02-13 23:34:36 +03:00
eray orçunus	f307839a2b	CPlayerPed done	2020-02-13 22:02:45 +03:00
Sergeanur	d1700b3257	Fixed random sound volume	2020-02-07 21:40:10 +02:00
Sergeanur	a3e5ccde47	cMusicManager	2020-02-07 02:30:00 +02:00
Sergeanur	f1863676bb	CullZone fix	2020-02-04 22:21:45 +02:00
eray orçunus	9896217608	few little things	2020-02-04 00:27:48 +03:00
eray orçunus	ce0687db27	A bug fix and VC ports for veh. enter/exit	2020-02-03 21:03:48 +03:00
Sergeanur	0e2f7ff689	Merge pull request #321 from Sergeanur/audio_enums ... Audio, use of enums and true/false	2020-02-02 16:56:22 +02:00
eray orçunus	03b995c6ef	Some fixes and some cosmetic things	2020-02-02 16:58:52 +03:00
Sergeanur	72a4abd347	Audio, use of enums and true/false	2020-02-02 15:57:27 +02:00
Nikolay Korolev	911f3360de	Merge remote-tracking branch 'upstream/master'	2020-02-02 15:22:35 +03:00
Nikolay Korolev	c794b59a7c	fixed firetruck crash	2020-02-02 15:22:17 +03:00
Nikolay Korolev	2baacf0e9e	Merge remote-tracking branch 'upstream/master'	2020-02-02 14:47:16 +03:00
Nikolay Korolev	dc2516896f	script 900-999 init	2020-02-02 14:47:03 +03:00
Nikolay Korolev	b0e4f40f44	fixed SET_BOAT_CRUISE_SPEED	2020-02-02 14:09:39 +03:00
Nikolay Korolev	bedf19c523	fixed police ignore bug	2020-02-02 13:29:13 +03:00
Nikolay Korolev	76b8e09de5	fix ai bug (2)	2020-02-02 12:28:23 +03:00
Nikolay Korolev	c1dc66c63e	fixed ai bug	2020-02-02 03:21:21 +03:00
Nikolay Korolev	e4f1ab20f1	fixed bullion run	2020-02-02 01:43:04 +02:00
Sergeanur	c8f7732832	Replay crash fix	2020-02-01 23:01:25 +02:00
Sergeanur	2ff00bd0ee	Fix HAS_OBJECT_BEEN_DAMAGED	2020-02-01 21:47:04 +02:00
Sergeanur	ff831a8956	Removed dup hook	2020-02-01 20:02:04 +02:00
Sergeanur	3d69148497	Added enum to OnscreenTimer, fixed mistakes in CCarCtrl::SteerAIBoatWithPhysicsHeadingForTarget	2020-02-01 18:40:54 +02:00
Sergeanur	e2f8ad983d	Fix damage bar assert crash	2020-02-01 17:22:56 +02:00
Sergeanur	6e73d9220a	Fix CTheScripts::AddToInvisibilitySwapArray	2020-02-01 15:10:46 +02:00
Sergeanur	03c2489937	Fix Projectile Air Resistance	2020-02-01 00:41:03 +02:00
Sergeanur	4f33668c88	Fix SET_BOAT_CRUISE_SPEED	2020-01-31 22:28:22 +02:00
Sergeanur	0c581ce86a	Fix boat component	2020-01-31 21:02:08 +02:00
Sergeanur	79d2ab7619	More fixes	2020-01-31 19:16:13 +02:00
Sergeanur	74e215458b	Fixing IS_AREA_OCCUPIED command	2020-01-31 17:31:24 +02:00
Sergeanur	afd6b43ffb	Fixed wrong slot indexing in Frontend	2020-01-31 17:16:32 +02:00
Sergeanur	7df91ca2f9	Fix corrupt saves	2020-01-31 14:33:46 +02:00
aap	5794732ad4	Merge pull request #299 from Sergeanur/PedIK ... CPedIK finished, bit of CCamera	2020-01-31 12:57:43 +01:00
aap	8b367e8d18	Merge pull request #298 from Sergeanur/save ... save	2020-01-31 12:57:25 +01:00
Sergeanur	43bd2227a8	CRemote	2020-01-31 12:23:15 +02:00
Sergeanur	8373db1e7a	RC toyz crashfix	2020-01-31 12:12:49 +02:00
Sergeanur	3c550eb679	sizeofs n stuff	2020-01-31 10:12:36 +02:00
Sergeanur	2c8cce4655	suggested fixes	2020-01-30 18:15:27 +02:00
Sergeanur	81de0e0cbd	acos	2020-01-29 13:00:40 +02:00
Sergeanur	633108b2d7	camera	2020-01-29 01:54:07 +02:00
Sergeanur	8a6cec8bed	CPedIK finished	2020-01-29 01:53:58 +02:00
Sergeanur	1561ab6440	Fixed autoaiming camera	2020-01-29 01:11:44 +02:00
Sergeanur	c6b6e9d0df	CDate separated	2020-01-28 00:16:38 +02:00
Sergeanur	f2a26070a7	fix var names	2020-01-27 18:31:20 +02:00
Sergeanur	fa4dbcab35	save	2020-01-27 18:22:51 +02:00
Sergeanur	0525e3930b	Fix invert mouse on/off	2020-01-26 21:54:20 +02:00
Sergeanur	da253837d1	audio stuff ... Collision audio and police radio stuff moved to a separate cpp's like in the original code cPoliceRadioQueue added, code refactored correspondingly cAudioManager::ServiceCollisions reversed PlayOneShotScriptObject reversed cAudioScriptObject moved to AudioScriptObject.cpp Fixed use of numbers on non-integer types (bools, pointers) enum is now used for ped audio calculation Added fixes for vehicle description in the police radio (missing vehicles and wrong colors)	2020-01-25 12:48:27 +02:00
Sergeanur	6ff06ff7c6	Partial CBoat	2020-01-24 10:41:40 +02:00
erorcun	d75b9b8257	CPlayerPed continues (#294)	2020-01-23 23:21:50 +03:00
Sergeanur	b06ad84768	Fixing possible leaks in CModelInfo::ShutDown	2020-01-23 20:08:42 +02:00
Sergeanur	18f80a02fc	Fixing some plane funcs declarations	2020-01-23 17:43:19 +02:00
Sergeanur	9eb599ff58	Plane crashfix and more	2020-01-23 17:29:36 +02:00
Sergeanur	77515f04e0	ConstructMloClumps	2020-01-21 09:47:24 +02:00
Sergeanur	06904755d9	Refactor CCullZone::CalcDistToCullZoneSquared	2020-01-20 23:27:57 +02:00
Sergeanur	7857590990	Atan2 and Sqrt	2020-01-20 23:21:51 +02:00
Sergeanur	669374ec1a	disable cullzone writer	2020-01-20 23:11:12 +02:00
Sergeanur	82becdc955	CullZone.dat writer start	2020-01-20 23:08:34 +02:00
Sergeanur	a9f39d8284	MLO, XtraCompsModelInfo, MovingThing, Solid	2020-01-20 22:58:13 +02:00
Sergeanur	d52452e69f	PowerPoints	2020-01-20 18:59:28 +02:00
Sergeanur	045c638067	Two audio structs renamed to their original names	2020-01-13 20:01:23 +02:00
Sergeanur	d482f097fe	Fix molotov	2020-01-13 16:56:47 +02:00
Sergeanur	8b57634c78	Fix projectile crash	2020-01-13 16:36:42 +02:00
aap	9d3c73156b	Merge pull request #290 from Sergeanur/ProjectileInfo ... ProjectileInfo	2020-01-12 23:19:55 +01:00
Sergeanur	d409f64980	Fixes	2020-01-12 13:31:04 +02:00
erorcun	2d00d7b3e2	Merge pull request #291 from Sergeanur/AccidentManager ... AccidentManager	2020-01-12 02:11:47 +03:00
eray orçunus	5d119cf985	Fixes 2	2020-01-11 20:36:46 +03:00
Sergeanur	bbc68ffb1c	AccidentManager	2020-01-11 15:14:02 +02:00
Sergeanur	8fab684283	move	2020-01-11 14:49:37 +02:00
Sergeanur	895062a09d	ProjectileInfo	2020-01-11 13:31:48 +02:00
erorcun	6af77d8514	Merge pull request #289 from erorcun/erorcun ... Fixes	2020-01-11 02:02:09 +03:00
eray orçunus	8a745e4d89	Fixes	2020-01-11 01:48:05 +03:00
Sergeanur	d89d5f0d9a	CUserDisplay, CPlaceName, CCurrentVehicle	2020-01-07 19:10:17 +02:00
Sergeanur	208754ac68	Finishing CDarkel	2020-01-07 17:30:29 +02:00
Sergeanur	f7e962beaa	Fixing Projectile code	2020-01-07 17:26:40 +02:00
erorcun	f9316d9cc3	CPlayerPed & CMenuManager (#286) ... Make Frontend great again!	2020-01-07 17:23:09 +03:00
erorcun	18de44e038	Merge pull request #285 from Nick007J/script_dev ... 600-799 script commands; bug fixes	2020-01-07 17:08:51 +03:00
Sergeanur	71889de1be	Use CGeneral::faststricmp in CPed::ServiceTalking	2020-01-07 15:43:56 +02:00
Nikolay Korolev	c5e7de02fe	fixes	2020-01-04 01:10:35 +03:00
Nikolay Korolev	0723dade76	script 800-899	2020-01-03 19:48:13 +03:00
Nikolay Korolev	42ff0f7c58	bug fixes	2020-01-01 23:55:01 +03:00
Nikolay Korolev	c05c516ce7	Merge remote-tracking branch 'upstream/master' into script_dev	2020-01-01 16:01:06 +03:00
Nikolay Korolev	a19a6a7c0f	fixed vehicle enter crash	2020-01-01 15:59:08 +03:00
Nikolay Korolev	b307893c9d	bug fix	2020-01-01 15:16:38 +03:00
Nikolay Korolev	402ecd6305	fix merge with upstream	2020-01-01 02:55:00 +03:00
Nikolay Korolev	90233baffe	fix merge	2020-01-01 02:44:13 +03:00
Nikolay Korolev	5b0cf80a76	merge with upstream	2020-01-01 02:42:00 +03:00
Nikolay Korolev	80453d3f4d	some not fully tested stuff	2020-01-01 02:35:54 +03:00
aap	b83adc2cc9	making particleobject compile on vs2015	2019-12-28 21:16:00 +01:00
eray orçunus	bb5e31470d	CPlayerPed & fixes	2019-12-28 23:05:49 +03:00
eray orçunus	04499bfbb6	CEmergencyPed done	2019-12-22 18:28:16 +03:00