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
aap
26bbbe0037
fix clouds
2021-02-09 20:02:29 +01:00
aap
031df36935
CColModel
2021-02-09 17:45:02 +01:00
erorcun
94eed33940
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2021-02-08 13:24:49 +03:00
erorcun
b464bb7fd4
Merge branch 'miami' of https://github.com/GTAmodding/re3 into VCSanim
2021-02-08 13:23:19 +03:00
erorcun
675aef29cf
Detect joystick menu for XInput
2021-02-07 19:50:17 +03:00
aap
cc435ea711
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2021-02-06 10:23:28 +01:00
aap
9125e604b9
fix generic.txd crash
2021-02-05 10:58:01 +01:00
withmorten
a78212ea80
fix MASTER crashes
2021-02-04 23:43:04 +01:00
withmorten
8553120fdb
add missing ASCII_STRCMP stuff
2021-02-04 19:47:47 +01:00
Sergeanur
4f7793a423
Merge pull request #997 from Fire-Head/lcs
...
Lcs WaterCannon
2021-02-03 21:44:21 +02:00
erorcun
713562685a
OAL Loops, fixes
2021-02-02 22:30:13 +03:00
withmorten
1b293a3cfb
no advanced script log when log level is 0
2021-02-02 11:32:20 +01:00
erorcun
1eb77c4d6d
Merge pull request #1016 from erorcun/miami
...
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio…
2021-02-02 05:31:29 +03:00
erorcun
902e539c0d
Overhaul MusicManager - fix radio bugs, scroll to prev station, radio off text
2021-02-01 14:18:17 +03:00
shfil
bb47f3a8e4
fix realloc
2021-01-31 15:02:15 +01:00
shfil
264d7d98d7
fix realloc
2021-01-31 15:01:46 +01:00
Nikolay Korolev
a0c5d75f83
fixed bike bomb
2021-01-30 14:55:00 +03:00
Nikolay Korolev
dbf5c06144
fixed bike bomb
2021-01-30 14:53:51 +03:00
erorcun
f5f153dbfd
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2021-01-29 19:16:40 +03:00
erorcun
c4328afce7
Even more fixes & shorten quit screen
2021-01-29 19:16:26 +03:00
withmorten
7db28f9f7f
fix NewRender typo
2021-01-29 16:43:17 +01:00
withmorten
934aa92a9b
add NewRenderer ini read/write, fix backfaceculling read
2021-01-29 16:41:34 +01:00
erorcun
982b024c5c
CdStreamPosix fixes
2021-01-29 16:25:32 +03:00
aap
595a000f6a
fix shutdown
2021-01-29 13:43:50 +01:00
erorcun
810bad9fd8
Fix some UBs
2021-01-29 01:44:33 +03:00
erorcun
e1e4be9017
Use previous naming & fix LineOfSightSectorList too
2021-01-28 03:57:12 +03:00
erorcun
be88a42bad
Fix some Collision NaN/inf's
2021-01-28 00:51:43 +03:00
erorcun
ab939e059b
Clean up POSIX streaming code
2021-01-27 22:19:00 +03:00
Sergeanur
97351ad2c2
Use original animation names from VCS
2021-01-27 18:50:24 +02: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
9d4053419b
Merge pull request #977 from withmorten/miami-cw
...
make building with Codewarrior 7 possible
2021-01-25 14:06:53 +01:00
aap
785bd8ebcc
proper ini fix
2021-01-25 13:02:00 +01:00
aap
4f591aa87a
ini fixes
2021-01-25 10:30:57 +01:00
aap
d6544933aa
Merge pull request #984 from aap/lcs
...
modelinfos
2021-01-25 10:30:34 +01:00
aap
ce7f166ba3
CVehicleModelInfo
2021-01-24 22:50:16 +01:00
Sergeanur
0ad1426950
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/control/Script.cpp
2021-01-24 22:22:16 +02: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
9361aeb8eb
CTimeModelInfo and CWeaponModelInfo
2021-01-24 14:06:16 +01:00
aap
8cbae5d62a
CSimpleModelInfo
2021-01-24 13:47:33 +01:00
Nikolay Korolev
4abebbe3b2
use ARRAY_SIZE
2021-01-23 23:12:25 +03: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