mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-03-22 16:15:07 +00:00
Code Issues Projects Releases Wiki Activity
3377 commits 3 branches 0 tags 56 MiB
Commit graph

112 commits

Author SHA1 Message Date
Nikolay Korolev 016ff5b4aa sync with upstream 2020-12-08 12:00:24 +03:00
Walied K. Yassen 190bcf68f3
Implement DAMAGE_EFFECT_SMASH_VEGPALM and code style fixes 2020-12-07 01:11:40 +02:00
Nikolay Korolev 406f646949 pool stuff fix 2020-12-06 21:28:40 +03:00
Walied K. Yassen 1dcd7c5b14
Fix the code style issues 2020-11-30 08:36:06 +02:00
Walied K. Yassen ac7ea2b9fa
Implement the missing damage effects and fix the existing ones 2020-11-30 02:09:35 +02:00
Walied K. Yassen a1ab82b188
Implement MI_BEACHBALL behaviours 2020-11-29 09:14:15 +02:00
Walied K. Yassen afe70003f4
Fix MI_RCBOMB gravity force and treat MI_PETROLPUMP2 as explosive 2020-11-29 08:53:54 +02:00
Walied K. Yassen 03ef438a72
Fix CObject::DeleteAllTempObjectsInArea not considering the given point 2020-11-29 04:20:28 +02:00
aap 07fe099b4e neo screen droplets 2020-11-19 19:07:32 +01:00
Sergeanur e71da86a5c pragma twice 2020-11-16 15:05:29 +02:00
Sergeanur 23d294fef5 Possibly fix pickup money text 2020-11-08 21:59:13 +02:00
majestic c124e7381c CObject::Render 2020-11-01 00:25:35 -07:00
erorcun 07d1637342
Merge pull request #779 from Sergeanur/VC/Pickups 
Pickups Done
 2020-10-24 17:56:21 +03:00
Sergeanur 89a7007c6a ObjectData 2020-10-23 08:41:23 +03:00
Sergeanur 2709531f09 Rename CObject flag 2020-10-21 21:14:40 +03:00
Nikolay Korolev d7789661cd Merge remote-tracking branch 'upstream/miami' into miami 2020-10-18 17:30:51 +03:00
Sergeanur 0d20f1c364 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/RoadBlocks.cpp
#	src/entities/Entity.h
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/render/Renderer.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/CarGen.cpp
#	src/weapons/BulletInfo.cpp
#	src/weapons/Weapon.cpp
 2020-10-18 17:15:49 +03:00
Sergeanur b91f6a4550 Setter for bIsStatic (became virtual in SA) 2020-10-18 16:40:06 +03:00
Nikolay Korolev c856d88691 object field renamed 2020-10-18 12:34:34 +03:00
Nikolay Korolev 1195f3db7b saves part 1 2020-10-17 18:50:16 +03:00
eray orçunus a01b14f301 Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
Sergeanur 9b47625115 More stinger fix 2020-09-02 21:03:02 +03:00
Sergeanur fa7334c74f Stinger fixes 2020-09-02 20:55:28 +03:00
eray orçunus 16e10d788a Enable Stinger 2020-09-01 21:10:35 +03:00
Sergeanur 3bb0e78e1c Rename vars 2020-09-01 12:35:59 +03:00
Sergeanur 6778640b52 Rename states 2020-08-31 21:35:26 +03:00
Sergeanur df67c73d81 vars rename 2020-08-31 21:21:50 +03:00
Sergeanur 024f0a5027 use SetOrientation 2020-08-31 21:15:04 +03:00
Sergeanur 8a0a29c64e Stinger done 2020-08-31 21:09:48 +03:00
Fire-Head d2d8bea51e rem pobj assert 2020-08-09 01:30:57 +03:00
aap 40185161b8
Merge pull request #670 from Fire-Head/miami 
Miami Shadows
 2020-08-07 10:18:35 +02:00
majestic 394134f774 CEscalators done 2020-08-03 15:31:42 -07:00
Fire-Head 224fd77641 NULL -> nil 2020-07-31 21:21:58 +03:00
Fire-Head 1803dcc873 miami shadows 2020-07-29 12:17:53 +03:00
aap 0acade08ca
Merge pull request #647 from Fire-Head/miami 
miami CParticleObject
 2020-07-04 21:24:17 +02:00
eray orçunus 716740f918 Peds & fixes 2020-07-04 15:31:28 +03:00
Fire-Head 4c65ec28d6 NULL->nil 2020-07-03 20:26:35 +03:00
Fire-Head d4004805f5 miami pobj 2020-07-03 02:18:06 +03:00
aap 21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
aap a53ca58e56 CPhysical 2020-05-22 14:27:16 +02:00
eray orçunus 2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
aap bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
Nikolay Korolev 6510b15704 script revision 2020-05-19 01:49:09 +03:00
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