1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-26 15:19:45 +00:00
Commit graph

85 commits

Author SHA1 Message Date
Sergeanur 9647901ba0 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
2021-01-25 19:35:03 +02:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Sergeanur e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
Sergeanur 2d00d9cbe6 More scaling macro 2021-01-23 22:06:17 +02:00
Sergeanur 13507d422b Add PSP scaling macros 2021-01-23 18:56:27 +02:00
Sergeanur 904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
erorcun f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Sergeanur 8888ee3974
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
2021-01-12 13:22:44 +02:00
Sergeanur cb4b4d584c Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
2021-01-12 12:55:07 +02:00
Sergeanur a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
Fire-Head 7a3ee349da sync with re3
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
2021-01-09 01:01:41 +03:00
Sergeanur ead2a1a606 MemoryManager of base:: 2021-01-08 16:47:41 +02:00
Sergeanur 42e4a068bb CVarConsole 2021-01-02 13:32:25 +02:00
erorcun a50244dc16 signed/unsigned fixes, and some other fixes 2020-12-25 12:54:41 +03:00
aap c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00
erorcun cf4aedd97c Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by default 2020-12-09 06:36:28 +03:00
erorcun b7783b19d2 Xbox message screen, disabled by default 2020-11-24 01:45:54 +03:00
Sergeanur dd039677a0 Zones saving and loading 2020-10-10 23:50:00 +03:00
eray orçunus fec01aeff1 Fix some sanitizer errors, improve POSIX streamer 2020-10-08 17:58:18 +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
Roman Masanin b956be0f44 another clamp 2020-09-27 04:22:59 +03:00
Sergeanur 7d8ffa9ebd Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/control/RoadBlocks.cpp
#	src/core/Collision.h
#	src/core/Pad.cpp
#	src/core/SurfaceTable.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/peds/Population.cpp
#	src/render/Fluff.cpp
#	src/render/Shadows.cpp
#	src/render/Shadows.h
#	src/render/Sprite2d.cpp
#	src/weapons/BulletInfo.cpp
2020-08-07 12:34:41 +03:00
aap abb640c6b6 VU0 collision 2020-08-03 17:32:06 +02:00
aap 1c44368f0a fixed hanim for 64 bit 2020-07-24 23:29:33 +02:00
aap b5b64ca351 fixed hanim for 64 bit 2020-07-24 23:28:55 +02: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
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
aap 60f736f20f FOV fix 2020-06-21 14:52:44 +02:00
aap 98baa36f1a FOV fix 2020-06-21 14:50:00 +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
Nikolay Korolev 408f47fc9d fixed linux saving 2020-06-06 12:58:10 +03:00
aap d8272b8812 hanim fix 2020-06-01 20:32:43 +02:00
aap 8bbb6a2a4a hanim fix 2020-06-01 20:28:04 +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
erorcun c66c45f4c8
Merge pull request #509 from Fire-Head/master
OpenAL update
2020-05-11 03:23:36 +03:00
bigbossbro08 af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
aap 2eee4c5176 most of animation system done; little stuff here and there 2020-05-08 15:59:57 +02:00
Fire-Head 12a3499ca3 oal wav/mp3 stream update 2020-05-07 09:26:16 +03:00
Sergeanur d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
aap e467cb08b8 Merge branch 'master' of github.com:gtamodding/re3 2020-04-26 21:51:11 +02:00
aap 1b5616688e tried to fix some half-pixel bugs 2020-04-26 21:50:52 +02:00
Sergeanur 4dc2f30791 Remove little hack 2020-04-26 21:58:12 +03:00
eray orçunus 6c1a1f7cd2 Initial GLFW support 2020-04-26 13:29:50 +03:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Filip Gawin d6314f9564 Revert "Part one"
This reverts commit 63951d9b95.
2020-04-18 12:29:28 +02:00
Filip Gawin 63951d9b95 Part one 2020-04-17 19:30:57 +02:00