mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-01-25 07:00:59 +00:00
Code Issues Projects Releases Wiki Activity
4701 commits 3 branches 0 tags 56 MiB
Commit graph

300 commits

Author SHA1 Message Date
Sergeanur eaebaa6db3 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp
 2021-06-28 05:16:21 +03:00
Sergeanur f8297df9c5 Redo ReadSaveBuf + common.h cleanup 2021-06-28 05:12:54 +03:00
Sergeanur 7e7a2b74cd Fixes 2021-06-25 01:16:03 +03:00
aap 29d47da61e CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:45:45 +03:00
aap e014bb5359 CEntity done; C(Vu)Vector fixes and cleanup 2021-06-24 21:45:21 +03:00
aap 93e9929925 CEntity and C(Vu)Vector fixes and cleanup 2021-06-24 21:34:33 +03:00
erorcun 618d689dff Pool fixes + peds not forming circle fix 2021-06-24 21:34:28 +03:00
Sergeanur 19dd95a1cb Merge branch 'miami' into lcs 
* miami:
  Pool fixes + peds not forming circle fix
 2021-05-18 08:12:47 +03:00
Sergeanur 3596897961 Merge pull request 'Pool fixes + peds not forming circle fix' (#4) from erorcun/re3:miami into miami 
Reviewed-on: https://git.jacksmininetwork.co.uk/re/re3/pulls/4
 2021-05-18 04:33:47 +00:00
Sergeanur 8f54093de1 Merge branch 'miami' into lcs 
# Conflicts:
#	src/core/World.cpp
 2021-05-10 02:48:56 +03:00
Sergeanur 3dda658e42 Use some GetMatrix/SetMatrix logic based on SA 
# Conflicts:
#	src/control/Pickups.cpp
#	src/control/RoadBlocks.cpp
#	src/core/World.cpp
#	src/entities/Entity.cpp
#	src/objects/CutsceneHead.cpp
#	src/objects/Object.cpp
 2021-05-10 02:45:04 +03:00
erorcun 62b8f0f553 Pool fixes + peds not forming circle fix 2021-03-06 19:28:59 +03:00
Sergeanur 9647901ba0 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-01-25 19:35:03 +02:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Sergeanur cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
 2021-01-22 15:04:09 +02:00
withmorten feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
aap c8236d0dd2
Merge pull request #976 from Fire-Head/lcs 
Lcs pobj
 2021-01-22 01:12:03 +01:00
Fire-Head 37b9ba5bd7 lcs pobj 2021-01-22 02:59:08 +03:00
Sergeanur cc94419a72 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
 2021-01-20 19:32:03 +02:00
Sergeanur 3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
aap a672860c40 initial work on vehicles 2021-01-18 10:59:19 +01:00
aap 913a001375 vehicle fixes 2021-01-17 10:00:41 +01:00
Sergeanur ff057838ec Merge branch 'miami' into lcs 
* miami:
  Fix backface culling of cutscene objects
  more renames
  anim velocity union
  rename m_vehEnterType -> m_vehDoor
  Port cmake improvements to miami
  some loose ends
  move TODO to Readme
  Fix build without FIX_BUGS, divide to 0 fixes
 2021-01-13 14:56:25 +02:00
erorcun 542a5393ac Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 03:08:50 +03:00
aap 225b8953fd streaming fixes 2021-01-09 11:43:58 +01:00
Sergeanur faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
Sergeanur 09c213738b Fix CEntity::UpdateRwFrame 2021-01-04 22:27:51 +02:00
erorcun 22e8202d27 Entity/Physical proof-read 1 2021-01-04 13:41:41 +03:00
Sergeanur b9e97ab79d Reorder CEntity functions into their original order 2020-12-29 13:55:26 +02:00
Sergeanur be92b57b54 buildings directory 
# Conflicts:
#	premake5.lua
 2020-12-20 12:40:59 +02:00
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
aap c17ccc50ab get rid of all PED_SKIN defines 2020-12-18 17:27:18 +01:00
aap ccbbde549e
Merge pull request #869 from Nick007J/miami 
garages revision + fixes
 2020-12-09 09:55:50 +01:00
withmorten 4c0744260d uint8 enums fixed 2020-12-07 01:59:17 +01:00
withmorten 4696e3f9c8 uint8 enums fixed 2020-12-07 00:36:40 +01:00
Nikolay Korolev 406f646949 pool stuff fix 2020-12-06 21:28:40 +03:00
aap d5bc382cb5 GTA_VERSION define and some config.h cleanup 2020-11-29 21:29:48 +01:00
aap d857758c16 start using CMemoryHeap 2020-11-26 17:39:59 +01:00
Sergeanur 9bb8ebaa10 Make collision code placement more like original (+ small fixes) 
# Conflicts:
#	premake5.lua
#	src/CMakeLists.txt
#	src/collision/Collision.cpp
#	src/core/Collision.h
 2020-11-16 00:36:54 +02:00
Sergeanur a6f5f4634c Make collision code placement more like original (+ small fixes) 2020-11-15 19:51:35 +02: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
majestic e7ef45a606 CWaterCreatures 2020-10-10 17:49:54 -07:00
eray orçunus a01b14f301 Fix sniper and water creatures bug, mark some files 2020-10-09 12:24:21 +03:00
majestic 7861992fe6 CWaterCreatures 2020-10-08 05:59:08 -07:00
Nikolay Korolev e5faeea2e5 wall climb cheat from LCS 2020-09-11 18:46:16 +03:00
aap bb948904b6 small stuff 2020-08-19 21:58:00 +02:00
Fire-Head 224fd77641 NULL -> nil 2020-07-31 21:21:58 +03:00
Fire_Head 52e77c6634
Merge pull request #1 from GTAmodding/miami 
Miami
 2020-07-29 12:20:02 +03:00
Fire-Head 1803dcc873 miami shadows 2020-07-29 12:17:53 +03:00