3059 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sergeanur	1a42d62d3a	Merge branch 'master' into miami ... # Conflicts: # premake5.lua # src/peds/Ped.cpp # src/peds/PedIK.cpp # src/peds/PedIK.h	2020-05-16 17:09:13 +03:00
Nikolay Korolev	e3291b0cb1	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
Sergeanur	dc5ece8327	Fix audio use of number instead of enum for CAR_ACCEL	2020-05-16 16:55:37 +03:00
aap	c54d3ba2ab	fixes for 64 bit build	2020-05-16 14:34:51 +02:00
eray orçunus	40ee29fb99	Weapon fixes	2020-05-16 15:07:09 +03:00
aap	793a6a6d7e	bla	2020-05-16 13:07:08 +02:00
Nikolay Korolev	7b89baceaa	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 14:01:58 +03:00
Nikolay Korolev	c33b93793f	new horn	2020-05-16 14:01:32 +03:00
aap	9558baa353	fixed CText to be 64 bit compatible	2020-05-16 12:52:37 +02:00
aap	b21f49ad6b	fixed CText to be 64 bit compatible	2020-05-16 12:51:54 +02:00
Nikolay Korolev	81e711517d	Merge pull request #551 from Nick007J/miami ... Ped attractors + weather	2020-05-16 13:40:20 +03:00
Nikolay Korolev	6556cb0db9	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 13:40:00 +03:00
Nikolay Korolev	4defd8b75c	minimal weather stuff + multiple bugfixes	2020-05-16 13:31:23 +03:00
aap	9dc5dca209	remove some unneeded plane paths for the moment; also different exe icon	2020-05-16 11:34:51 +02:00
aap	0c23166318	changed CPedIK names	2020-05-16 10:33:19 +02:00
Nikolay Korolev	9067469f7c	more attractor fixes	2020-05-16 11:30:58 +03:00
Nikolay Korolev	cf5db73117	a few fixes	2020-05-16 11:22:12 +03:00
Nikolay Korolev	03c4a979c8	removed duplicate code	2020-05-16 10:53:20 +03:00
Nikolay Korolev	5abd466b5d	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-16 10:52:58 +03:00
Nikolay Korolev	5491a51daa	remove debug	2020-05-16 10:39:18 +03:00
Sergeanur	76dd769085	Merge branch 'master' into miami	2020-05-16 05:07:39 +03:00
Sergeanur	ec1b91e527	Remove unused audio enum	2020-05-16 05:06:51 +03:00
Nikolay Korolev	a4562c5720	fixed spaces/tabs	2020-05-16 02:15:24 +03:00
Nikolay Korolev	f864698696	ped attractors	2020-05-16 02:10:23 +03:00
Nikolay Korolev	21329b8440	sync with upstream	2020-05-16 01:50:45 +03:00
Nikolay Korolev	08b2138c7e	ped attractors done	2020-05-16 01:49:30 +03:00
erorcun	8ff72f0728	Merge pull request #550 from erorcun/miami ... Weapon layer in Peds	2020-05-15 21:30:57 +03:00
eray orçunus	acd1ea9909	Weapon layer in Peds	2020-05-15 21:21:25 +03:00
aap	1fde2ba468	CPedIK	2020-05-15 19:41:44 +02:00
Nikolay Korolev	09a0207e55	Merge remote-tracking branch 'upstream/miami' into miami	2020-05-14 22:29:23 +03:00
Sergeanur	ede6b7db6a	Fix compilation	2020-05-14 17:15:26 +03:00
Sergeanur	24875f34d0	Merge branch 'master' into miami ... # Conflicts: # src/modelinfo/ClumpModelInfo.cpp	2020-05-14 17:05:42 +03:00
aap	41e9754338	fixed hanging boot	2020-05-14 15:05:23 +02:00
aap	2fb4305a73	fixed hanging boot	2020-05-14 15:03:13 +02:00
aap	704a5c158f	Merge pull request #547 from Nick007J/master ... a few bugfixes	2020-05-14 14:39:23 +02:00
aap	c21061a199	fixed RotateTorso	2020-05-14 14:29:39 +02:00
Nikolay Korolev	b01987719e	fixed script error	2020-05-14 15:26:59 +03:00
Nikolay Korolev	8e0b132f43	it works differently	2020-05-14 14:03:56 +03:00
Nikolay Korolev	9d4d83db0d	some fixes	2020-05-14 14:01:24 +03:00
Nikolay Korolev	d031943f2a	more pedattractor	2020-05-14 13:46:11 +03:00
aap	9b162554ca	fixed skinned cutscene head	2020-05-14 12:32:51 +02:00
aap	f5345f59ea	blacklist for glfw "joysticks"	2020-05-14 00:09:45 +02: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	94bf7d9ea1	Merge remote-tracking branch 'upstream/master'	2020-05-13 17:34:09 +03:00
Nikolay Korolev	1237941180	fixed traffic lights	2020-05-13 17:33:50 +03:00
Sergeanur	3f1001b86b	More save/load alignment fixes	2020-05-13 16:24:00 +03:00
Nikolay Korolev	509d57edcb	car control and cranes fixes	2020-05-13 13:29:17 +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