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
c06b971b65
fix clouds
2021-02-09 20:03:13 +01: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
2cad49940e
Use our synonyms for attack anims again
2021-02-07 21:13:54 +03:00
erorcun
675aef29cf
Detect joystick menu for XInput
2021-02-07 19:50:17 +03:00
aap
425f360363
reorganize shaders; use modulate flag; update librw
2021-02-06 16:49:52 +01:00
aap
cc435ea711
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2021-02-06 10:23:28 +01:00
IlDucci
b864103976
Restoring original sorting.
2021-02-05 13:53:24 +01:00
Nikolay Korolev
102d105e0a
fix
2021-02-05 14:45:03 +03:00
IlDucci
86513cb2c9
[Miami] Updating font widths.
...
- Fixing widths in SF Arborcrest for the characters ¡, Ñ, ñ, ¿.
- Fixing the ¡ character width in Rage font.
- Mapped the characters that are being affected by each width size.
2021-02-05 12:44:41 +01:00
aap
9125e604b9
fix generic.txd crash
2021-02-05 10:58:01 +01:00
Nikolay Korolev
09de511c37
fixed plane AI
2021-02-05 11:31:54 +03: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
withmorten
42342745f3
CHud::Draw fix
2021-02-04 18:29:47 +01:00
erorcun
ca48ebcb6e
MP3 player fixes
2021-02-03 23:03:00 +03:00
Nikolay Korolev
3584dac5c0
fix
2021-02-03 22:47:25 +03:00
Nikolay Korolev
f6c8225dac
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-02-03 22:47:16 +03:00
Nikolay Korolev
ca65c76419
fix
2021-02-03 22:46:04 +03: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
ef28d12d85
fix gcc/clang build by adding -fpermssive and -Wno-address-of-temporary
2021-02-02 14:27:21 +01:00
withmorten
1b293a3cfb
no advanced script log when log level is 0
2021-02-02 11:32:20 +01:00
withmorten
4281730b16
fix UB and potential crashes when doing ice cream
2021-02-02 11:27:30 +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
aap
3f60034c39
add w to CVector; adjust col structs a bit
2021-02-01 10:57:55 +01:00
Nikolay Korolev
2343e69ce5
Merge branch 'lcs-dev' into lcs
2021-01-31 23:34:41 +03:00
Nikolay Korolev
251b2aaeb8
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-01-31 23:34:38 +03:00
Nikolay Korolev
48926fcade
multiplayer stuff
2021-01-31 23:34:19 +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
withmorten
2e37001881
fix UB and new renderer crashes
2021-01-31 01:19:25 +01:00
Nikolay Korolev
e5190481e4
Merge remote-tracking branch 'upstream/miami' into miami
2021-01-31 01:46:33 +03: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
withmorten
5dfe396af3
use macro for waterlevel z offset
2021-01-30 20:13:25 +01:00
Sergeanur
c193ade58b
Font fixes
2021-01-30 20:46:37 +02: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
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
withmorten
990637bf52
waterlevel: use macro for 400.0f
2021-01-29 17:57:51 +01: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
withmorten
8482180706
waterlevel fix fix
2021-01-29 01:20:20 +01:00
withmorten
2fc6b542bc
waterlevel fix
2021-01-29 01:18:32 +01: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
aap
9e3c192376
fix some little UB
2021-01-28 15:35:35 +01:00
erorcun
e1e4be9017
Use previous naming & fix LineOfSightSectorList too
2021-01-28 03:57:12 +03:00
Nikolay Korolev
9fc0ec0bf4
I hate ATanOfXY pt 2
2021-01-28 02:41:21 +03:00
erorcun
8150f55dbc
Merge pull request #1002 from kusst/miami
...
Change text color in texture conversion dialog so it matches VC colors.
2021-01-28 02:16:04 +03:00
kusst
8a7c7efe85
ifdefs + fix progressbar being under dialogbox
2021-01-27 23:56:23 +01:00
Nikolay Korolev
3f8e258055
fix
2021-01-28 01:50:10 +03:00
Nikolay Korolev
fa2eb24ba2
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-01-28 01:08:18 +03:00
Nikolay Korolev
433baf5f3c
fix
2021-01-28 01:08:06 +03:00
erorcun
be88a42bad
Fix some Collision NaN/inf's
2021-01-28 00:51:43 +03:00
erorcun
a216bb56ee
Attempt to fix input delays on GLFW
2021-01-27 22:19:10 +03:00
erorcun
ab939e059b
Clean up POSIX streaming code
2021-01-27 22:19:00 +03:00
Sergeanur
e8a10748a4
fix fix
2021-01-27 20:39:22 +02:00
Sergeanur
97cf189d15
Fix subtitle shadow
2021-01-27 20:19:22 +02:00
Sergeanur
97351ad2c2
Use original animation names from VCS
2021-01-27 18:50:24 +02:00
kusst
e1e13d14a4
Also change progressbar color
2021-01-27 03:36:22 +01:00
kusst
30c26e5a9c
Change text color in texture conversion dialog...
...
...so it matches VC style.
2021-01-27 00:35:57 +01:00
aap
70c1f0640d
add missing ferry vehicle desc
2021-01-26 19:24:22 +01: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
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
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
Fire-Head
ba4028b9dd
lcs WaterCannon
2021-01-26 00:52:03 +03:00
Sergeanur
cea8ad4b85
Fix check
2021-01-25 19:40:19 +02:00
Sergeanur
129d7333be
Fix function dupe
2021-01-25 19:38:13 +02: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
erorcun
202ccd4c56
Support pads without L2-R2, add comments
2021-01-25 16:58:02 +03: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
a4c5b87b90
more bletcherous stuff
2021-01-25 10:45:38 +01:00
aap
fef87b9219
fix some breakage
2021-01-25 10:43:12 +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