728 Commits

Author	SHA1	Message	Date
eray orçunus	acd1ea9909	Weapon layer in Peds	2020-05-15 21:21:25 +03:00
Nikolay Korolev	09a0207e55	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-14 22:29:23 +03:00
Sergeanur	24875f34d0	Merge branch 'master' into miami ... # Conflicts: # src/modelinfo/ClumpModelInfo.cpp	2020-05-14 17:05:42 +03:00
shfil	7036e80fc6	Fix calloc in CdStreamPosix	2020-05-13 17:48:07 +02:00
Nikolay Korolev	d426588496	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-13 17:55:12 +03:00
Nikolay Korolev	81ea6f0258	ped attractor: start	2020-05-13 11:38:05 +03:00
Sergeanur	7aeac06fdb	Redoing some pool reading for better alignment	2020-05-13 05:31:14 +03:00
Sergeanur	4ac53960f5	Changing save/load for CPlayerInfo because of alignment crap	2020-05-13 03:43:20 +03:00
Filip Gawin	a0b3117ee4	Revert to memcpy	2020-05-13 02:01:42 +02:00
Sergeanur	7c2b9478d5	Merge branch 'master' into miami ... # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp	2020-05-13 00:55:52 +03:00
Sergeanur	33dfaf7da1	Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp	2020-05-13 00:27:15 +03:00
Filip Gawin	c2ac6b3759	Fix linux warnings	2020-05-12 23:18:54 +02:00
aap	bcd2f8c64c	remove debug shit	2020-05-12 20:44:37 +02:00
aap	98a233da43	little fixes to CClouds; disabled object clipping for SA cam	2020-05-12 16:36:23 +02:00
aap	40829b5242	CClouds; disabled object clipping for SA cam	2020-05-12 16:27:39 +02:00
erorcun	5f40f06bf0	Merge pull request #533 from erorcun/master ... Linux build support	2020-05-12 00:33:13 +03:00
aap	ce2071e1e6	Merge pull request #535 from Nick007J/miami ... garages, carctrl, script	2020-05-11 23:28:52 +02:00
aap	0eb5f93e96	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-05-11 22:21:26 +02:00
aap	6e4710b717	CVisibilityPlugins	2020-05-11 22:21:18 +02:00
Nikolay Korolev	9b23e33c36	sync with upstream	2020-05-11 21:21:09 +03:00
Sergeanur	5f1c3fa208	Merge remote-tracking branch 'origin/miami' into miami	2020-05-11 21:07:36 +03:00
Sergeanur	0aa7f13c32	Merge branch 'master' into miami ... # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h	2020-05-11 21:07:12 +03:00
Nikolay Korolev	5f5babe7fe	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-11 21:05:01 +03:00
Nikolay Korolev	8fae2dcc26	garages + script	2020-05-11 21:04:35 +03:00
eray orçunus	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
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
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
bigbossbro08	af6e132b37	defined out asserts.	2020-05-10 19:54:37 +06:00
aap	f7300c7a27	CPedModelInfo	2020-05-10 13:08:02 +02: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
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