Commit graph

89 commits

Author SHA1 Message Date
aap
b468d010a8 implemented extended postfx 2020-08-11 18:40:04 +02:00
Sergeanur
acdc52116e Merge branch 'master' into miami
# Conflicts:
#	src/animation/RpAnimBlend.cpp
#	src/audio/oal/stream.cpp
#	src/audio/sampman.h
#	src/control/Pickups.cpp
#	src/core/Collision.cpp
#	src/core/Collision.h
#	src/core/FileLoader.cpp
#	src/core/FileMgr.cpp
#	src/core/FileMgr.h
#	src/core/Streaming.cpp
#	src/core/Streaming.h
#	src/core/SurfaceTable.h
#	src/modelinfo/VehicleModelInfo.h
#	src/peds/Ped.cpp
#	src/rw/RwHelper.cpp
#	src/rw/RwHelper.h
#	src/skel/glfw/glfw.cpp
#	src/skel/platform.h
#	src/text/Text.cpp
#	src/text/Text.h
#	src/vehicles/CarGen.cpp
#	src/vehicles/Heli.cpp
2020-07-29 15:34:57 +03:00
Sergeanur
581cb5edfa The real pickup reflection fix 2020-07-29 14:56:06 +03:00
eray orçunus
732b760829 64-bit on Windows 2020-07-24 20:26:33 +03:00
eray orçunus
1dc6fbda1f 64-bit on Windows 2020-07-22 18:51:28 +03:00
aap
2612c9f12c CPlaneTrails and CPlaneBanners done 2020-07-20 19:50:20 +02:00
aap
efd49962d2 avoid UB 2020-07-20 19:32:20 +02:00
eray orçunus
70fa4ab79c Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes 2020-07-06 16:38:00 +03:00
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
Nikolay Korolev
043f09f3fb
Merge pull request #637 from Nick007J/master
script logging
2020-06-22 13:27:25 +03:00
Nikolay Korolev
7a71a47f74 updated player control names 2020-06-21 16:00:17 +03:00
aap
60f736f20f FOV fix 2020-06-21 14:52:44 +02:00
aap
e563450cb6 synch with re3 2020-06-21 14:52:03 +02:00
aap
98baa36f1a FOV fix 2020-06-21 14:50:00 +02:00
aap
3859efff42 ps2 cam transitions done (hopefully) 2020-06-21 14:41:39 +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
5ad739f096 some PS2 cam code; fix for arrest cam 2020-06-20 14:38:21 +02:00
aap
4cd4f91e57 ccamera cleanup 2020-06-19 09:15:23 +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
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
eray orçunus
e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Nikolay Korolev
c1c163d78c game logic 2020-05-31 20:59:01 +03:00
aap
0ac3477035 fix UB shit 2020-05-26 18:50:27 +02:00
aap
7f60be9814 fix UB shit 2020-05-26 18:50:19 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
eray orçunus
4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
eray orçunus
a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
aap
bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
Nikolay Korolev
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +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
Nikolay Korolev
8fae2dcc26 garages + script 2020-05-11 21:04:35 +03:00
aap
2eee4c5176 most of animation system done; little stuff here and there 2020-05-08 15:59:57 +02:00
aap
31f9bb566b implemented most of timecycle and mblur 2020-05-06 00:53:26 +02:00
aap
68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
Sergeanur
1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL 2020-05-05 18:32:46 +03:00
Sergeanur
c2b9ddc5b8 Revert "Remove Miami stuff"
This reverts commit 9960c41193.
2020-05-05 18:04:43 +03:00
Sergeanur
9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
aap
b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
aap
67467f15d1 GTA_BRIDGE and GTA_TRAIN defines 2020-05-03 17:28:54 +02:00
Nikolay Korolev
7cc3410846 Merge remote-tracking branch 'upstream/master' 2020-04-21 11:55:39 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Nikolay Korolev
9e65eb34ec 1.1 patch stuff 2020-04-19 17:38:10 +03:00