Commit Graph

2092 Commits

Author SHA1 Message Date
aap
68f1c03a85 fixes for braking and cloud rotation at high fps 2020-05-18 16:43:40 +02:00
aap
9b09aa3384 fixes for braking and cloud rotation at high fps 2020-05-18 16:40:30 +02:00
aap
2d4861454c
Merge pull request #557 from Nick007J/miami
script and script stubs
2020-05-18 13:08:24 +02:00
aap
8f9ce275c8
Merge pull request #558 from Sergeanur/VC/text
CText
2020-05-18 13:07:59 +02:00
Sergeanur
af22bb1495 CText 2020-05-18 01:28:40 +03:00
Nikolay Korolev
5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00
eray orçunus
f71cfdf8ef Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-18 00:27:36 +03:00
eray orçunus
96151ec0f0 TransformToNode crash fix? 2020-05-18 00:27:04 +03:00
Nikolay Korolev
ad8a8913d9 a few more stubs 2020-05-18 00:20:26 +03:00
Nikolay Korolev
fd2948f045 sync with upstream 2020-05-17 23:32:32 +03:00
Nikolay Korolev
39931a5284 some more script stubs 2020-05-17 23:31:16 +03:00
aap
d4a429d986 little cleanup on radar 2020-05-17 22:24:23 +02:00
aap
13903d7c46 radar sprites 2020-05-17 22:21:39 +02:00
eray orçunus
7bd6c70318 just in case 2020-05-17 22:17:43 +03:00
Nikolay Korolev
d5d2f6a822 sync with upstream 2020-05-17 21:48:21 +03:00
Nikolay Korolev
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
Nikolay Korolev
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
aap
8a7210cad1
Merge pull request #555 from erorcun/miami
Weapon fixes and thingies
2020-05-17 20:20:14 +02:00
Fire-Head
91fbfc1d23 nullsampman 2020-05-17 21:13:25 +03:00
eray orçunus
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap
a0703fd9e1 loading screens 2020-05-17 19:45:21 +02:00
aap
3f2bdc096d some HUD colors 2020-05-17 15:57:59 +02:00
aap
4ab49780b5 collect HUD colors at top of file 2020-05-17 15:33:44 +02:00
aap
405a6fcbef Merge branch 'master' of github.com:GTAmodding/re3 2020-05-17 15:16:27 +02:00
aap
964acba083 fix head/hand atomics 2020-05-17 15:16:12 +02:00
aap
72ccf9a0db revert accidental commit; also update librw 2020-05-17 14:21:09 +02:00
Sergeanur
37480fb617 Fix compilation errors 2020-05-17 00:33:52 +03:00
Sergeanur
77f97ad2ad Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/audio/AudioManager.cpp
2020-05-16 23:58:44 +03:00
Sergeanur
ad0b99231e Remove magic consts from ms_aAnimAssocDefinitions 2020-05-16 23:54:44 +03:00
Nikolay Korolev
5c8888d2ed Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 23:09:34 +03:00
Nikolay Korolev
b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Sergeanur
4ff0697b4d More small audio fixes 2020-05-16 21:00:27 +03:00
Sergeanur
13a0bf1c43 Move sound processors to AudioLogic.cpp, plus small fixes 2020-05-16 20:29:13 +03:00
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