Sergeanur
|
fe40f65703
|
Reorganize CPed functions into their original cpp files
|
2020-11-20 01:18:37 +02:00 |
|
Sergeanur
|
9e45feb4fa
|
Reorganize CPed functions into their original cpp files
|
2020-11-19 21:12:20 +02:00 |
|
aap
|
3d46f2a3af
|
fixed bike collision damage
|
2020-11-12 20:05:02 +01:00 |
|
Nikolay Korolev
|
a67d4c70d7
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-11-11 12:22:57 +03:00 |
|
aap
|
48d0653331
|
urgh, merge and changes to RW layer in one commit.
|
2020-11-11 09:38:33 +01:00 |
|
Nikolay Korolev
|
612a6dd06c
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-11-11 00:08:54 +03:00 |
|
Nikolay Korolev
|
ef2089cafb
|
CWorld done
|
2020-11-11 00:08:32 +03:00 |
|
Roman Masanin
|
23d23f6462
|
merge upstream
|
2020-11-08 16:23:05 +03:00 |
|
Filip Gawin
|
e24513d2ad
|
Sfx audio logic
|
2020-11-06 18:42:52 +01:00 |
|
aap
|
244b91ee80
|
fixed boats for new renderer
|
2020-11-04 16:22:15 +01:00 |
|
aap
|
7041f11987
|
bike bug
|
2020-11-02 13:57:51 +01:00 |
|
Roman Masanin
|
55c4346610
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev
|
2020-11-01 22:35:46 +03:00 |
|
Nikolay Korolev
|
370d693f9d
|
the driver fix
|
2020-11-01 15:15:23 +03:00 |
|
Sergeanur
|
db84afd263
|
Revert
|
2020-11-01 12:31:37 +02:00 |
|
Sergeanur
|
1f5a6dab67
|
Revert
|
2020-11-01 12:30:23 +02:00 |
|
Sergeanur
|
20ea2fde84
|
Also fix SetModelIndex in CAutomobile and CTrain ctors
|
2020-11-01 09:46:25 +02:00 |
|
Sergeanur
|
5711251b0f
|
Also fix SetModelIndex in CAutomobile and CTrain ctors
|
2020-11-01 09:46:02 +02:00 |
|
Sergeanur
|
3c4f166a82
|
Fix virtual SetModelIndex call in CBoat ctor
|
2020-11-01 09:34:10 +02:00 |
|
Sergeanur
|
d370c2076d
|
Fix virtual SetModelIndex call in CBoat ctor
|
2020-11-01 09:20:37 +02:00 |
|
Roman Masanin
|
04b841c719
|
processVehicleOneShots
|
2020-10-26 00:11:04 +03:00 |
|
Sergeanur
|
ca497e2cbd
|
ScriptSounds
|
2020-10-23 16:56:34 +03:00 |
|
Nikolay Korolev
|
d7789661cd
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-18 17:30:51 +03:00 |
|
Sergeanur
|
0d20f1c364
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/RoadBlocks.cpp
# src/entities/Entity.h
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/render/Renderer.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/CarGen.cpp
# src/weapons/BulletInfo.cpp
# src/weapons/Weapon.cpp
|
2020-10-18 17:15:49 +03:00 |
|
Sergeanur
|
b91f6a4550
|
Setter for bIsStatic (became virtual in SA)
|
2020-10-18 16:40:06 +03:00 |
|
Filip Gawin
|
23220d799c
|
Cleanup breaks CAutomobile::ProcessOpenDoor
|
2020-10-18 15:26:20 +02:00 |
|
Nikolay Korolev
|
720abca826
|
finished save/load
|
2020-10-17 20:45:07 +03:00 |
|
Nikolay Korolev
|
1195f3db7b
|
saves part 1
|
2020-10-17 18:50:16 +03:00 |
|
Nikolay Korolev
|
0cf2c8505e
|
cranes done
|
2020-10-17 14:18:20 +03:00 |
|
Sergeanur
|
f1bb09826d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# gamefiles/TEXT/american.gxt
# premake5.lua
# src/audio/MusicManager.cpp
# src/control/Darkel.cpp
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/Frontend.cpp
# src/core/Game.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/extras/frontendoption.cpp
# src/extras/frontendoption.h
# src/render/Hud.cpp
# src/skel/glfw/glfw.cpp
# src/vehicles/CarGen.cpp
# src/vehicles/Vehicle.cpp
# src/weapons/WeaponInfo.cpp
# utils/gxt/american.txt
|
2020-10-11 01:18:08 +03:00 |
|
eray orçunus
|
a01b14f301
|
Fix sniper and water creatures bug, mark some files
|
2020-10-09 12:24:21 +03:00 |
|
eray orçunus
|
570ccb7db1
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
|
2020-10-08 22:45:37 +03:00 |
|
erorcun
|
b97f86deea
|
Merge pull request #750 from erorcun/miami
Pad, BulletInfo, ProjectileInfo, fixes
|
2020-10-08 21:39:11 +03:00 |
|
Roman Masanin
|
e52c5ca1bb
|
fix for wheelie cras
|
2020-10-08 20:34:59 +03:00 |
|
eray orçunus
|
fec01aeff1
|
Fix some sanitizer errors, improve POSIX streamer
|
2020-10-08 17:58:18 +03:00 |
|
erorcun
|
fa373c7fdb
|
Merge branch 'miami' into miami
|
2020-10-08 01:29:35 +03:00 |
|
eray orçunus
|
0409907438
|
Merge branch 'master' of https://github.com/GTAmodding/re3
|
2020-10-08 01:26:34 +03:00 |
|
eray orçunus
|
07cdd06373
|
little renamings & librw update
|
2020-10-08 01:17:19 +03:00 |
|
erorcun
|
8b7bf76260
|
Merge pull request #735 from theR4K/miami
car fly cheat enhancement
|
2020-10-08 00:59:10 +03:00 |
|
eray orçunus
|
da39624f1c
|
Pad, BulletInfo, ProjectileInfo, fixes
|
2020-10-08 00:26:24 +03:00 |
|
eray orçunus
|
556dbdcdd6
|
Merge branch 'master' of https://github.com/GTAmodding/re3
|
2020-10-05 22:18:51 +03:00 |
|
Filip Gawin
|
e3571510ae
|
Fix build on clang
|
2020-10-05 17:40:44 +02:00 |
|
Nikolay Korolev
|
6853be36c8
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-05 16:10:26 +03:00 |
|
Nikolay Korolev
|
2bfb54b192
|
fixed darkel/replay
|
2020-10-05 16:09:44 +03:00 |
|
eray orçunus
|
8c170a62ee
|
Fix some sanitizer errors, improve POSIX streamer
|
2020-10-04 22:39:54 +03:00 |
|
Roman Masanin
|
1b3144f978
|
back to the future style wheels on flying
|
2020-10-04 19:03:34 +03:00 |
|
Roman Masanin
|
063a80ecfb
|
now BETTER_ALLCARSDODO_CHEAT tweak original cheat to be useful.
|
2020-10-03 02:26:49 +03:00 |
|
Roman Masanin
|
55d94c99b8
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-10-03 01:52:37 +03:00 |
|
Nikolay Korolev
|
8761763d95
|
fixed cargen check
|
2020-10-02 20:43:24 +03:00 |
|
Roman Masanin
|
049c993ce0
|
fix ternary operator
|
2020-10-01 02:45:24 +03:00 |
|
Roman Masanin
|
fe46aa5cc2
|
better flying cars, some refractoring and fixes
|
2020-10-01 02:20:09 +03:00 |
|
eray orçunus
|
595421da39
|
Fixes, mouse AUX buttons, joystick detect menu
|
2020-09-30 20:03:01 +03:00 |
|
Roman Masanin
|
db0758690e
|
new implementation for car fly enhancment
|
2020-09-30 13:37:43 +03:00 |
|
eray orçunus
|
f740588780
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-09-30 02:44:02 +03:00 |
|
eray orçunus
|
f71953077d
|
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
|
2020-09-30 02:41:42 +03:00 |
|
Nikolay Korolev
|
9cce324316
|
fixed cargen
# Conflicts:
# src/vehicles/CarGen.cpp
|
2020-09-30 02:18:03 +03:00 |
|
shfil
|
35d7591def
|
some SilentPatch fixes
# Conflicts:
# src/core/Camera.cpp
# src/weapons/Weapon.cpp
|
2020-09-30 02:14:10 +03:00 |
|
erorcun
|
f9dc00a458
|
Merge pull request #718 from Nick007J/miami
VC replays
|
2020-09-29 23:00:50 +03:00 |
|
eray orçunus
|
7646ceeaaa
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-09-29 02:30:48 +03:00 |
|
eray orçunus
|
a0588ef8b1
|
Restore All Cars are Heli cheat
|
2020-09-29 02:29:10 +03:00 |
|
erorcun
|
e2314c7852
|
Merge pull request #717 from theR4K/miami
Helicopters not ringing, and other audio stuff
|
2020-09-29 01:48:11 +03:00 |
|
Roman Masanin
|
a729f32c83
|
TEMPORALY remove flying cars
|
2020-09-29 01:39:59 +03:00 |
|
Nikolay Korolev
|
742ca47a43
|
fixed cargen
|
2020-09-28 21:25:14 +03:00 |
|
Roman Masanin
|
ca73f0344c
|
fixed original bug, when heli go ma if cars fly cheat activated
|
2020-09-28 01:38:05 +03:00 |
|
Roman Masanin
|
bb2e601e13
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-09-26 21:38:37 +03:00 |
|
Nikolay Korolev
|
f7d5021ac5
|
VC replays
|
2020-09-26 21:10:23 +03:00 |
|
Roman Masanin
|
ec8ac117ed
|
Improve dodo cheat to allow fly on cars
|
2020-09-26 20:36:07 +03:00 |
|
Nikolay Korolev
|
b42d9e3e7c
|
silentpatch fixes
|
2020-09-26 13:30:22 +03:00 |
|
Roman Masanin
|
a75ddd0d0c
|
processVehicleOneShots for heli, and heli blade fix
|
2020-09-26 04:10:00 +03:00 |
|
eray orçunus
|
dbc458a4d7
|
CPed and CCivilianPed funcs done
|
2020-09-24 01:54:37 +03:00 |
|
Roman Masanin
|
aa2f1b6b29
|
vehicle audio(first part) and temp fix for openAL
|
2020-09-13 21:45:42 +03:00 |
|
aap
|
a9a1bf5056
|
changed a sound enum
|
2020-08-20 13:21:08 +02:00 |
|
aap
|
7da4f7fc35
|
fixed sound enum
|
2020-08-20 13:20:48 +02:00 |
|
aap
|
30dadcfb22
|
transmission done
|
2020-08-20 10:24:12 +02:00 |
|
aap
|
bb948904b6
|
small stuff
|
2020-08-19 21:58:00 +02:00 |
|
Nikolay Korolev
|
d303c33c2e
|
CarCtrl finished, minor Script things
|
2020-08-16 18:39:11 +03:00 |
|
aap
|
40185161b8
|
Merge pull request #670 from Fire-Head/miami
Miami Shadows
|
2020-08-07 10:18:35 +02:00 |
|
Fire-Head
|
224fd77641
|
NULL -> nil
|
2020-07-31 21:21:58 +03:00 |
|
eray orçunus
|
eafa9cc107
|
new opcodes, buyable properties, minor fixes
|
2020-07-30 15:32:34 +03:00 |
|
Fire_Head
|
52e77c6634
|
Merge pull request #1 from GTAmodding/miami
Miami
|
2020-07-29 12:20:02 +03:00 |
|
Fire-Head
|
1803dcc873
|
miami shadows
|
2020-07-29 12:17:53 +03:00 |
|
aap
|
fb4de46626
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-07-29 09:34:28 +02:00 |
|
eray orçunus
|
429f6b03c4
|
CCopPed, except spike traps
|
2020-07-28 17:04:34 +03:00 |
|
aap
|
6b7a8f96a6
|
CCollision done and fixes
|
2020-07-27 15:38:46 +02:00 |
|
aap
|
90fdc4328b
|
CHeli and CRopes done
|
2020-07-27 14:06:23 +02:00 |
|
aap
|
e2d56f00dd
|
heli fixes
|
2020-07-26 23:40:26 +02:00 |
|
eray orçunus
|
15918feb8e
|
90% fixes, 10% skel refactoring
|
2020-07-24 21:35:04 +03:00 |
|
eray orçunus
|
ad6094ca1d
|
90% fixes, 10% skel refactoring
|
2020-07-24 21:02:55 +03:00 |
|
erorcun
|
b182fa4bb8
|
Merge pull request #656 from erorcun/miami
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 18:21:39 +03:00 |
|
eray orçunus
|
f40f44b14e
|
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 15:19:22 +03:00 |
|
aap
|
0fba76a565
|
made NPC heli rotors rotate
|
2020-07-21 09:58:53 +02:00 |
|
aap
|
ee2d0ffc14
|
Merge pull request #650 from majesticCoding/miami
COcclusion done, I hope
|
2020-07-20 19:56:18 +02:00 |
|
aap
|
2612c9f12c
|
CPlaneTrails and CPlaneBanners done
|
2020-07-20 19:50:20 +02:00 |
|
majestic
|
1ff27e3363
|
cosmetic fixes
|
2020-07-20 09:49:39 -07:00 |
|
aap
|
e74b569115
|
CPlane done
|
2020-07-19 00:56:30 +02:00 |
|
aap
|
b8c2cf597d
|
figured out magic
|
2020-07-19 00:56:13 +02:00 |
|
aap
|
2cfd3a9e92
|
CPlane fixes
|
2020-07-19 00:37:12 +02:00 |
|
Sergeanur
|
693a5e0c2a
|
Fix wheel water splash with PC_PARTICLE
|
2020-07-17 12:57:47 +03:00 |
|
Sergeanur
|
d0f5464200
|
Merge branch 'master' into miami
# Conflicts:
# src/control/CarAI.cpp
# src/control/Phones.cpp
# src/control/Phones.h
# src/control/Record.cpp
# src/control/Restart.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.h
# src/core/Streaming.cpp
# src/core/TempColModels.cpp
# src/core/Wanted.cpp
# src/core/Zones.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/entities/Entity.cpp
# src/entities/Physical.cpp
# src/extras/frontendoption.cpp
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/CivilianPed.cpp
# src/peds/CopPed.cpp
# src/peds/EmergencyPed.cpp
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/peds/Population.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# src/skel/win/win.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
# src/vehicles/Boat.h
# src/vehicles/Vehicle.cpp
|
2020-07-13 18:10:17 +03:00 |
|
Sergeanur
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
|
eray orçunus
|
67a3c7d2ee
|
VC fighting, Peds, many fixes including ghost bikes
|
2020-07-09 17:01:07 +03:00 |
|
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 |
|
Sergeanur
|
c53b23cff0
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/core/Radar.h
# src/core/World.cpp
# src/core/config.h
# src/entities/Entity.cpp
# src/modelinfo/ModelIndices.h
# src/modelinfo/PedModelInfo.cpp
# src/peds/Population.cpp
# src/render/Clouds.cpp
# src/render/Hud.cpp
# src/vehicles/HandlingMgr.h
|
2020-05-20 14:39:36 +03:00 |
|
aap
|
fd4cd3e8f1
|
Merge pull request #569 from aap/miami
CEntity and friends
|
2020-05-20 12:41:12 +02:00 |
|
Nikolay Korolev
|
fec0028e12
|
sync with upstream
|
2020-05-19 23:27:41 +03:00 |
|
aap
|
bdbe5d1080
|
CEntity and friends
|
2020-05-19 20:56:42 +02:00 |
|
Nikolay Korolev
|
41d7b3244b
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-19 20:54:10 +03:00 |
|
Nikolay Korolev
|
4c822e8375
|
script revision
|
2020-05-19 20:54:05 +03:00 |
|
eray orçunus
|
99574ebfc6
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-05-19 17:46:18 +03:00 |
|
eray orçunus
|
a6972714b7
|
Melee weapons(half-working), Ped and Hud bits
|
2020-05-19 17:43:16 +03:00 |
|
aap
|
6b0b984909
|
Merge pull request #561 from Nick007J/miami
script revision
|
2020-05-19 13:26:21 +02:00 |
|
aap
|
0d0f4da27a
|
little cleanup of handlingmgr
|
2020-05-19 13:09:20 +02:00 |
|
aap
|
53cdf6ab41
|
HandlingMgr
|
2020-05-19 13:07:12 +02:00 |
|
Nikolay Korolev
|
a27fc8d9d9
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-19 01:49:51 +03:00 |
|
Nikolay Korolev
|
6510b15704
|
script revision
|
2020-05-19 01:49:09 +03:00 |
|
aap
|
abd230dcdd
|
some less certainly fps fixes
|
2020-05-18 22:52:35 +02:00 |
|
aap
|
2588e69849
|
some less certainly fps fixes
|
2020-05-18 16:55:38 +02:00 |
|
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 |
|
Nikolay Korolev
|
5ab2c85e97
|
some debug changes
|
2020-05-18 00:34:24 +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 |
|
eray orçunus
|
84f8312b86
|
Weapon fixes and thingies
|
2020-05-17 21:01:52 +03:00 |
|
Nikolay Korolev
|
b587d835e8
|
more script stuff
|
2020-05-16 23:06:33 +03:00 |
|
Nikolay Korolev
|
c33b93793f
|
new horn
|
2020-05-16 14:01:32 +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 |
|
eray orçunus
|
acd1ea9909
|
Weapon layer in Peds
|
2020-05-15 21:21:25 +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 |
|
Nikolay Korolev
|
9d4d83db0d
|
some fixes
|
2020-05-14 14:01:24 +03:00 |
|
Nikolay Korolev
|
509d57edcb
|
car control and cranes fixes
|
2020-05-13 13:29:17 +03:00 |
|
Sergeanur
|
7c2b9478d5
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/FileLoader.cpp
# src/core/Streaming.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/render/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
|
2020-05-13 00:55:52 +03:00 |
|
Sergeanur
|
33dfaf7da1
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
|
2020-05-13 00:27:15 +03:00 |
|
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
Nikolay Korolev
|
3e64274f6b
|
more script
|
2020-05-12 01:59:35 +03:00 |
|
erorcun
|
5f40f06bf0
|
Merge pull request #533 from erorcun/master
Linux build support
|
2020-05-12 00:33:13 +03:00 |
|
Nikolay Korolev
|
9b23e33c36
|
sync with upstream
|
2020-05-11 21:21:09 +03:00 |
|
Sergeanur
|
5f1c3fa208
|
Merge remote-tracking branch 'origin/miami' into miami
|
2020-05-11 21:07:36 +03:00 |
|
Sergeanur
|
0aa7f13c32
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimBlendAssociation.h
# src/animation/AnimBlendClumpData.h
# src/animation/AnimManager.h
# src/animation/FrameUpdate.cpp
# src/control/AutoPilot.h
# src/control/PathFind.h
# src/core/PlayerInfo.h
# src/entities/Building.h
# src/entities/Dummy.h
# src/entities/Entity.h
# src/entities/Physical.h
# src/entities/Treadable.h
# src/modelinfo/BaseModelInfo.h
# src/modelinfo/ClumpModelInfo.cpp
# src/modelinfo/ClumpModelInfo.h
# src/modelinfo/PedModelInfo.h
# src/modelinfo/SimpleModelInfo.h
# src/modelinfo/TimeModelInfo.h
# src/modelinfo/VehicleModelInfo.h
# src/objects/CutsceneHead.h
# src/objects/CutsceneObject.h
# src/objects/DummyObject.h
# src/objects/Object.h
# src/peds/DummyPed.h
# src/peds/PedIK.cpp
# src/rw/VisibilityPlugins.cpp
# src/vehicles/Automobile.h
# src/vehicles/Boat.h
# src/vehicles/Heli.h
# src/vehicles/Plane.h
# src/vehicles/Train.h
# src/vehicles/Vehicle.h
|
2020-05-11 21:07:12 +03:00 |
|
Nikolay Korolev
|
5f5babe7fe
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-11 21:05:01 +03:00 |
|
Nikolay Korolev
|
8fae2dcc26
|
garages + script
|
2020-05-11 21:04:35 +03:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
aap
|
d4250fc2c7
|
CRenderer
|
2020-05-11 17:03:44 +02:00 |
|
aap
|
b11715608f
|
few fixes
|
2020-05-11 09:18:41 +02:00 |
|
aap
|
9e842f1628
|
vehicle model descriptions; a bit of heli code
|
2020-05-10 20:51:29 +02:00 |
|
bigbossbro08
|
b4abb6ddd8
|
fixed few more typos
|
2020-05-10 22:04:36 +06:00 |
|
bigbossbro08
|
c798e1bacd
|
Fixed typos and made all assert functions optional
|
2020-05-10 21:49:33 +06:00 |
|
aap
|
0552d49fce
|
CVehicleModelInfo
|
2020-05-10 17:09:14 +02:00 |
|
bigbossbro08
|
af6e132b37
|
defined out asserts.
|
2020-05-10 19:54:37 +06:00 |
|