Sergeanur
|
b26eec5daf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/control/Script.cpp
# src/control/ScriptCommands.h
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Pad.cpp
# src/core/Pad.h
# src/core/config.h
# src/entities/Entity.cpp
# src/render/Credits.cpp
# src/render/Fluff.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Timecycle.cpp
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
# src/text/Text.cpp
|
2020-06-29 12:56:50 +03:00 |
|
Fire_Head
|
860f75d66c
|
Merge branch 'master' into ps2menu
|
2020-06-29 09:37:53 +03:00 |
|
Fire-Head
|
1c11a8081f
|
mips overdose
|
2020-06-28 00:01:51 +03:00 |
|
eray orçunus
|
f3ed6659c3
|
CWanted, anim fix, ped objs renaming, remove III beta features
|
2020-06-22 04:20:56 +03:00 |
|
Nikolay Korolev
|
7a71a47f74
|
updated player control names
|
2020-06-21 16:00:17 +03:00 |
|
aap
|
3859efff42
|
ps2 cam transitions done (hopefully)
|
2020-06-21 14:41:39 +02:00 |
|
aap
|
586e8a2ab4
|
tried to reconstruct bills cam
|
2020-06-21 11:03:20 +02:00 |
|
aap
|
e1c58131c4
|
PS2 cam transition mostly working
|
2020-06-21 00:40:07 +02:00 |
|
aap
|
c5205a89ee
|
CCamera done
|
2020-06-20 14:54:11 +02:00 |
|
aap
|
7ceedc1d47
|
CCam done
|
2020-06-16 13:54:18 +02:00 |
|
aap
|
5f3eb76cff
|
CCam fixes yet again
|
2020-06-16 13:50:29 +02:00 |
|
aap
|
62024217b7
|
more CCam
|
2020-06-15 20:50:01 +02: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 |
|
eray orçunus
|
686d6e9834
|
Fix vehicle cam. zoom values
|
2020-06-15 16:17:22 +03:00 |
|
aap
|
e6d2b49121
|
more cleanup
|
2020-06-14 23:16:22 +02:00 |
|
aap
|
0741fd5b1d
|
some more camera stuff
|
2020-06-14 23:15:56 +02:00 |
|
aap
|
c7a32bb83d
|
some camera code
|
2020-06-14 09:36:30 +02:00 |
|
aap
|
3fe282fbe4
|
a few cam fixes
|
2020-06-13 23:39:35 +02:00 |
|
aap
|
41dac0773f
|
little CCam cleanup; fix in CWorld sphere test
|
2020-06-12 21:53:39 +02:00 |
|
aap
|
5a961d0284
|
some cam cleanup; unused PS2 train cams
|
2020-06-10 23:50:27 +02: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
|
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
|
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 |
|
eray orçunus
|
529cec5653
|
R to freeroam, idle anims, weapon and cam enum fix
|
2020-05-29 22:05:33 +03:00 |
|
eray orçunus
|
329a387fdf
|
Frontend customization functions, freecam toggle, minor things
|
2020-05-28 11:34:12 +03:00 |
|
aap
|
7e5dde1f1a
|
eSurfaceType
|
2020-05-26 11:37:46 +02:00 |
|
aap
|
d8528ebbbe
|
eSurfaceType
|
2020-05-26 11:34:20 +02:00 |
|
eray orçunus
|
4870d9a31b
|
Menu borders and weapon fixes
|
2020-05-24 03:05:48 +03:00 |
|
eray orçunus
|
5357957fe1
|
Compatibility with VC weapon.dat + new shotguns
|
2020-05-23 16:53:20 +03:00 |
|
erorcun
|
8b82e9c40f
|
Merge pull request #574 from Xinerki/miami
many additions
|
2020-05-22 15:49:37 +03:00 |
|
eray orçunus
|
a5f23a0342
|
VC CMenuManager struct, ctor etc.
|
2020-05-22 03:48:12 +03:00 |
|
Xinerki
|
b4060a4789
|
add freecam toggle in control settings
comes with a free config save!
|
2020-05-21 13:06:09 +03:00 |
|
eray orçunus
|
acd1ea9909
|
Weapon layer in Peds
|
2020-05-15 21:21:25 +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 |
|
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
aap
|
98a233da43
|
little fixes to CClouds; disabled object clipping for SA cam
|
2020-05-12 16:36:23 +02:00 |
|
aap
|
40829b5242
|
CClouds; disabled object clipping for SA cam
|
2020-05-12 16:27:39 +02: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 |
|
aap
|
b11715608f
|
few fixes
|
2020-05-11 09:18:41 +02:00 |
|
aap
|
ad90a06a39
|
little fix for cam
|
2020-05-11 09:18:21 +02:00 |
|
aap
|
198b80f560
|
RpAnimBlend and frame updates
|
2020-05-10 23:47:53 +02:00 |
|
aap
|
9e842f1628
|
vehicle model descriptions; a bit of heli code
|
2020-05-10 20:51:29 +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
|
28103775ba
|
Place debug menu under ifdef
|
2020-05-09 16:06:13 +03: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
|
e917cd1f46
|
Fix corona scaling
|
2020-05-09 02:50:48 +03:00 |
|
Sergeanur
|
1ef8d61f36
|
Merge branch 'master' into miami
|
2020-05-08 17:49:19 +03:00 |
|