Commit Graph

1208 Commits

Author SHA1 Message Date
6075bf3fc2 Merge pull request #959 from Fire-Head/lcs
Lcs Particle
2021-01-16 22:00:02 +03:00
e99cd8052c sync 2021-01-16 20:06:55 +03:00
d25420a33b fix 2021-01-16 20:06:10 +03:00
df98d04d79 fix 2021-01-16 20:04:17 +03:00
9a7442c2fd script7 2021-01-16 20:02:41 +03:00
ef97134f50 sync 2021-01-16 18:17:42 +03:00
c28ed42617 script6 2021-01-16 18:16:35 +03:00
eb5fdac918 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.h
2021-01-16 16:56:24 +02:00
19505b664c consistency fix 2021-01-16 13:42:46 +03:00
32ab01cd32 consistency fix 2021-01-16 13:42:04 +03:00
b4f6a9336b more fix 2021-01-16 13:35:36 +03:00
7ea77d8da4 more fix 2021-01-16 13:32:41 +03:00
708d5831e4 Script5.cpp 2021-01-16 13:26:46 +03:00
193fb2a381 fix 2021-01-16 13:24:22 +03:00
8989b5ea39 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-15 19:13:05 +03:00
4bd7bafd7c Merge branch 'miami' into lcs
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	premake5.lua
#	src/control/Script2.cpp
#	src/control/Script8.cpp
2021-01-15 17:57:35 +02:00
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
8b6bcef4b7 Merge branch 'lcs' into lcs-dev 2021-01-14 23:21:43 +03:00
c00ebef329 incoming "fuck" commit 2021-01-14 23:21:17 +03:00
0b0d286f5c incoming "fuck" commit 2021-01-14 23:15:12 +03:00
6a93cc49be fix 2021-01-14 00:15:45 +03:00
daf1de550c fix 2021-01-13 22:02:28 +03:00
a9ab3ea5b4 fix 2021-01-13 20:55:54 +03:00
d63e3f1559 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 20:18:26 +03:00
7388cc8a78 Merge branch 'lcs' into lcs-dev 2021-01-13 19:47:00 +03:00
3e198086e3 some script 2021-01-13 16:01:49 +03:00
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
aap
e3a261d29c rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:20 +01:00
94f25a429f Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  more securom fixes
  move stuff back into class; securom comments
  More font fixes
  fix
  fix CreateInstance virtual overload order
  escalator fix
  ProcessWheel bug
2021-01-13 02:08:13 +02:00
ec17355056 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 02:55:47 +03:00
e122a75dd2 more securom fixes 2021-01-13 00:28:51 +01:00
232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00
4505b8795a fix 2021-01-13 01:37:25 +03:00
510ad223f0 Script4.cpp 2021-01-13 01:34:49 +03:00
3e6016dc6e Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 00:11:15 +03:00
3648ef4687 lcs particle 2021-01-13 00:07:24 +03:00
f73e870bde Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  bug of the decade
  big oof
  colmodel fix
2021-01-12 22:29:50 +02:00
e6aa9f9d4e big oof 2021-01-12 20:56:49 +03:00
6cfc61ac0e big oof 2021-01-12 20:54:52 +03:00
1c3f3c1842 script4 2021-01-12 20:52:31 +03:00
8888ee3974 Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
2021-01-12 13:22:44 +02:00
cb4b4d584c Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
2021-01-12 12:55:07 +02:00
167a841010 Merge branch 'lcs-dev' into lcs 2021-01-12 12:17:22 +03:00
2736c3a9d1 fix 2021-01-12 12:16:52 +03:00
7e888a6379 Fix collective commands 2021-01-12 02:29:10 +02:00
dcb4eedeb0 Fix collective commands 2021-01-12 02:28:08 +02:00
2ce6e59d9b PLAY_ANNOUNCEMENT 2021-01-11 23:55:45 +02:00
42e4e7c063 fix 2021-01-12 00:43:26 +03:00
091b40cb39 script3.cpp 2021-01-12 00:42:11 +03:00
a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00