a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-05 15:25:55 +00:00
Code Issues Projects Releases Wiki Activity
1999 commits 4 branches 2 tags 50 MiB
Commit graph

69 commits

Author SHA1 Message Date
Sergeanur 76dd769085 Merge branch 'master' into miami 2020-05-16 05:07:39 +03:00
Sergeanur ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +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
Filip Gawin c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
aap fab453efde fixed bug in cutscene head 2020-05-12 09:45:01 +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
bigbossbro08 c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
bigbossbro08 af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
aap 97d5698e0c peds starting to work 2020-05-09 17:05:26 +02:00
aap 989ded6052 removed cutscene heads 2020-05-09 13:00:39 +02:00
Nikolay Korolev 40888e9486 car control and friends 2020-05-07 16:57:49 +03:00
aap a76b88da08 fixed object collision stuff at least somewhat 2020-05-06 17:17:07 +02:00
aap c11912a8ec sorted out object collision enums 2020-05-06 17:14:34 +02:00
aap a2b89c6a18 sorted out object collision enums 2020-05-06 17:13:46 +02:00
aap 224727c14d got rid of superfluous enum 2020-05-06 16:58:57 +02:00
aap b4bbd91921 got rid of superfluous enum 2020-05-06 16:56:59 +02:00
aap 25a4091fa8 setting some areas so objects dont disappear 2020-05-06 14:43:23 +02:00
Sergeanur 4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
Sergeanur e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
Sergeanur 52390062b3 SetPosition, part 2 2020-05-02 15:28:19 +03:00
Sergeanur 7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
Sergeanur 299bbc47ec Changing prefixes for some audio fields 2020-04-28 14:00:38 +03:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Fire-Head 75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
eray orçunus 1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Filip Gawin d6314f9564 Revert "Part one" 
This reverts commit 63951d9b95.
 2020-04-18 12:29:28 +02:00
Filip Gawin 2b1570de70 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-04-18 12:08:38 +02:00
Sergeanur 555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
Filip Gawin 63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
Sergeanur b9c8ce0d37 Merge remote-tracking branch 'Fire-Head/master' into Standalone 
# Conflicts:
#	src/render/Coronas.cpp
 2020-04-17 10:17:38 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
saml1er 52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
Nikolay Korolev c593599fc5
Merge pull request #399 from saml1er/master 
CObject complete
 2020-04-12 12:05:49 +03:00
saml1er ff16ba7801 CObject fixes 2020-04-11 22:31:32 +05:00
aap df872a26b0 fuck you git, i fixed this already 2020-04-10 23:21:34 +02:00
saml1er 4f00576a8c Addendum to previous commit 2020-04-10 21:59:49 +05:00
saml1er 16360eb6df Refactor CObject::ObjectDamage switch statement 2020-04-10 21:52:02 +05:00
saml1er c2b00d7ad9 Fix cast in CObject::ObjectDamage 2020-04-10 19:37:09 +05:00
saml1er 5544325acb Refactor CObject::ObjectDamage 2020-04-10 19:32:42 +05:00
saml1er bb21cff639 Fix Object.h and Object.cpp indentation 2020-04-10 17:03:02 +05:00
saml1er a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
aap 6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
Fire-Head 13fb853fd8 Glass done 2020-04-02 00:04:56 +03:00
eray orçunus 112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
aap 739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
Filip Gawin 8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00