3692 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nikolay Korolev	8d1996833b	merge attempt	2020-12-19 03:21:04 +03:00
aap	c17ccc50ab	get rid of all PED_SKIN defines	2020-12-18 17:27:18 +01:00
aap	75a9976cbc	memorymgr fix	2020-12-18 14:33:54 +01:00
aap	f3a356375e	added MemoryHeap from III, MemoryMgr	2020-12-18 14:19:03 +01:00
aap	a080fbfbd4	little cleanup of templates	2020-12-18 13:58:59 +01:00
aap	55cf1a37cb	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-12-18 13:50:37 +01:00
aap	a7050458ae	little cleanup and synch on templates and config	2020-12-18 13:50:26 +01:00
aap	db752d141b	Merge pull request #889 from aap/miami ... CMBlur FX	2020-12-18 13:31:24 +01:00
Sergeanur	cfda5eb148	PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes	2020-12-18 02:58:09 +02:00
Sergeanur	e9a5670348	PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes	2020-12-18 02:57:54 +02:00
aap	cc5af26417	PreAllocateRwObjects	2020-12-17 12:47:00 +01:00
erorcun	dd579c4080	Fix	2020-12-17 02:47:48 +03:00
Sergeanur	2903ebe296	Fix placement of some script functions ... # Conflicts: # src/control/Script5.cpp	2020-12-16 23:29:17 +02:00
Sergeanur	9a9b1e7574	Fix placement of some script functions	2020-12-16 23:28:06 +02:00
aap	1af5065df7	Merge branch 'miami' of github.com:GTAmodding/re3 into miami	2020-12-16 21:54:01 +01:00
aap	e9df32a983	finished CMBlur	2020-12-16 21:53:47 +01:00
erorcun	8e45439205	Use scrolling if GRAPHICS_MENU_OPTIONS not defined, like miami	2020-12-16 23:45:18 +03:00
erorcun	12d16ddc06	Fixes and style changes	2020-12-16 23:28:25 +03:00
aap	387a6a0877	update librw	2020-12-16 15:49:51 +01:00
aap	9200810f60	update librw with stencil states	2020-12-16 15:49:22 +01:00
aap	7d89e955fe	;end of fucking waterlevel	2020-12-16 13:38:09 +01:00
aap	c42463bf4e	more tidy water sync	2020-12-16 13:32:13 +01:00
aap	78c7459b3a	more tiny water sync	2020-12-16 13:32:03 +01:00
aap	0d97a31ce9	tiny water sync	2020-12-16 13:25:45 +01:00
aap	c4c92c357f	tidy water sync	2020-12-16 13:25:23 +01:00
aap	c56bfe064a	Merge pull request #888 from withmorten/waterlevel-miami ... sync WaterLevelInit with master, and other small fixes	2020-12-16 12:38:08 +01:00
erorcun	23b5e664dc	Sync Frontend with miami 3/3	2020-12-16 00:38:26 +03:00
withmorten	ce9eafcd51	sync WaterLevelInit with master, and other small fixes	2020-12-15 21:55:04 +01:00
aap	703750a1ff	Merge pull request #887 from waliedyassen/master-automobile-fixes ... Few bug fixes in CAutomobile for re3	2020-12-15 17:09:45 +01:00
Walied K. Yassen	55414f7ef2	Few bug fixes in CAutomobile	2020-12-15 18:05:37 +02:00
erorcun	64b509af52	Make free cam collision code readable by aap, fixes	2020-12-15 17:49:43 +03:00
erorcun	59caa98c43	Make free cam collision code readable by aap, fixes	2020-12-15 17:33:51 +03:00
aap	81aaddb0e7	Merge pull request #885 from waliedyassen/miami-automobile-fixes ... Few bug fixes in CAutomobile	2020-12-15 14:50:20 +01:00
aap	6d3adf57e8	fixed water.dat code	2020-12-15 14:36:30 +01:00
aap	e594f1d81d	Merge pull request #883 from withmorten/waterlevel ... add dev build code for generating waterpro.dat	2020-12-15 11:43:29 +01:00
Walied K. Yassen	37d3188ce7	Few bug fixes in CAutomobile	2020-12-15 12:20:55 +02:00
Sergeanur	8f2abc6750	fix	2020-12-15 05:11:45 +02:00
Sergeanur	f76dfaee82	Use SetPedState	2020-12-15 05:11:02 +02:00
Sergeanur	e970e5f246	Use SetMoveState	2020-12-15 04:25:12 +02:00
Sergeanur	ac95138c18	More fixes	2020-12-15 04:16:29 +02:00
Sergeanur	ab3e258f19	SetPedState fixes	2020-12-15 03:25:05 +02:00
withmorten	7be7845db0	add dev build code for generating waterpro.dat	2020-12-15 00:05:02 +01:00
shfil	3c8c20ea0b	Merge pull request #882 from GTAmodding/ShFil119-patch-1 ... Implement COMMAND_IS_CAR_PASSENGER_SEAT_FREE	2020-12-14 15:34:05 +01:00
shfil	3b8ac474a2	Implement COMMAND_IS_CAR_PASSENGER_SEAT_FREE ... Fixes 881	2020-12-14 15:33:16 +01:00
Sergeanur	d6b5672e38	Merge pull request #876 from IlDucci/master ... Final update on the Spanish translation	2020-12-14 12:56:51 +02:00
Seemann	0563478de0	Fix some formatting issues	2020-12-14 11:18:46 +02:00
Sergeanur	f42a01f653	CPed::SetWeaponLockOnTarget	2020-12-14 09:47:07 +02:00
erorcun	c0652b8203	Merge branch 'master' of https://github.com/GTAmodding/re3	2020-12-14 02:52:14 +03:00
erorcun	0448ae662f	Fix language initialization call order	2020-12-14 02:50:34 +03:00
erorcun	0f5893ed60	Fix language initialization call order	2020-12-14 02:46:55 +03:00