Sergeanur
|
0ad1426950
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/control/Script.cpp
|
2021-01-24 22:22:16 +02:00 |
|
erorcun
|
071e503856
|
Ped: car enter anim. fix
|
2021-01-24 20:12:36 +03:00 |
|
aap
|
a202e67349
|
CPedModelInfo and CTempColModels
|
2021-01-24 17:14:16 +01:00 |
|
withmorten
|
29fb996b00
|
make building with Codewarrior 7 possible
|
2021-01-24 17:08:34 +01:00 |
|
erorcun
|
b728f8de64
|
Fix out of bound binding orders
|
2021-01-24 19:08:07 +03:00 |
|
Sergeanur
|
e79e8b30e0
|
Partial hud
|
2021-01-24 17:21:50 +02:00 |
|
aap
|
1bee2caf5c
|
CClumpModelInfo
|
2021-01-24 15:28:26 +01:00 |
|
aap
|
9361aeb8eb
|
CTimeModelInfo and CWeaponModelInfo
|
2021-01-24 14:06:16 +01:00 |
|
aap
|
8cbae5d62a
|
CSimpleModelInfo
|
2021-01-24 13:47:33 +01:00 |
|
shfil
|
d68ec362dd
|
Fix CCollision::DistToLine
|
2021-01-24 12:36:43 +01:00 |
|
shfil
|
ca1de3cd17
|
Fix CCollision::DistToLine
|
2021-01-24 12:35:45 +01:00 |
|
aap
|
c1a7ded1e4
|
CBaseModelInfo
|
2021-01-24 00:07:45 +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
|
4abebbe3b2
|
use ARRAY_SIZE
|
2021-01-23 23:12:25 +03:00 |
|
aap
|
4269e613a3
|
Merge pull request #983 from ZLau92/ZLau92-corrected-plane-pitch
Fix plane / ccbb cheat flight pitch
|
2021-01-23 21:06:33 +01:00 |
|
Sergeanur
|
2d00d9cbe6
|
More scaling macro
|
2021-01-23 22:06:17 +02: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 |
|
Zach Charo
|
77051ddc78
|
Update Vehicle.cpp
|
2021-01-23 13:38:45 -06:00 |
|
aap
|
a1d6833bac
|
txd store
|
2021-01-23 19:23:38 +01:00 |
|
Sergeanur
|
13507d422b
|
Add PSP scaling macros
|
2021-01-23 18:56:27 +02:00 |
|
Sergeanur
|
de44a17e64
|
Fix ini name
|
2021-01-23 18:16:47 +02:00 |
|
Sergeanur
|
e9689a0a07
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/core/re3.cpp
|
2021-01-23 17:54:46 +02:00 |
|
erorcun
|
770456d0c8
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2021-01-23 16:50:55 +03:00 |
|
erorcun
|
1b32840424
|
No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux
|
2021-01-23 16:18:19 +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 |
|
Sergeanur
|
cfac29b0ef
|
Remove restrictions in CGame::Process
|
2021-01-23 15:09:34 +02:00 |
|
erorcun
|
45c2488e36
|
Migrate from old .ini to new .ini
|
2021-01-23 16:04:19 +03:00 |
|
erorcun
|
73f1340afb
|
Store all settings in .INI
|
2021-01-23 15:59:38 +03: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 |
|
aap
|
f6fb473cf9
|
revert accident
|
2021-01-23 12:59:52 +01: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
|
0aad73f4a1
|
Remove size assert
|
2021-01-23 03:39:24 +02:00 |
|
Sergeanur
|
3565f179af
|
Add TXD mid field
|
2021-01-23 03:12:01 +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 |
|
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 |
|
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
Sergeanur
|
8dab92d158
|
CMessages::GetTokenPadKeyString
|
2021-01-22 05:49:17 +02:00 |
|
Sergeanur
|
b5deee823c
|
Load LCS radar blips
|
2021-01-22 04:00:17 +02:00 |
|
Sergeanur
|
7091ab5e75
|
Fix save/load and brief menus
|
2021-01-22 02:44:32 +02:00 |
|
Sergeanur
|
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 |
|
Fire_Head
|
6bdf005171
|
Update ParticleObject.h
|
2021-01-22 03:10:19 +03: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 |
|
Fire-Head
|
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 |
|
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 |
|
Sergeanur
|
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 |
|
aap
|
8520bbd2c7
|
higher wheel LOD dist
|
2021-01-22 00:40:46 +01:00 |
|
withmorten
|
d1317f8fa6
|
m_nWantedLevel -> GetWantedLevel()
|
2021-01-22 00:20:51 +01:00 |
|
aap
|
1999427225
|
fuck
|
2021-01-21 22:26:44 +01:00 |
|
aap
|
94ff966994
|
bletch
|
2021-01-21 22:25:14 +01:00 |
|
aap
|
e99589a3eb
|
fixed anisotropic filtering; updated librw
|
2021-01-21 22:17:35 +01:00 |
|
Nikolay Korolev
|
50cde66067
|
fix
|
2021-01-22 00:14:30 +03:00 |
|
Sergeanur
|
e8db0e3abb
|
Merge branch 'lcs' into lcsfont
* lcs:
fix
enable screenshots for librw; update librw
Get rid of bitfields in CPool
Sync matrix with master
free cam inversion fix
free cam inversion fix
Fix CFont::PrintStringFromBottom
pc radar fix
work on colourfilters
PSP rendering and shader cleanup
fix handbrake
fix
wrong ifdef
fix
some free cam fixes for controller
sync milessdk with re3mss
vehicle fixes
fix
add the bad crack "features" behind SECUROM define
# Conflicts:
# src/render/Font.cpp
|
2021-01-21 23:11:36 +02:00 |
|
Nikolay Korolev
|
46ae5700ee
|
a few fixes
|
2021-01-21 23:51:15 +03:00 |
|
Nikolay Korolev
|
c8e715c33b
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-01-21 23:19:12 +03:00 |
|
Sergeanur
|
ed74182cc2
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# vendor/librw
|
2021-01-21 16:03:27 +02:00 |
|
Nikolay Korolev
|
f0097ff733
|
fix
|
2021-01-21 16:09:58 +03:00 |
|
aap
|
24de9f92e8
|
enable screenshots for librw; update librw
|
2021-01-21 10:21:47 +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
|
95448eea3d
|
More fonts
|
2021-01-20 18:40:54 +02:00 |
|
withmorten
|
ba34d72183
|
free cam inversion fix
|
2021-01-20 13:59:17 +01:00 |
|
withmorten
|
8590457d41
|
free cam inversion fix
|
2021-01-20 13:57:03 +01:00 |
|
Sergeanur
|
9b820cc0b6
|
Fix CFont::PrintStringFromBottom
|
2021-01-20 14:23:03 +02:00 |
|
Nikolay Korolev
|
b4b4c996ba
|
Merge branch 'lcs-dev' into lcs
|
2021-01-20 12:12:56 +03:00 |
|
Nikolay Korolev
|
b1454276ed
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-01-20 12:12:46 +03:00 |
|
Nikolay Korolev
|
aa0f77043c
|
script fixes
|
2021-01-20 12:12:26 +03:00 |
|
aap
|
2c1c5debca
|
pc radar fix
|
2021-01-19 21:35:25 +01:00 |
|
Nikolay Korolev
|
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 |
|