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

68 commits

Author SHA1 Message Date
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
aap b11715608f few fixes 2020-05-11 09:18:41 +02:00
aap 198b80f560 RpAnimBlend and frame updates 2020-05-10 23:47:53 +02:00
bigbossbro08 bd302ecca1 Merge remote-tracking branch 'upstream/master' 2020-05-10 22:05:45 +06:00
bigbossbro08 c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
aap 5b605c1271 some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
Nikolay Korolev 00cdcef36a some updates for script 2020-05-10 17:54:13 +03:00
bigbossbro08 af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
aap f7aa4e108a added some anim groups 2020-05-10 14:22:22 +02:00
aap e9fbd2ccfd CWeaponModelInfo 2020-05-10 10:04:20 +02:00
aap c020992e4d back to ped.ifp 2020-05-09 19:29:31 +02:00
aap f23ecfbc84 accidentally swapped reft and light 2020-05-09 17:29:13 +02: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
aap d26ffdd05f fixes for anims 2020-05-09 12:04:48 +02:00
aap e8c0619226 named anim assoc flags 2020-05-09 09:51:31 +02:00
aap 3f09ec0744 named anim assoc flags 2020-05-09 09:50:00 +02:00
Sergeanur 4b8d6a3223 Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimBlendAssocGroup.cpp
#	src/animation/AnimBlendAssociation.cpp
#	src/animation/AnimManager.cpp
#	src/core/Streaming.cpp
 2020-05-09 02:56:53 +03:00
aap f12e76fa13 more small fixes 2020-05-08 20:58:40 +02:00
aap 08de6d487a anims streaming 2020-05-08 20:56:42 +02:00
aap 2eee4c5176 most of animation system done; little stuff here and there 2020-05-08 15:59:57 +02:00
Sergeanur d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
aap 241352e312 real names (from LCS) 2020-04-25 14:03:20 +02:00
aap ac19de45b8 few fixes 2020-04-25 00:41:17 +02:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
eray orçunus c80403a2e0 Crossplatform work continues 2020-04-22 05:24:02 +03: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
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
Sergeanur 881d61f811 Merge remote-tracking branch 'samler/world' into Standalone 2020-04-17 10:16:30 +03:00
Fire-Head a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
eray orçunus 2c2da558ca Some refs removed, little fixes and teleport 2020-04-16 22:19:56 +03:00
saml1er e52a02fb9e Merge branch 'master' into world 
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
 2020-04-17 00:01:53 +05:00
saml1er 52d0d811b7 Reverse CWorld 2020-04-16 23:46:08 +05:00
Sergeanur b1fc7bc533 More refs removed 2020-04-16 11:50:45 +03:00
Sergeanur 0ddc04743c Fix cutscene camera latency 2020-04-11 13:21:21 +03:00
Nikolay Korolev a27f7359ff fix 2020-04-10 12:20:04 +03:00
Sergeanur 8917567508 Fixing mixed IsCutsceneProcessing and IsRunning 2020-04-10 11:23:35 +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
eray orçunus be7d1d1a63 Frontend, Peds & logic and overflow fixes 2019-11-12 23:34:28 +01:00
erorcun 0df15bb73d
Merge pull request #263 from Sergeanur/strcmp 
Implemented faststrcmp, faststricmp, strcasecmp
 2019-11-09 18:06:20 +03:00
eray orçunus ad69a319cb The Peds 2019-10-30 02:41:47 +03:00
Sergeanur c202fc3b55 Implemented faststrcmp, faststricmp, strcasecmp 2019-10-30 01:35:31 +02:00
eray orçunus 3cb0a62ee6 Peds 2019-09-20 22:40:33 +03:00
eray orçunus 14c7c1d7ca World and Peds 2019-09-12 03:46:15 +03:00
Filip Gawin 01ac2929cd Cleanup 2019-08-27 22:29:23 +02:00
Filip Gawin 2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00