776d46aacb
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-11 10:23:59 +03:00
d781db6c0f
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# premake5.lua
2021-07-09 00:05:26 +03:00
72f6780905
Use CPad functions to check key states in script loader
2021-07-08 03:37:14 +03:00
79c010f082
fix macro redefinition warnings on win-glfw build
2021-07-08 01:44:55 +02:00
8a5afd0db2
sync
2021-06-25 10:15:19 +03:00
74867af2e7
Fixes
2021-06-24 21:50:09 +03:00
5bcdb933a7
Use bool8 in audio code
2021-06-24 21:34:32 +03:00
e38467ef3a
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# .github/workflows/reLCS_msvc_amd64.yml
# .github/workflows/reLCS_msvc_x86.yml
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# premake5.lua
# src/animation/AnimManager.cpp
# src/animation/AnimationId.h
# src/audio/MusicManager.cpp
# src/audio/audio_enums.h
# src/control/Script7.cpp
# src/core/FileLoader.cpp
# src/core/re3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/postfx.cpp
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_PS.hlsl
# src/extras/shaders/make_hlsl.cmd
# src/extras/shaders/obj/colourfilterVC_PS.cso
# src/extras/shaders/obj/colourfilterVC_PS.inc
# src/extras/shaders/obj/colourfilterVC_frag.inc
# src/peds/PedFight.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Particle.cpp
# src/render/WaterCannon.cpp
# src/skel/win/gtavc.ico
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
2021-02-16 18:08:19 +02:00
9b9ffc4b13
ferries
2021-02-07 23:29:49 +03:00
75a20216d9
sync
2021-01-31 01:38:43 +03:00
4270180b8b
fix
2021-01-29 00:05:57 +03:00
97351ad2c2
Use original animation names from VCS
2021-01-27 18:50:24 +02:00
c4f0b4fb6d
mission cleanup fix
2021-01-23 23:20:22 +03:00
4e477a17b2
mission cleanup fix
2021-01-23 23:17:41 +03:00
de32fbe75e
another backport
2021-01-23 23:16:38 +03:00
37d1aa4129
script fixes
2021-01-23 23:04:24 +03:00
965a3d6eec
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-01-23 02:36:34 +03:00
917cf44def
script coronas
2021-01-23 02:36:13 +03:00
c884edd923
cSmallHeap
2021-01-23 00:03:12 +02: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
d1317f8fa6
m_nWantedLevel -> GetWantedLevel()
2021-01-22 00:20:51 +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
aa0f77043c
script fixes
2021-01-20 12:12:26 +03:00
061fd25c61
fixes
2021-01-19 02:38:02 +03:00
47c697feca
fixes
2021-01-18 23:58:26 +03:00
c09297997e
script full
2021-01-18 22:19:30 +03:00
e5af1edcb9
script until 1497
2021-01-17 16:02:19 +03:00
c28ed42617
script6
2021-01-16 18:16:35 +03:00
d5ce8b1ea3
add the bad crack "features" behind SECUROM define
2021-01-14 23:16:42 +01:00
091b40cb39
script3.cpp
2021-01-12 00:42:11 +03:00
81b5e66dd4
fixes
2021-01-11 17:18:25 +03:00
625376f0d3
500-599
2021-01-11 17:14:56 +03:00
75d1715442
script file 1 done (hopefully)
2021-01-10 22:58:06 +03:00
ad7855f995
Update command definitions
2021-01-10 12:27:51 +03:00
c2265e29d2
Update command definitions
2021-01-09 23:59:47 -05:00
f5b97f1e8a
can finish first mission
2021-01-09 22:24:18 +03:00
203dff9165
script
2021-01-09 20:33:21 +03:00
c1e68b2c61
fix
2021-01-09 17:43:21 +03:00
97c95b7639
more script
2021-01-09 17:35:27 +03:00
b7f9bfda4a
fail
2021-01-09 02:41:27 +03:00
a9559f03b0
lcs script mode
2021-01-09 00:20:09 +03:00
613d08d3e2
Merge branch 'lcs-dev' into lcs
2021-01-08 18:59:14 +03:00
0e2af13656
Merge branch 'miami' into lcs
...
* miami:
wtf
fix
small cleanup
Fix gOneShotCol
Fix garage messages position
Fix font on green screen counter
Add MPG123_QUIET to mp3 files
Make opus available alongside other formats
Fix pickup text
Fix char in stats
Add missing GXT line
fail
minor refactoring
Fix 16KHz track
GET_WHEELIE_STATS fix
Cleanup and fixes for new decoders
Fixes for CVbFile
Small fixes for new wav decoder
Remove fastmath from premake's config
Implementing our own WAV decoder to replace SndFile
2021-01-08 14:47:37 +02:00
236b3b1c2b
more stuff
2021-01-08 12:41:39 +03:00
ebdf08a514
first commit for LCS
2021-01-08 01:41:40 +01:00
5e10f1fe6a
sync with upstream
2021-01-07 18:38:40 +03:00
