1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-10 18:09:16 +00:00
Commit graph

3703 commits

Author SHA1 Message Date
Nikolay Korolev 07a5cc6544 garages 2021-01-31 01:38:00 +03:00
Nikolay Korolev 01d4312251 Merge branch 'lcs' into lcs-dev 2021-01-30 20:27:26 +03:00
Nikolay Korolev 2c29ab5542 fix 2021-01-30 20:27:02 +03:00
Nikolay Korolev c3c2a4269d stuff 2021-01-30 20:23:30 +03:00
Nikolay Korolev a0c5d75f83 fixed bike bomb 2021-01-30 14:55:00 +03:00
Nikolay Korolev 4270180b8b fix 2021-01-29 00:05:57 +03:00
Nikolay Korolev 2d5f087041 fix 2021-01-28 23:25:59 +03:00
Nikolay Korolev 9fc0ec0bf4 I hate ATanOfXY pt 2 2021-01-28 02:41:21 +03:00
Nikolay Korolev 3f8e258055 fix 2021-01-28 01:50:10 +03:00
Nikolay Korolev fa2eb24ba2 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-28 01:08:18 +03:00
Nikolay Korolev 433baf5f3c fix 2021-01-28 01:08:06 +03:00
aap 70c1f0640d add missing ferry vehicle desc 2021-01-26 19:24:22 +01:00
Nikolay Korolev 9b1db9709b Merge branch 'lcs' into lcs-dev 2021-01-26 21:10:55 +03:00
Nikolay Korolev edb50b66a0 enum change 2021-01-26 20:46:42 +03:00
Sergeanur 0862c79b21 Merge branch 'miami' into lcs
* miami:
  Fix anim id in replay
2021-01-26 19:39:54 +02:00
Sergeanur 2d2625bf75 Fix anim id in replay 2021-01-26 19:39:05 +02:00
Nikolay Korolev 2fea28f194 fix 2021-01-26 02:27:57 +03:00
Nikolay Korolev 42d9d6abc8 syncd 2021-01-26 02:27:32 +03:00
Nikolay Korolev 46e63da4d8 sync 2021-01-26 02:25:47 +03:00
Nikolay Korolev d7bd0be53e garage stuff 2021-01-26 02:23:55 +03:00
Sergeanur cea8ad4b85 Fix check 2021-01-25 19:40:19 +02:00
Sergeanur 129d7333be Fix function dupe 2021-01-25 19:38:13 +02: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
Sergeanur c21e5f5e79 Move CRunningScript 2021-01-25 19:33:02 +02:00
erorcun 202ccd4c56 Support pads without L2-R2, add comments 2021-01-25 16:58:02 +03:00
withmorten 9d4053419b
Merge pull request #977 from withmorten/miami-cw
make building with Codewarrior 7 possible
2021-01-25 14:06:53 +01:00
aap 785bd8ebcc proper ini fix 2021-01-25 13:02:00 +01:00
aap a4c5b87b90 more bletcherous stuff 2021-01-25 10:45:38 +01:00
aap fef87b9219 fix some breakage 2021-01-25 10:43:12 +01:00
aap 4f591aa87a ini fixes 2021-01-25 10:30:57 +01:00
aap d6544933aa
Merge pull request #984 from aap/lcs
modelinfos
2021-01-25 10:30:34 +01:00
aap 453a16c978 modelinfo and visibility plg fixes 2021-01-24 23:25:12 +01:00
aap ce7f166ba3 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
shfil 1ab96abb91 Add cmake option for sanitizers 2021-01-24 21:36:13 +01:00
shfil 513d418771 Add cmake option for sanitizers 2021-01-24 21:35:53 +01:00
Sergeanur 0ad1426950 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/control/Script.cpp
2021-01-24 22:22:16 +02:00
erorcun 071e503856 Ped: car enter anim. fix 2021-01-24 20:12:36 +03:00
aap a202e67349 CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
withmorten 29fb996b00 make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
erorcun b728f8de64 Fix out of bound binding orders 2021-01-24 19:08:07 +03:00
Sergeanur e79e8b30e0 Partial hud 2021-01-24 17:21:50 +02:00
aap 1bee2caf5c CClumpModelInfo 2021-01-24 15:28:26 +01:00
aap 9361aeb8eb CTimeModelInfo and CWeaponModelInfo 2021-01-24 14:06:16 +01:00
aap 8cbae5d62a CSimpleModelInfo 2021-01-24 13:47:33 +01:00
shfil d68ec362dd
Fix CCollision::DistToLine 2021-01-24 12:36:43 +01:00
shfil ca1de3cd17
Fix CCollision::DistToLine 2021-01-24 12:35:45 +01:00
aap c1a7ded1e4 CBaseModelInfo 2021-01-24 00:07:45 +01:00
Nikolay Korolev 8cdc6b5d7c fix merge failure 2021-01-23 23:53:59 +03:00
Nikolay Korolev c4f0b4fb6d mission cleanup fix 2021-01-23 23:20:22 +03:00
Nikolay Korolev 4e477a17b2 mission cleanup fix 2021-01-23 23:17:41 +03:00