1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-25 18:31:54 +00:00
Commit graph

54 commits

Author SHA1 Message Date
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 7b22b7e2af
Update MemoryCard.cpp 2020-06-29 11:38:30 +03:00
Fire_Head 860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Fire-Head b8f633de24 fixes 2020-06-28 01:57:01 +03:00
Fire-Head 1c11a8081f mips overdose 2020-06-28 00:01:51 +03: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
eray orçunus d930a25d94 DrawStandardMenus, VC menu array and minor fixes 2020-06-01 18:32:34 +03:00
Nikolay Korolev c1c163d78c game logic 2020-05-31 20:59:01 +03:00
Nikolay Korolev ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
nrb d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
Nikolay Korolev e248cbcc7d say goodbye to your saves 2020-05-24 14:01:01 +03:00
eray orçunus a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +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
eray orçunus 36e2bc95d3 Fix Windows build and premake 2020-05-11 20:10:01 +03:00
eray orçunus 8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02: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
Sergeanur 6a40c03442 Put camera modes compatibility under COMPATIBLE_SAVES 2020-05-03 00:15:28 +03:00
aap 4e630a1a38
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
2020-04-29 10:26:36 +02:00
Sergeanur 299bbc47ec Changing prefixes for some audio fields 2020-04-28 14:00:38 +03:00
Sergeanur fe353a7cc9 Fixes 2020-04-27 22:41:09 +03:00
eray orçunus c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03:00
Sergeanur fce2e02444 Fix savename buffer overflow 2020-04-18 23:58:43 +03:00
Sergeanur 555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Sergeanur b1fc7bc533 More refs removed 2020-04-16 11:50:45 +03:00
Sergeanur d455cd8a62 Default native resolution mode and small camera fixes 2020-04-16 00:46:09 +03:00
Sergeanur a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
Wes Hampson a19d5dbee1 Fixes 2020-04-13 11:20:57 -07:00
Wes Hampson dbf6e155ff GenericLoad() done 2020-04-12 15:47:12 -07:00
aap 34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
Fire-Head 3769170113 (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode 2020-04-09 02:52:38 +03:00
Sergeanur 97ffa1a658 Wrappers cleanup 2020-03-29 08:58:08 +03:00
aap e7c18fc17f removed windows.h for most .cpps 2020-03-27 20:53:47 +01:00
eray orçunus 0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03:00
Wes Hampson f35758a8f1 Use WriteDataToBufferPointer 2020-03-13 21:23:03 -07:00
Wes Hampson 3862cda231 Style fix, use CTimeStep 2020-03-13 13:47:53 -07:00
Wes Hampson 018fb3a929 Style fixes 2020-03-11 14:15:27 -07:00
Wes Hampson 81c4f75c63 Bugfixes, GenericSave() works now! 2020-03-11 14:08:10 -07:00
Wes Hampson c7f16879df GenericSave complete, still needs some testing 2020-03-11 00:12:40 -07:00
Wes Hampson 5bc51f8462 Save SimpleVars, Scripts, and a few others 2020-03-10 20:27:41 -07:00
Wes Hampson 4fee2cbdd9 Begin work on GenericSave 2020-03-05 01:44:42 -08:00
eray orçunus f307839a2b CPlayerPed done 2020-02-13 22:02:45 +03:00
Sergeanur 7df91ca2f9 Fix corrupt saves 2020-01-31 14:33:46 +02:00