Commit graph

1084 commits

Author SHA1 Message Date
Nikolay Korolev
708d5831e4 Script5.cpp 2021-01-16 13:26:46 +03:00
Nikolay Korolev
8b6bcef4b7 Merge branch 'lcs' into lcs-dev 2021-01-14 23:21:43 +03:00
Nikolay Korolev
c00ebef329 incoming "fuck" commit 2021-01-14 23:21:17 +03:00
Nikolay Korolev
a9ab3ea5b4 fix 2021-01-13 20:55:54 +03:00
Nikolay Korolev
7388cc8a78 Merge branch 'lcs' into lcs-dev 2021-01-13 19:47:00 +03:00
Nikolay Korolev
3e198086e3 some script 2021-01-13 16:01:49 +03: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
aap
e3a261d29c rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:20 +01:00
Sergeanur
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
withmorten
e122a75dd2 more securom fixes 2021-01-13 00:28:51 +01:00
withmorten
232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00
Nikolay Korolev
4505b8795a fix 2021-01-13 01:37:25 +03:00
Nikolay Korolev
510ad223f0 Script4.cpp 2021-01-13 01:34:49 +03:00
Nikolay Korolev
e6aa9f9d4e big oof 2021-01-12 20:56:49 +03:00
Nikolay Korolev
6cfc61ac0e big oof 2021-01-12 20:54:52 +03:00
Nikolay Korolev
1c3f3c1842 script4 2021-01-12 20:52:31 +03:00
Sergeanur
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
Sergeanur
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
Nikolay Korolev
167a841010 Merge branch 'lcs-dev' into lcs 2021-01-12 12:17:22 +03:00
Nikolay Korolev
2736c3a9d1 fix 2021-01-12 12:16:52 +03:00
Sergeanur
7e888a6379 Fix collective commands 2021-01-12 02:29:10 +02:00
Sergeanur
dcb4eedeb0 Fix collective commands 2021-01-12 02:28:08 +02:00
Sergeanur
2ce6e59d9b PLAY_ANNOUNCEMENT 2021-01-11 23:55:45 +02:00
Nikolay Korolev
42e4e7c063 fix 2021-01-12 00:43:26 +03:00
Nikolay Korolev
091b40cb39 script3.cpp 2021-01-12 00:42:11 +03:00
Sergeanur
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
Nikolay Korolev
c7052b3d6f fuck 2021-01-11 20:51:18 +03:00
Nikolay Korolev
81b5e66dd4 fixes 2021-01-11 17:18:25 +03:00
Nikolay Korolev
625376f0d3 500-599 2021-01-11 17:14:56 +03:00
Nikolay Korolev
53a99cb9ee script2 2021-01-11 02:35:03 +03:00
Nikolay Korolev
75d1715442 script file 1 done (hopefully) 2021-01-10 22:58:06 +03:00
Fire-Head
adc7127055 fix pickup coronas 2021-01-10 22:24:21 +03:00
Nikolay
b0e395e853
Merge pull request #942 from majesticCoding/lcs
just original marker's colors
2021-01-10 13:44:40 +03:00
Seemann
ad7855f995 Update command definitions 2021-01-10 12:27:51 +03:00
Seemann
c2265e29d2 Update command definitions 2021-01-09 23:59:47 -05:00
Nikolay Korolev
f5b97f1e8a can finish first mission 2021-01-09 22:24:18 +03:00
majestic
2639fba582 just original marker color 2021-01-09 10:26:07 -08:00
Nikolay Korolev
203dff9165 script 2021-01-09 20:33:21 +03:00
aap
e906a807f1 moved new renderer 2021-01-09 18:22:09 +01:00
Nikolay Korolev
c1e68b2c61 fix 2021-01-09 17:43:21 +03:00
Nikolay Korolev
97c95b7639 more script 2021-01-09 17:35:27 +03:00
Nikolay
b7f9bfda4a
fail 2021-01-09 02:41:27 +03:00
Nikolay Korolev
2bf88fcef5 Merge branch 'lcs' into lcs-dev 2021-01-09 00:30:13 +03:00
Nikolay Korolev
a9559f03b0 lcs script mode 2021-01-09 00:20:09 +03:00
Sergeanur
af09cb06f5 Merge branch 'miami' into lcs
* miami:
  Use original names
2021-01-08 21:53:42 +02:00
Sergeanur
faa9e6441b Use original names 2021-01-08 21:53:11 +02:00
Sergeanur
4debd89d8e Merge branch 'miami' into lcs
# Conflicts:
#	src/render/Timecycle.cpp
2021-01-08 20:24:43 +02:00
Sergeanur
e9001207ea Disable water creatures 2021-01-08 18:26:35 +02:00
Nikolay Korolev
613d08d3e2 Merge branch 'lcs-dev' into lcs 2021-01-08 18:59:14 +03:00
Nikolay Korolev
e92666d988 wtf 2021-01-08 18:57:59 +03:00