a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 16:50:00 +00:00
Code Issues Projects Releases Wiki Activity
1975 commits 4 branches 2 tags 50 MiB
Commit graph

1604 commits

Author SHA1 Message Date
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
aap 704a5c158f
Merge pull request #547 from Nick007J/master 
a few bugfixes
 2020-05-14 14:39:23 +02:00
aap c21061a199 fixed RotateTorso 2020-05-14 14:29:39 +02:00
Nikolay Korolev b01987719e
fixed script error 2020-05-14 15:26:59 +03:00
Nikolay Korolev 8e0b132f43 it works differently 2020-05-14 14:03:56 +03:00
Nikolay Korolev 9d4d83db0d some fixes 2020-05-14 14:01:24 +03:00
aap 9b162554ca fixed skinned cutscene head 2020-05-14 12:32:51 +02:00
aap f5345f59ea blacklist for glfw "joysticks" 2020-05-14 00:09:45 +02:00
shfil 7036e80fc6
Fix calloc in CdStreamPosix 2020-05-13 17:48:07 +02:00
Nikolay Korolev 94bf7d9ea1 Merge remote-tracking branch 'upstream/master' 2020-05-13 17:34:09 +03:00
Nikolay Korolev 1237941180 fixed traffic lights 2020-05-13 17:33:50 +03:00
Sergeanur 3f1001b86b More save/load alignment fixes 2020-05-13 16:24:00 +03:00
Nikolay Korolev 509d57edcb car control and cranes fixes 2020-05-13 13:29:17 +03:00
Sergeanur 7aeac06fdb Redoing some pool reading for better alignment 2020-05-13 05:31:14 +03:00
Sergeanur 4ac53960f5 Changing save/load for CPlayerInfo because of alignment crap 2020-05-13 03:43:20 +03:00
Filip Gawin a0b3117ee4 Revert to memcpy 2020-05-13 02:01:42 +02: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 c40fcdf39a
fix shotgun 2020-05-12 22:48:28 +03:00
aap bcd2f8c64c remove debug shit 2020-05-12 20:44:37 +02:00
Nikolay Korolev dc444b9ca0 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-12 20:31:23 +03:00
Nikolay Korolev 180a1dc42b Merge remote-tracking branch 'upstream/master' 2020-05-12 20:23:03 +03:00
Nikolay Korolev 615bd1e878 garages fix 2020-05-12 20:22:35 +03: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
Nikolay Korolev ca6ed7f00f fix garages 2020-05-12 16:21:00 +03:00
Nikolay Korolev 4b566c26a3
fix garages 2020-05-12 14:08:42 +03:00
Nikolay Korolev 1afe36d0d0
fix garages 2020-05-12 14:07:47 +03:00
aap fab453efde fixed bug in cutscene head 2020-05-12 09:45:01 +02:00
Sergeanur 8f1a2825d4 Remove odd calculations for bullet hit smoke 2020-05-12 04:31:11 +03:00
Nikolay Korolev 9647587447 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-12 02:00:26 +03: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
aap ce2071e1e6
Merge pull request #535 from Nick007J/miami 
garages, carctrl, script
 2020-05-11 23:28:52 +02:00
aap 70a8234dad RenderPedCB from VC 2020-05-11 22:24:53 +02:00
aap 0eb5f93e96 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-11 22:21:26 +02:00
aap 6e4710b717 CVisibilityPlugins 2020-05-11 22:21:18 +02: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 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 95920d54f2 random fixes 2020-05-11 17:04:08 +02:00
aap d4250fc2c7 CRenderer 2020-05-11 17:03:44 +02:00
aap b11715608f few fixes 2020-05-11 09:18:41 +02:00