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 |
|
aap
|
c07727eed0
|
Merge pull request #532 from Nick007J/miami
script update
|
2020-05-10 17:41:31 +02:00 |
|
Nikolay Korolev
|
653d808417
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-10 18:26:13 +03:00 |
|
aap
|
0552d49fce
|
CVehicleModelInfo
|
2020-05-10 17:09:14 +02:00 |
|
Nikolay Korolev
|
00cdcef36a
|
some updates for script
|
2020-05-10 17:54:13 +03:00 |
|
Nikolay Korolev
|
512f5657f7
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-10 15:24:09 +03:00 |
|
Nikolay Korolev
|
61eb361d26
|
script changes
|
2020-05-10 15:23:56 +03:00 |
|
aap
|
f7aa4e108a
|
added some anim groups
|
2020-05-10 14:22:22 +02:00 |
|
aap
|
f7300c7a27
|
CPedModelInfo
|
2020-05-10 13:08:02 +02:00 |
|
aap
|
058690aad7
|
Merge pull request #530 from Nick007J/miami
more car control + some stuff
|
2020-05-10 12:31:21 +02:00 |
|
Nikolay Korolev
|
4b892e9eb9
|
fix boats
|
2020-05-10 13:20:01 +03:00 |
|
Nikolay Korolev
|
662246b9e2
|
fix boat
|
2020-05-10 12:56:13 +03: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 |
|
aap
|
f0442960a2
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-10 10:04:27 +02:00 |
|
aap
|
e9fbd2ccfd
|
CWeaponModelInfo
|
2020-05-10 10:04:20 +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 |
|
Sergeanur
|
0b64436f5f
|
Merge pull request #529 from Nick007J/master
car control fixes
|
2020-05-10 01:08:38 +03:00 |
|
Nikolay Korolev
|
9fce6c4ed3
|
car control fixes
|
2020-05-09 22:24:31 +03:00 |
|
aap
|
e4683a3074
|
Merge pull request #528 from Nick007J/miami
car control, curves, fixes
|
2020-05-09 21:18:00 +02:00 |
|
Nikolay Korolev
|
3de003a8e7
|
new curves + boat fix
|
2020-05-09 22:11:40 +03:00 |
|
Nikolay Korolev
|
5fd8eec42c
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-09 20:30:05 +03:00 |
|
aap
|
c020992e4d
|
back to ped.ifp
|
2020-05-09 19:29:31 +02: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
|
f23ecfbc84
|
accidentally swapped reft and light
|
2020-05-09 17:29:13 +02: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 |
|
Sergeanur
|
1b599b2d35
|
Fix compilation error
|
2020-05-09 15:41:00 +03:00 |
|
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 |
|