Sergeanur
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
Filip Gawin
0c60ceeb33
Cmake version for hash
2021-02-12 21:09:46 +03:00
erorcun
2c784d979a
Remove version text, add toggleable debug info(with commit hash!)
2021-02-12 21:09:23 +03:00
Sergeanur
e4320c02cf
Enable BIND_VEHICLE_FIREWEAPON
2021-02-11 17:16:01 +02:00
Sergeanur
d6068c421d
Add undef
2021-02-10 09:08:02 +02:00
Sergeanur
b6af7393e8
Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu
...
* origin/miami:
fix clouds
Use our synonyms for attack anims again
Detect joystick menu for XInput
reorganize shaders; use modulate flag; update librw
fix generic.txd crash
Use original animation names from VCS
# Conflicts:
# src/core/MenuScreensCustom.cpp
2021-02-10 09:01:53 +02:00
Sergeanur
12330e38cb
Controller menu
2021-02-10 08:57:51 +02:00
erorcun
675aef29cf
Detect joystick menu for XInput
2021-02-07 19:50:17 +03:00
withmorten
8553120fdb
add missing ASCII_STRCMP stuff
2021-02-04 19:47:47 +01:00
withmorten
1b293a3cfb
no advanced script log when log level is 0
2021-02-02 11:32:20 +01:00
erorcun
902e539c0d
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text
2021-02-01 14:18:17 +03:00
erorcun
ab939e059b
Clean up POSIX streaming code
2021-01-27 22:19:00 +03:00
Fire_Head
0ae6d1fecf
Merge branch 'lcs' into lcs
2021-01-26 01:01:32 +03:00
Fire-Head
d898abf63d
config
2021-01-26 00:55:55 +03: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
withmorten
29fb996b00
make building with Codewarrior 7 possible
2021-01-24 17:08:34 +01:00
Sergeanur
b35b0c598d
Enable GTA_BRIDGE
2021-01-23 03:09:15 +02:00
Nikolay Korolev
bdb216bf7c
fix
2021-01-22 20:59:57 +03:00
Sergeanur
e019bd91fd
Reenable PS2_AUDIO_PATHS
2021-01-22 19:46:50 +02:00
Sergeanur
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
withmorten
cc6d5374d5
fix config.h
2021-01-22 18:41:58 +01:00
Sergeanur
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
aap
ce77e80414
Merge pull request #963 from Nick007J/lcs
...
all LCS script commands
2021-01-22 00:59:20 +01:00
Sergeanur
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
withmorten
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
Nikolay Korolev
b4b4c996ba
Merge branch 'lcs-dev' into lcs
2021-01-20 12:12:56 +03:00
Nikolay Korolev
aa0f77043c
script fixes
2021-01-20 12:12:26 +03:00
Nikolay Korolev
177680216c
fix
2021-01-18 22:30:18 +03:00
Nikolay Korolev
4f36a1fb77
sync
2021-01-18 22:20:44 +03:00
Nikolay Korolev
c09297997e
script full
2021-01-18 22:19:30 +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
erorcun
542a5393ac
Fix build without FIX_BUGS, divide to 0 fixes
2021-01-13 03:08:50 +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
7496a463d4
Merge branch 'lcs-dev' into lcs
2021-01-12 00:42:44 +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
cf11b32849
of course
2021-01-11 02:43:57 +03:00
Nikolay Korolev
53a99cb9ee
script2
2021-01-11 02:35:03 +03:00
Nikolay Korolev
1f79fb608a
fix
2021-01-09 17:47:55 +03:00
Nikolay Korolev
97c95b7639
more script
2021-01-09 17:35:27 +03:00
Fire-Head
91c6389754
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2021-01-09 01:02:17 +03:00
Fire-Head
7a3ee349da
sync with re3
...
-radardisc shadow fix
-fix for the dimension where moon is round
-correct radar based on the early gta 3 screenshot
-proper scaling based on ps2 gta 3
-ini and debugmenu options
2021-01-09 01:01:41 +03:00
Nikolay Korolev
3ac74c86a1
fix
2021-01-09 00:33:16 +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
4debd89d8e
Merge branch 'miami' into lcs
...
# Conflicts:
# src/render/Timecycle.cpp
2021-01-08 20:24:43 +02:00
Sergeanur
68e8c1ce04
Add multisampling
2021-01-08 20:22:08 +02:00
Sergeanur
bf3135eb41
Enable trains
2021-01-08 18:31:50 +02:00