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

198 commits

Author SHA1 Message Date
eray orçunus 096ecc1d14 Some wait states 2020-06-06 22:16:59 +03:00
majestic 20ffcb68b6 some orig chearts 
- weapon model indices added
- orig weapon cheats added
- some cheats' names changed to original ones
 2020-06-03 14:48:26 -07:00
eray orçunus 5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
aap 2ca3c50463 some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
aap 04a91761df some vehicle cleanup 2020-06-02 23:34:53 +02:00
aap 12cc0e4132 getting rid of strnicmp 2020-05-31 22:35:29 +02:00
aap bae3a3e72f fixed to CAutomobile and friends 2020-05-31 17:45:26 +02:00
aap 7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
aap 7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
eray orçunus 5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03: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 fd4cd3e8f1
Merge pull request #569 from aap/miami 
CEntity and friends
 2020-05-20 12:41:12 +02:00
aap 0b0ba49abc small fixes 2020-05-19 21:42:55 +02:00
aap bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
eray orçunus 99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
eray orçunus a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
Nikolay Korolev 3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
Nikolay Korolev a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
aap 8a7210cad1
Merge pull request #555 from erorcun/miami 
Weapon fixes and thingies
 2020-05-17 20:20:14 +02:00
eray orçunus 84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap 964acba083 fix head/hand atomics 2020-05-17 15:16:12 +02:00
Nikolay Korolev b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Nikolay Korolev e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
eray orçunus acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
aap 9b162554ca fixed skinned cutscene head 2020-05-14 12:32:51 +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 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 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
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
eray orçunus 8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap b11715608f few fixes 2020-05-11 09:18:41 +02:00
aap 9e842f1628 vehicle model descriptions; a bit of heli code 2020-05-10 20:51:29 +02:00
aap d9a8bab631 update file loader for new VC fields 2020-05-10 18:14:14 +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
Nikolay Korolev 653d808417 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-10 18:26:13 +03:00
aap 5b605c1271 some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
aap 0552d49fce CVehicleModelInfo 2020-05-10 17:09:14 +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 f7300c7a27 CPedModelInfo 2020-05-10 13:08:02 +02:00
Nikolay Korolev 1f3f82eedc Merge remote-tracking branch 'upstream/miami' into miami 2020-05-10 12:37:43 +03:00
aap 58d9e9cd59 CSimpleModelInfo 2020-05-10 11:34:26 +02:00
Nikolay Korolev a827f0dd55 sync with upstream 2020-05-10 12:26:32 +03:00
Nikolay Korolev 2f7d2fa3ad more car control 2020-05-10 12:25:30 +03:00
aap 1b936f6ffb CClumpModelInfo; little fixes 2020-05-10 11:20:27 +02:00
aap e9fbd2ccfd CWeaponModelInfo 2020-05-10 10:04:20 +02:00
aap 97d5698e0c peds starting to work 2020-05-09 17:05:26 +02:00
Nikolay Korolev 7e753c2596 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
aap a8f1505517 small fixes 2020-05-07 21:56:09 +02:00
aap c715569d1d CBaseModelInfo done 2020-05-07 21:55:54 +02:00
aap 19b21cafcd CZoneInfo mostly done; not its dependencies 2020-05-07 17:53:38 +02:00
aap 5c30b3a188 got rid of superfluous enum; update librw 2020-05-07 12:48:57 +02:00
aap 152c7c452c few changes for vehicle model info 2020-05-07 12:48:09 +02:00
aap 05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
aap 876e402d1e dont hardcode first vehicle ID; little fix for roadblocks 2020-05-07 09:38:07 +02:00
aap a8d8c0690d changed default ID ranges. old default.ide incompatible now 2020-05-06 23:39:38 +02:00
aap 965ea93a61 checked some of streaming for VC changes 2020-05-06 21:54:43 +02:00
aap f1c1f56b12 CSphere and CBox for CColModel 2020-05-06 17:56:38 +02:00
aap 68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
aap 7428590457 some miami limits 2020-05-05 18:31:53 +02: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 b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur 4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
aap fd462c9b55 implemented most of streamed collisions and big buildings 2020-05-05 14:00:20 +02:00
aap b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Nikolay Korolev 34ef766c67 Merge remote-tracking branch 'upstream/master' 2020-04-25 12:15:29 +03:00
aap f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Nikolay Korolev 9e65eb34ec 1.1 patch stuff 2020-04-19 17:38:10 +03: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 6b1093f1c8 CWorld complete 2020-04-17 03:20:34 +05:00
Nikolay Korolev 5cb7e2e42a
Merge pull request #440 from Fire-Head/master 
CWeapon done, fixes
 2020-04-15 23:28:09 +03:00
Fire-Head daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Nikolay Korolev 3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
erorcun e2fb0578b5
Merge pull request #413 from erorcun/erorcun 
CFileLoader last funcs and Frontend cleanup
 2020-04-13 15:36:05 +03:00
eray orçunus 60c412149d CFileLoader last funcs and Frontend cleanup 2020-04-13 05:42:02 +03:00
aap 3aae52d220 finished CBoat 2020-04-13 00:20:44 +02:00
Nikolay Korolev 38dee74a5a CPools 2020-04-11 21:01:39 +03:00
aap 34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
aap 6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
Nikolay Korolev 775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
eray orçunus d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
eray orçunus ff92b822b6 CPopulation 1 2020-02-17 15:57:50 +03:00
Sergeanur b06ad84768 Fixing possible leaks in CModelInfo::ShutDown 2020-01-23 20:08:42 +02:00
Sergeanur 9eb599ff58 Plane crashfix and more 2020-01-23 17:29:36 +02:00
Sergeanur 77515f04e0 ConstructMloClumps 2020-01-21 09:47:24 +02:00
Sergeanur a9f39d8284 MLO, XtraCompsModelInfo, MovingThing, Solid 2020-01-20 22:58:13 +02:00
Sergeanur c202fc3b55 Implemented faststrcmp, faststricmp, strcasecmp 2019-10-30 01:35:31 +02:00