1663 Commits

Author	SHA1	Message	Date
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