Commit Graph

1536 Commits

Author SHA1 Message Date
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
cfac29b0ef Remove restrictions in CGame::Process 2021-01-23 15:09:34 +02:00
aap
20bcd4bd69 colstore done 2021-01-23 12:40:23 +01:00
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
bdb216bf7c fix 2021-01-22 20:59:57 +03:00
e019bd91fd Reenable PS2_AUDIO_PATHS 2021-01-22 19:46:50 +02:00
ea916b6ae5 Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  fix config.h
  small premake fix
2021-01-22 19:45:58 +02:00
cc6d5374d5 fix config.h 2021-01-22 18:41:58 +01:00
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
feb993e751 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
b5deee823c Load LCS radar blips 2021-01-22 04:00:17 +02:00
7091ab5e75 Fix save/load and brief menus 2021-01-22 02:44:32 +02:00
e6d9a0d1ad Get rid of outro screen 2021-01-22 02:19:02 +02:00
aap
c8236d0dd2 Merge pull request #976 from Fire-Head/lcs
Lcs pobj
2021-01-22 01:12:03 +01:00
aap
ce77e80414 Merge pull request #963 from Nick007J/lcs
all LCS script commands
2021-01-22 00:59:20 +01:00
aap
de10f0dda6 Merge pull request #975 from aap/lcs
loadscreens, not accurate
2021-01-22 00:59:13 +01:00
37b9ba5bd7 lcs pobj 2021-01-22 02:59:08 +03:00
aap
035d655e47 Merge pull request #972 from Sergeanur/lcsfont
Partial CFont
2021-01-22 00:59:07 +01:00
06d8860d42 Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  fuck
  bletch
  fixed anisotropic filtering; updated librw
  fix
2021-01-22 01:58:38 +02:00
9d2509ab5b A bit of frontend and GXT 2021-01-22 01:56:47 +02:00
aap
f7ab5cb7c4 loadscreens, not accurate 2021-01-22 00:41:34 +01:00
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
aap
e99589a3eb fixed anisotropic filtering; updated librw 2021-01-21 22:17:35 +01:00
a5be17d941 Merge branch 'lcs-dev' into lcs 2021-01-20 21:15:03 +03:00
23831e38e6 sync 2021-01-20 21:14:12 +03:00
ad745aae63 some more script 2021-01-20 21:12:42 +03:00
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
c7c7eff918 Get rid of bitfields in CPool
# Conflicts:
#	src/core/templates.h
2021-01-20 19:24:08 +02:00
3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
ba34d72183 free cam inversion fix 2021-01-20 13:59:17 +01:00
8590457d41 free cam inversion fix 2021-01-20 13:57:03 +01:00
b4b4c996ba Merge branch 'lcs-dev' into lcs 2021-01-20 12:12:56 +03:00
b1454276ed Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-20 12:12:46 +03:00
aa0f77043c script fixes 2021-01-20 12:12:26 +03:00
aap
2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
dac4dd560a saves 2021-01-19 23:34:37 +03:00
aap
7e136a792f work on colourfilters 2021-01-19 20:42:16 +01:00
aap
8baae4c77f PSP rendering and shader cleanup 2021-01-19 11:38:51 +01:00
923abb94d8 Merge branch 'lcs-dev' into lcs 2021-01-19 00:03:52 +03:00
47c697feca fixes 2021-01-18 23:58:26 +03:00
177680216c fix 2021-01-18 22:30:18 +03:00
4f36a1fb77 sync 2021-01-18 22:20:44 +03:00
14a1d3d251 Merge branch 'lcs' into lcs-dev 2021-01-18 22:20:27 +03:00
239dd55146 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-18 22:19:50 +03:00
c09297997e script full 2021-01-18 22:19:30 +03:00
776693235c fix 2021-01-18 20:10:13 +01:00
b5c09965a9 some free cam fixes for controller 2021-01-18 20:10:13 +01:00
20dabf0b49 fix 2021-01-18 17:30:18 +01:00
df4e22e3d0 some free cam fixes for controller 2021-01-18 17:25:31 +01:00
aap
2b4b00b388 Merge pull request #960 from withmorten/miami
add the bad crack "features" behind SECUROM define
2021-01-17 20:06:25 +01:00