Commit Graph

402 Commits

Author SHA1 Message Date
aap
1e679dcb8d
Merge pull request #641 from aap/miami
CBoat and friends
2020-07-04 21:24:11 +02:00
eray orçunus
716740f918 Peds & fixes 2020-07-04 15:31:28 +03:00
eray orçunus
15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
aap
2141247e08 CBoat and friends 2020-07-01 18:04:02 +02:00
aap
575f35f2c4 fixes to CBoat 2020-07-01 18:03:59 +02:00
eray orçunus
f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
eray orçunus
e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
erorcun
d322a8033e
Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
eray orçunus
c6bb1f5d0d some cutscene opcodes and heli guns 2020-06-16 20:35:09 +03:00
eray orçunus
595576b151 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-15 23:49:59 +03:00
eray orçunus
c4e129509b Peds & fixes continues 2020-06-15 23:43:20 +03:00
Sergeanur
655eaa36ce Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/Script.cpp
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
2020-06-15 17:44:47 +03:00
majestic
015921522d fixed condition in CBoat::ProcessControl and changed enum 2020-06-14 07:53:45 -07:00
aap
b77d044729 fixed boat wake 2020-06-14 09:50:00 +02:00
aap
c7a32bb83d some camera code 2020-06-14 09:36:30 +02:00
eray orçunus
3231c6c3dd ProcessTrainAnnouncements fix 2020-06-13 17:33:30 +03:00
Nikolay Korolev
17dd26e1ca heli AI fix 2020-06-12 22:38:37 +03:00
aap
b07b1f0b51
Merge pull request #624 from erorcun/miami
Peds, bike center of mass and reversing fixes
2020-06-09 15:43:25 +02:00
eray orçunus
dba2b052a6 Peds, bike center of mass and reversing fixes 2020-06-09 01:29:55 +03:00
Sergeanur
85d845c5ce
Merge pull request #623 from Sergeanur/VC/MissionAudio
Mission audio
2020-06-08 17:32:57 +03:00
Sergeanur
8cd87236c9 miamification of some audio structs 2020-06-08 14:29:55 +03:00
aap
d5515c9d0e cleaned up and updated animviewer; fixed animation bug 2020-06-08 13:01:23 +02:00
Nikolay Korolev
5a09eeea27 more accurate code 2020-06-08 00:53:25 +03:00
aap
dda9d03e54 nother bike bug 2020-06-07 17:35:22 +02:00
aap
464b232321 accidental shadowing in CBike::ProcessControl 2020-06-07 17:27:23 +02:00
Nikolay Korolev
d0213e466c more script commands 2020-06-07 15:49:25 +03:00
eray orçunus
de4323f949 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 12:46:15 +03:00
eray orçunus
d1a02e6ddc New ped objectives 2020-06-07 12:45:53 +03:00
Nikolay Korolev
5fd330b35e making it close to original 2020-06-07 11:31:52 +03:00
aap
1234fe9c1c removed a "fix" 2020-06-07 10:24:33 +02:00
Sergeanur
1c01899799 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
aap
44e2fcee39 disable skidding bugfix 2020-06-07 00:03:51 +02:00
aap
5711159e68 CBike done 2020-06-07 00:01:59 +02:00
Nikolay Korolev
e099aaaa6b minor fixes 2020-06-06 16:36:26 +03:00
aap
d6640832f1 bla 2020-06-06 14:43:35 +02:00
aap
ef4f8ec713 more CBike functions 2020-06-06 14:42:42 +02:00
aap
c0481e7207 CBike::KnockOffRider 2020-06-06 13:22:55 +02:00
Nikolay Korolev
3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +03:00
Nikolay Korolev
408f47fc9d fixed linux saving 2020-06-06 12:58:10 +03:00
Sergeanur
afa4fa6510 Merge branch 'master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/soundlist.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/peds/Ped.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Vehicle.h
2020-06-06 08:42:58 +03:00
eray orçunus
d3736ccb17 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-05 23:20:16 +03:00
eray orçunus
f045ce4386 Bike riding anims, SA bike/heli cam 2020-06-05 23:13:34 +03:00
aap
1bfb01d5f5 a bit more CBike 2020-06-05 15:09:45 +02:00
Sergeanur
147dca44fa ProcessTrainAnnouncements 2020-06-05 11:27:33 +03:00
Nikolay Korolev
d325a3d247 basic bike support in traffic, script and car gen; some heli AI 2020-06-05 11:22:15 +03:00
aap
647fd951ec more CBike 2020-06-05 00:24:42 +02:00
aap
95e96c86a1 minor stuff 2020-06-04 17:39:26 +02:00
aap
3e36428568 more CBike and fixes 2020-06-04 17:38:41 +02:00
eray orçunus
016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
Sergeanur
a6e4619378 Revert "fix accident~"
This reverts commit 04de93796b.
2020-06-04 04:42:42 +03:00
Sergeanur
07d336ddf0 Merge branch 'master' into miami
# Conflicts:
#	src/peds/Ped.cpp
#	src/peds/Ped.h
2020-06-04 04:32:49 +03:00
eray orçunus
5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
aap
c498af29aa get rid of III code 2020-06-03 09:24:26 +02:00
aap
04de93796b fix accident~ 2020-06-03 09:24:02 +02:00
aap
ad03d9543b Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-03 08:26:33 +02:00
aap
b73e42346e forgot the fucking file 2020-06-03 08:26:24 +02:00
Sergeanur
509ca11d76 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/GameLogic.cpp
#	src/control/PathFind.cpp
#	src/control/RoadBlocks.cpp
#	src/control/Script.cpp
#	src/control/Script.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/core/TempColModels.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.h
#	src/render/Skidmarks.h
#	src/render/WaterLevel.cpp
#	src/save/GenericGameStorage.h
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/DamageManager.cpp
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
aap
2ca3c50463 some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
aap
04a91761df some vehicle cleanup 2020-06-02 23:34:53 +02:00
aap
06c761e9ac few bike things 2020-06-02 15:26:11 +02:00
aap
575c5466df renamed a vehicle thing 2020-06-02 14:38:57 +02:00
aap
dbeaafbe99 initial CBike struct 2020-06-02 14:38:30 +02:00
aap
fdf8f35049 CTimer fix 2020-06-01 20:51:18 +02:00
aap
de1018d7a6 gravity 2020-06-01 10:56:15 +02:00
aap
bae3a3e72f fixed to CAutomobile and friends 2020-05-31 17:45:26 +02:00
aap
21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
aap
00dc86917e some more CAutomobile 2020-05-31 17:05:59 +02:00
aap
c1e13177a1 some CAutomobile 2020-05-31 17:05:59 +02:00
aap
0bc6eef55d bla 2020-05-27 22:34:10 +02:00
aap
2a1b9281e4 automobile fixes 2020-05-27 22:32:57 +02:00
Fire_Head
e4649b41e1
Merge pull request #2 from GTAmodding/miami
Miami
2020-05-27 21:51:40 +03:00
Fire-Head
63d0bdc863 VC Water 2020-05-27 21:50:01 +03:00
aap
d71cbae9df CVehicle loose ends 2020-05-27 07:43:38 +02:00
Fire-Head
6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
aap
4f1ce8bd42 added some unused enums 2020-05-26 20:44:03 +02:00
Sergeanur
0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +03:00
Nikolay Korolev
f40677c7a4 fixed crash 2020-05-26 16:17:40 +03:00
aap
314e56b7b9 fix2 2020-05-26 12:11:04 +02:00
aap
7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap
d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
Nikolay Korolev
15a99da50e cranes fix 2020-05-25 23:34:47 +03:00
aap
3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
aap
3fdd352ca2 CVehicle fixes 2020-05-24 15:14:56 +02:00
aap
19a0c8b462
Merge pull request #583 from erorcun/miami
Menu borders and weapon fixes
2020-05-24 10:47:17 +02:00
eray orçunus
4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
Nikolay Korolev
6a7bd0e330 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 00:19:25 +03:00
Sergeanur
88b6168f1c Merge branch 'master' into miami
# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
2020-05-23 21:14:16 +03:00
Nikolay Korolev
2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00
Nikolay Korolev
607175f02a set pieces 2020-05-23 20:06:52 +03:00
eray orçunus
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Nikolay Korolev
100e59886d
cranes fix 2020-05-23 16:14:39 +03:00
aap
9313bfa155 skeleton typos 2020-05-23 11:34:48 +02:00
aap
e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
aap
a1e4b15bcc Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-22 23:58:59 +02:00
aap
21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
aap
a53ca58e56 CPhysical 2020-05-22 14:27:16 +02:00
Nikolay Korolev
864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
aap
71b9b2ecf9
Merge pull request #572 from erorcun/miami
Fixes for melees and various things
2020-05-20 19:55:05 +02:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00