Sergeanur
|
138abb91f6
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/CarCtrl.cpp
# src/control/Script4.cpp
# src/core/Frontend.cpp
|
2021-06-30 21:26:36 +03:00 |
|
withmorten
|
d17d437de3
|
rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)
|
2021-06-28 13:57:05 +02:00 |
|
withmorten
|
cb3b3855b8
|
rename clamp macro to Clamp to fix compilation with g++11
|
2021-06-28 13:31:35 +02:00 |
|
Sergeanur
|
1c5a864598
|
Fix script load
|
2021-06-28 05:23:58 +03:00 |
|
Sergeanur
|
eaebaa6db3
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script5.cpp
# src/entities/Entity.cpp
|
2021-06-28 05:16:21 +03:00 |
|
Sergeanur
|
f8297df9c5
|
Redo ReadSaveBuf + common.h cleanup
|
2021-06-28 05:12:54 +03:00 |
|
withmorten
|
f3a931e1c9
|
Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe .
|
2021-06-26 19:14:46 +02:00 |
|
Nikolay Korolev
|
636f67ca3f
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-06-26 14:34:52 +03:00 |
|
Sergeanur
|
831737ecc8
|
Fixes
|
2021-06-26 14:25:40 +03:00 |
|
erorcun
|
af7573ddbe
|
Revert "Redo ReadSaveBuf + common.h cleanup"
This reverts commit 2b67aba94c .
|
2021-06-26 00:25:59 +03:00 |
|
Sergeanur
|
2b67aba94c
|
Redo ReadSaveBuf + common.h cleanup
|
2021-06-25 19:03:51 +03:00 |
|
Nikolay Korolev
|
8a5afd0db2
|
sync
|
2021-06-25 10:15:19 +03:00 |
|
Sergeanur
|
74867af2e7
|
Fixes
|
2021-06-24 21:50:09 +03:00 |
|
Sergeanur
|
3aac4ea62a
|
Fix sin & cos calls
|
2021-06-24 21:45:48 +03:00 |
|
Sergeanur
|
1fa0116f5f
|
Use bool8 in audio code
|
2021-06-24 21:44:36 +03:00 |
|
Sergeanur
|
c7821635fd
|
Wait states ported (scripted animations)
|
2021-06-24 21:42:10 +03:00 |
|
Sergeanur
|
1471c82a20
|
LCS sfx + mission audio
|
2021-06-24 21:42:08 +03:00 |
|
Sergeanur
|
6e4a2947ea
|
Fix sin & cos calls
|
2021-06-24 21:34:33 +03:00 |
|
Sergeanur
|
5bcdb933a7
|
Use bool8 in audio code
|
2021-06-24 21:34:32 +03:00 |
|
Sergeanur
|
68b5270fe4
|
Fix some timer calls
|
2021-06-24 21:32:43 +03:00 |
|
Sergeanur
|
a11bf19b93
|
Fix sin & cos calls
|
2021-06-24 21:32:43 +03:00 |
|
Sergeanur
|
786e101acf
|
Use bool8 in audio code
|
2021-06-24 21:32:43 +03:00 |
|
Sergeanur
|
0f6583560d
|
small RoadBlock fix
|
2021-06-24 21:32:43 +03:00 |
|
Sergeanur
|
6537dfe7f1
|
Use some GetMatrix/SetMatrix logic based on SA + CutsceneHead fix
|
2021-06-24 21:32:43 +03:00 |
|
Sergeanur
|
8f54093de1
|
Merge branch 'miami' into lcs
# Conflicts:
# src/core/World.cpp
|
2021-05-10 02:48:56 +03:00 |
|
Sergeanur
|
3dda658e42
|
Use some GetMatrix/SetMatrix logic based on SA
# Conflicts:
# src/control/Pickups.cpp
# src/control/RoadBlocks.cpp
# src/core/World.cpp
# src/entities/Entity.cpp
# src/objects/CutsceneHead.cpp
# src/objects/Object.cpp
|
2021-05-10 02:45:04 +03:00 |
|
Sergeanur
|
f6910d35f7
|
Merge branch 'miami' into lcs
# Conflicts:
# README.md
# premake5.lua
# src/audio/MusicManager.cpp
# src/core/main.cpp
# src/core/re3.cpp
# src/extras/postfx.cpp
# src/render/Font.cpp
|
2021-02-26 11:07:32 +02:00 |
|
withmorten
|
60bc816af5
|
nil -> false
|
2021-02-19 16:32:25 +01:00 |
|
withmorten
|
73fce903b8
|
nil -> false
|
2021-02-19 16:23:52 +01:00 |
|
aap
|
9db87fc636
|
add debug render groups
|
2021-02-18 12:21:47 +01:00 |
|
Sergeanur
|
cba1f85026
|
Add russian support
|
2021-02-18 11:34:23 +02:00 |
|
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 |
|
Nikolay Korolev
|
6ba0d2e6bd
|
fail
|
2021-02-14 20:08:55 +03:00 |
|
Sergeanur
|
ca85e44c9e
|
Fix repeating pickup sound on revenue pickup
|
2021-02-10 12:21:21 +02:00 |
|
erorcun
|
b464bb7fd4
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim
|
2021-02-08 13:23:19 +03:00 |
|
Nikolay Korolev
|
6db96753d2
|
botch
|
2021-02-07 23:33:30 +03:00 |
|
Nikolay Korolev
|
9b9ffc4b13
|
ferries
|
2021-02-07 23:29:49 +03:00 |
|
Nikolay Korolev
|
102d105e0a
|
fix
|
2021-02-05 14:45:03 +03:00 |
|
Nikolay Korolev
|
09de511c37
|
fixed plane AI
|
2021-02-05 11:31:54 +03:00 |
|
Nikolay Korolev
|
3584dac5c0
|
fix
|
2021-02-03 22:47:25 +03:00 |
|
Nikolay Korolev
|
ca65c76419
|
fix
|
2021-02-03 22:46:04 +03:00 |
|
Nikolay Korolev
|
f6326606b7
|
fix
|
2021-02-03 15:35:06 +03:00 |
|
Sergeanur
|
adf07aab47
|
Fix compilation
|
2021-02-03 02:47:45 +02:00 |
|
Sergeanur
|
b47a23ab79
|
Merge pull request #1001 from Sergeanur/animNames
Use original animation names from VCS
|
2021-02-03 02:14:48 +02:00 |
|
Nikolay Korolev
|
48926fcade
|
multiplayer stuff
|
2021-01-31 23:34:19 +03:00 |
|
Filip Gawin
|
3d4791f291
|
Revert "First batch of fixes (CallAndMessage)"
This reverts commit 7a3b80a9b7 .
|
2021-01-31 21:06:38 +01:00 |
|
Filip Gawin
|
7a3b80a9b7
|
First batch of fixes (CallAndMessage)
|
2021-01-31 20:44:39 +01:00 |
|
Nikolay Korolev
|
2420325c02
|
fix
|
2021-01-31 01:45:07 +03:00 |
|
Nikolay Korolev
|
07a5cc6544
|
garages
|
2021-01-31 01:38:00 +03:00 |
|
Nikolay Korolev
|
01d4312251
|
Merge branch 'lcs' into lcs-dev
|
2021-01-30 20:27:26 +03:00 |
|
Nikolay Korolev
|
2c29ab5542
|
fix
|
2021-01-30 20:27:02 +03:00 |
|
Nikolay Korolev
|
8b08098d4e
|
fix
|
2021-01-30 20:26:10 +03:00 |
|
Nikolay Korolev
|
c3c2a4269d
|
stuff
|
2021-01-30 20:23:30 +03:00 |
|
erorcun
|
d52b917c54
|
Some regular fixes and UB fixes
|
2021-01-29 19:23:02 +03:00 |
|
erorcun
|
c4328afce7
|
Even more fixes & shorten quit screen
|
2021-01-29 19:16:26 +03:00 |
|
erorcun
|
810bad9fd8
|
Fix some UBs
|
2021-01-29 01:44:33 +03:00 |
|
Nikolay Korolev
|
4270180b8b
|
fix
|
2021-01-29 00:05:57 +03:00 |
|
Nikolay Korolev
|
2d5f087041
|
fix
|
2021-01-28 23:25:59 +03:00 |
|
Nikolay Korolev
|
7056f9954f
|
fix
|
2021-01-28 23:25:15 +03:00 |
|
Nikolay Korolev
|
7c38e2db24
|
fix
|
2021-01-28 23:23:49 +03:00 |
|
Nikolay Korolev
|
9fc0ec0bf4
|
I hate ATanOfXY pt 2
|
2021-01-28 02:41:21 +03:00 |
|
Nikolay Korolev
|
3f8e258055
|
fix
|
2021-01-28 01:50:10 +03:00 |
|
Nikolay Korolev
|
433baf5f3c
|
fix
|
2021-01-28 01:08:06 +03:00 |
|
Sergeanur
|
97351ad2c2
|
Use original animation names from VCS
|
2021-01-27 18:50:24 +02:00 |
|
Nikolay Korolev
|
9b1db9709b
|
Merge branch 'lcs' into lcs-dev
|
2021-01-26 21:10:55 +03:00 |
|
Nikolay Korolev
|
edb50b66a0
|
enum change
|
2021-01-26 20:46:42 +03:00 |
|
Sergeanur
|
0862c79b21
|
Merge branch 'miami' into lcs
* miami:
Fix anim id in replay
|
2021-01-26 19:39:54 +02:00 |
|
Sergeanur
|
2d2625bf75
|
Fix anim id in replay
|
2021-01-26 19:39:05 +02:00 |
|
Sergeanur
|
0f623c2354
|
Use original animation names from VCS
|
2021-01-26 19:35:40 +02:00 |
|
Nikolay Korolev
|
2fea28f194
|
fix
|
2021-01-26 02:27:57 +03:00 |
|
Nikolay Korolev
|
42d9d6abc8
|
syncd
|
2021-01-26 02:27:32 +03:00 |
|
Nikolay Korolev
|
46e63da4d8
|
sync
|
2021-01-26 02:25:47 +03:00 |
|
Nikolay Korolev
|
d7bd0be53e
|
garage stuff
|
2021-01-26 02:23: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 |
|
Sergeanur
|
c21e5f5e79
|
Move CRunningScript
|
2021-01-25 19:33:02 +02:00 |
|
aap
|
ce7f166ba3
|
CVehicleModelInfo
|
2021-01-24 22:50:16 +01:00 |
|
withmorten
|
29fb996b00
|
make building with Codewarrior 7 possible
|
2021-01-24 17:08:34 +01:00 |
|
Nikolay Korolev
|
8cdc6b5d7c
|
fix merge failure
|
2021-01-23 23:53:59 +03:00 |
|
Nikolay Korolev
|
c4f0b4fb6d
|
mission cleanup fix
|
2021-01-23 23:20:22 +03:00 |
|
Nikolay Korolev
|
4e477a17b2
|
mission cleanup fix
|
2021-01-23 23:17:41 +03:00 |
|
Nikolay Korolev
|
de32fbe75e
|
another backport
|
2021-01-23 23:16:38 +03:00 |
|
Nikolay Korolev
|
6bdc0365ee
|
another backport
|
2021-01-23 23:15:50 +03:00 |
|
Nikolay Korolev
|
d28e9a7b62
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-01-23 23:04:38 +03:00 |
|
Nikolay Korolev
|
37d1aa4129
|
script fixes
|
2021-01-23 23:04:24 +03:00 |
|
Sergeanur
|
defbb01aaa
|
Merge remote-tracking branch 'origin/lcs' into lcs
* origin/lcs:
Remove size assert
Add TXD mid field
Enable GTA_BRIDGE
LCS model indices
|
2021-01-23 15:14:24 +02:00 |
|
Sergeanur
|
904090cbb6
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/modelinfo/BaseModelInfo.cpp
|
2021-01-23 15:14:15 +02:00 |
|
Sergeanur
|
4bde3366c1
|
Merge pull request #980 from Sergeanur/lcsMID
LCS model indices
|
2021-01-23 15:09:54 +02:00 |
|
Nikolay Korolev
|
3326603265
|
added some missing functions
|
2021-01-23 15:33:01 +03:00 |
|
Nikolay Korolev
|
b5c4866964
|
added some missing functions
|
2021-01-23 15:32:07 +03:00 |
|
Nikolay Korolev
|
35258b9b9c
|
added some missing functions
|
2021-01-23 15:29:00 +03:00 |
|
aap
|
a22b6168c6
|
wrong path node array
|
2021-01-23 12:50:46 +01:00 |
|
aap
|
2814f2e8cf
|
wrong path node array
|
2021-01-23 12:49:54 +01:00 |
|
aap
|
20bcd4bd69
|
colstore done
|
2021-01-23 12:40:23 +01:00 |
|
Nikolay Korolev
|
552497d71b
|
fix
|
2021-01-23 14:11:57 +03:00 |
|
Nikolay Korolev
|
8d0100f100
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-01-23 12:54:27 +03:00 |
|
Nikolay Korolev
|
a105003a7a
|
I hate GetATanOfXY
|
2021-01-23 12:54:08 +03:00 |
|
Sergeanur
|
e03aaec030
|
Add (Don't) walk lights
|
2021-01-23 04:07:50 +02:00 |
|
Sergeanur
|
b35b0c598d
|
Enable GTA_BRIDGE
|
2021-01-23 03:09:15 +02:00 |
|
Sergeanur
|
6b54d04bfc
|
LCS model indices
|
2021-01-23 02:56:48 +02:00 |
|
erorcun
|
f85b5e99ed
|
Includes overhaul, fix some compiler warnings
|
2021-01-23 03:23:16 +03:00 |
|
Nikolay Korolev
|
965a3d6eec
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-01-23 02:36:34 +03:00 |
|
Nikolay Korolev
|
917cf44def
|
script coronas
|
2021-01-23 02:36:13 +03:00 |
|
Sergeanur
|
c884edd923
|
cSmallHeap
|
2021-01-23 00:03:12 +02:00 |
|
erorcun
|
0ea72af60c
|
Peds reporting to phone changes for GTA3D
|
2021-01-22 23:58:57 +03:00 |
|
Nikolay Korolev
|
bdb216bf7c
|
fix
|
2021-01-22 20:59:57 +03: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 |
|
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
withmorten
|
d1317f8fa6
|
m_nWantedLevel -> GetWantedLevel()
|
2021-01-22 00:20:51 +01:00 |
|
withmorten
|
497e0b801f
|
m_nWantedLevel -> GetWantedLevel()
|
2021-01-22 00:19:44 +01:00 |
|
Nikolay Korolev
|
46ae5700ee
|
a few fixes
|
2021-01-21 23:51:15 +03:00 |
|
withmorten
|
034df61f3c
|
codewarrior: finishing touches
|
2021-01-21 19:42:51 +01:00 |
|
withmorten
|
f2596b3759
|
Merge remote-tracking branch 'upstream/master' into cw
|
2021-01-21 03:20:31 +01:00 |
|
withmorten
|
ac0f759b27
|
make building with Codewarrior 7 possible
|
2021-01-21 03:18:15 +01:00 |
|
Nikolay Korolev
|
a5be17d941
|
Merge branch 'lcs-dev' into lcs
|
2021-01-20 21:15:03 +03:00 |
|
Nikolay Korolev
|
23831e38e6
|
sync
|
2021-01-20 21:14:12 +03:00 |
|
Nikolay Korolev
|
ad745aae63
|
some more script
|
2021-01-20 21:12:42 +03:00 |
|
Sergeanur
|
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 |
|
Sergeanur
|
c7c7eff918
|
Get rid of bitfields in CPool
# Conflicts:
# src/core/templates.h
|
2021-01-20 19:24:08 +02:00 |
|
Sergeanur
|
3b52b683e3
|
Sync matrix with master
|
2021-01-20 19:20:11 +02:00 |
|
Sergeanur
|
c54f5c4b4f
|
Merge pull request #971 from Sergeanur/PoolFlags
Get rid of bitfields in CPool
|
2021-01-20 18:59:49 +02:00 |
|
Sergeanur
|
9b193a47a2
|
Merge pull request #966 from Sergeanur/matrix
Get rid of RwMatrix in CMatrix
|
2021-01-20 18:59:33 +02:00 |
|
Nikolay Korolev
|
aa0f77043c
|
script fixes
|
2021-01-20 12:12:26 +03:00 |
|
Nikolay Korolev
|
dac4dd560a
|
saves
|
2021-01-19 23:34:37 +03:00 |
|
Sergeanur
|
a9b8d30ce0
|
Get rid of bitfields in CPool
|
2021-01-19 21:32:55 +02:00 |
|
Nikolay Korolev
|
061fd25c61
|
fixes
|
2021-01-19 02:38:02 +03:00 |
|
Nikolay Korolev
|
03cf1e7535
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2021-01-19 00:00:12 +03:00 |
|
Nikolay Korolev
|
8b80a8803b
|
fix
|
2021-01-18 23:59:54 +03:00 |
|
Nikolay Korolev
|
ef59c623fd
|
Merge remote-tracking branch 'upstream/master'
|
2021-01-18 23:59:16 +03:00 |
|
Nikolay Korolev
|
8c1f4ba65d
|
fix
|
2021-01-18 23:59:07 +03:00 |
|
Nikolay Korolev
|
47c697feca
|
fixes
|
2021-01-18 23:58:26 +03:00 |
|
Nikolay Korolev
|
14a1d3d251
|
Merge branch 'lcs' into lcs-dev
|
2021-01-18 22:20:27 +03:00 |
|
Nikolay Korolev
|
c09297997e
|
script full
|
2021-01-18 22:19:30 +03:00 |
|
Sergeanur
|
91093305d6
|
Get rid of RwMatrix in CMatrix
|
2021-01-18 21:06:59 +02:00 |
|
erorcun
|
5a47379bf5
|
Includes overhaul, fix some compiler warnings
|
2021-01-17 21:32:54 +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 |
|
Nikolay Korolev
|
5e1113d884
|
fix attempt
|
2021-01-17 18:46:49 +03:00 |
|
Nikolay Korolev
|
9001a64ef9
|
Merge branch 'lcs' into lcs-dev
|
2021-01-17 16:02:56 +03:00 |
|
Nikolay Korolev
|
186441e7f5
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-01-17 16:02:38 +03:00 |
|
Nikolay Korolev
|
e5af1edcb9
|
script until 1497
|
2021-01-17 16:02:19 +03:00 |
|
Fire_Head
|
6075bf3fc2
|
Merge pull request #959 from Fire-Head/lcs
Lcs Particle
|
2021-01-16 22:00:02 +03:00 |
|
Nikolay Korolev
|
e99cd8052c
|
sync
|
2021-01-16 20:06:55 +03:00 |
|
Nikolay Korolev
|
d25420a33b
|
fix
|
2021-01-16 20:06:10 +03:00 |
|
Nikolay Korolev
|
df98d04d79
|
fix
|
2021-01-16 20:04:17 +03:00 |
|
Nikolay Korolev
|
9a7442c2fd
|
script7
|
2021-01-16 20:02:41 +03:00 |
|
Nikolay Korolev
|
ef97134f50
|
sync
|
2021-01-16 18:17:42 +03:00 |
|
Nikolay Korolev
|
c28ed42617
|
script6
|
2021-01-16 18:16:35 +03:00 |
|
Sergeanur
|
eb5fdac918
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script.h
|
2021-01-16 16:56:24 +02:00 |
|
Nikolay Korolev
|
19505b664c
|
consistency fix
|
2021-01-16 13:42:46 +03:00 |
|
Nikolay Korolev
|
32ab01cd32
|
consistency fix
|
2021-01-16 13:42:04 +03:00 |
|
Nikolay Korolev
|
b4f6a9336b
|
more fix
|
2021-01-16 13:35:36 +03:00 |
|