erorcun
ac3484b82e
Merge pull request #872 from withmorten/sized-enums-miami
...
Get rid of sized enums 2: Electric Boogaloo
2020-12-09 03:31:03 +03:00
erorcun
6b654094a5
Merge pull request #871 from withmorten/sized-enums
...
Get rid of sized enums
2020-12-09 03:15:20 +03:00
erorcun
fc6f07345e
Red delete menu background
2020-12-08 23:33:51 +03:00
Nikolay Korolev
016ff5b4aa
sync with upstream
2020-12-08 12:00:24 +03:00
Sergeanur
f3e9c82432
Pool fixes from master
2020-12-08 07:52:03 +02:00
Sergeanur
778d1381bb
Add NUM_LEVELS
2020-12-08 07:50:29 +02:00
Sergeanur
aae4f3319f
Fixes
2020-12-08 03:29:08 +02:00
Fire-Head
87bca997a4
Merge branch 'master' of https://github.com/GTAmodding/re3
2020-12-07 21:50:18 +03:00
Fire-Head
c5fbb594a5
ps2 hud, restore original code
2020-12-07 21:12:13 +03:00
withmorten
4c0744260d
uint8 enums fixed
2020-12-07 01:59:17 +01:00
withmorten
4696e3f9c8
uint8 enums fixed
2020-12-07 00:36:40 +01:00
Nikolay Korolev
fe918d41c2
garages revision + some fixes
2020-12-06 19:30:51 +03:00
Nikolay Korolev
0bd373cd56
script from other platforms and unused commands
2020-12-05 02:49:32 +03:00
aap
9714a37769
bit more GTA_VERSION and GTA_PS2
2020-12-04 01:12:58 +01:00
aap
43fb7fe342
one more original name
2020-12-03 19:11:57 +01:00
aap
5bed7afd79
forgot some junk
2020-12-03 16:56:32 +01:00
aap
13cefd3293
more PS2 stuff; memory movement done
2020-12-03 16:04:59 +01:00
aap
0d166081ad
animviewer fixes
2020-12-03 11:30:46 +01:00
aap
3c24505990
little fixes for animviewer
2020-12-03 09:34:09 +01:00
erorcun
ab3e810a95
AnimViewer done, comment cleanup
2020-12-03 05:22:58 +03:00
erorcun
8b47774aee
Stats page
2020-12-03 02:09:35 +03:00
erorcun
774aa1570f
Merge pull request #853 from erorcun/miami
...
PlayerPed and "Redefine controls" menu done, fixes
2020-12-02 14:35:06 +03:00
erorcun
bd8b907d13
PlayerPed and "Redefine controls" menu done, fixes
2020-12-02 14:21:46 +03:00
aap
1172056833
cam lod dist fix
2020-12-02 10:39:23 +01:00
aap
f576311814
Merge branch 'master' of github.com:GTAmodding/re3
2020-12-02 10:38:39 +01:00
aap
fba657ff0c
better cam lod dist fix
2020-12-02 10:38:27 +01:00
Nikolay Korolev
4b9f1680a3
fast fix
2020-12-02 02:41:05 +03:00
Nikolay Korolev
fda58fb1df
added GTA_SCENE_EDIT
2020-12-02 02:34:51 +03:00
Sergeanur
a259b6b8ab
TexturePools
...
# Conflicts:
# src/core/Game.cpp
# src/rw/RwHelper.cpp
2020-12-01 22:54:19 +02:00
Sergeanur
24b5406a1d
Add GTA_REPLAY
...
# Conflicts:
# src/control/Replay.cpp
# src/control/Replay.h
2020-12-01 22:53:09 +02:00
Sergeanur
0b20fd7e77
Remove ifndef GTA_PS2 around replays
2020-12-01 22:35:53 +02:00
Sergeanur
9461998304
TexturePools
2020-12-01 22:12:46 +02:00
Sergeanur
e33ab44b7d
Add GTA_REPLAY
2020-12-01 22:08:05 +02:00
aap
83bbb631d1
some more GTA_VERSIONs and CGame tidy-up (not much actual memory moving yet)
2020-12-01 17:42:18 +01:00
aap
b8bc54640d
fix cam-fix
2020-12-01 17:24:56 +01:00
aap
56c471d02e
Merge pull request #854 from Nick007J/master
...
small garages + templates revision
2020-12-01 11:25:02 +01:00
aap
d6fab1bc53
cam stuff
2020-12-01 10:12:42 +01:00
Sergeanur
5a3a058ed3
Make texture conversion work a bit faster
...
# Conflicts:
# src/core/config.h
2020-12-01 03:51:31 +02:00
Zach Charo
6eb0fd52d7
Update Camera.cpp
...
camdist multiplier is consitently between 1 and 1.4 on 16:9 aspect ratio
On ultrawide, the cam dist multiplier jumps to anywhere between 2 and 3
The preferred distance generator for car objects is the cam dist multiplier * 120. Which puts cars that it's trying to generate outside of the allowed gen/draw distance for new car objects when on ultrawide. This means no new cars can spawn.
This change caps the scaling for the generation distance a bit above what it would be for 16:9 and does not affect the LOD multiplier.
2020-11-30 19:08:15 -06:00
aap
2c59e1c894
some more GTA_VERSION
2020-12-01 00:22:57 +01:00
aap
4b9fb631fc
added a few registered pointers and memory debug
2020-11-30 23:44:58 +01:00
Nikolay Korolev
a3b83a5d2f
Merge remote-tracking branch 'upstream/master'
2020-11-30 02:15:35 +03:00
Nikolay Korolev
8f05ccd6c4
small garages revision + small template stuff
2020-11-30 02:15:03 +03:00
aap
d5bc382cb5
GTA_VERSION define and some config.h cleanup
2020-11-29 21:29:48 +01:00
aap
566282057a
add debug script hotkey
2020-11-29 11:37:06 +01:00
aap
c57fee38ca
Merge pull request #841 from aap/master
...
start using CMemoryHeap; also some PS2 define cleanup
2020-11-28 18:52:44 +01:00
aap
a8035b6466
moved some stuff to MemoryMgr
2020-11-28 17:05:57 +01:00
aap
b23bda6e45
Merge branch 'master' of github.com:GTAmodding/re3
2020-11-28 16:02:21 +01:00
Sergeanur
ad48b9cde0
Make texture conversion work a bit faster
2020-11-28 16:29:45 +02:00
Sergeanur
18d0fd2e48
Add multisampling to librw
2020-11-28 15:13:06 +02:00
aap
d857758c16
start using CMemoryHeap
2020-11-26 17:39:59 +01:00
Sergeanur
491274f188
CStreaming::PrintStreamingBufferState
2020-11-26 18:11:55 +02:00
aap
4ddc356341
memory heap starting to work
2020-11-25 22:49:50 +01:00
aap
70d8bdc087
rename badly named camera variable
2020-11-24 15:20:41 +01:00
aap
1906a08f72
cam fix; forgot some shaders
2020-11-24 15:18:39 +01:00
erorcun
b7783b19d2
Xbox message screen, disabled by default
2020-11-24 01:45:54 +03:00
aap
9b4cfa618d
Merge pull request #827 from aap/master
...
finished cullzones
2020-11-22 22:49:22 +01:00
aap
07303c62d1
finished cullzones
2020-11-22 00:13:07 +01:00
aap
15ae9e2a3e
Merge pull request #823 from aap/master
...
Neo screen droplets
2020-11-22 00:12:34 +01:00
aap
b9b7d5ac21
Merge pull request #825 from aap/miami
...
neo screen droplets
2020-11-22 00:12:31 +01:00
Nikolay
6b6b600cee
no script logging
2020-11-21 21:12:47 +03:00
Sergeanur
fe40f65703
Reorganize CPed functions into their original cpp files
2020-11-20 01:18:37 +02:00
Sergeanur
9e45feb4fa
Reorganize CPed functions into their original cpp files
2020-11-19 21:12:20 +02:00
aap
07fe099b4e
neo screen droplets
2020-11-19 19:07:32 +01:00
aap
02c7f8381b
neo screen droplets
2020-11-19 16:23:52 +01:00
erorcun
808f7c46f1
Infamous XBOX subtitle outline
2020-11-19 02:09:04 +03:00
erorcun
54214dd2c4
Fix mouse lock/high-dpi
2020-11-18 17:42:21 +03:00
erorcun
1d600c640a
Merge pull request #816 from erorcun/miami
...
Frontend: Stats, Map, Audio inputs, Radio selector
2020-11-18 01:45:28 +03:00
erorcun
b58a54527e
Merge pull request #820 from withmorten/mission-switcher
...
add mission switcher from miami
2020-11-18 01:45:12 +03:00
erorcun
c6f53d25b0
Frontend: Stats, Map, Audio inputs, Radio selector
2020-11-18 00:33:45 +03:00
aap
46253fbf7d
Merge branch 'master' of github.com:GTAmodding/re3
2020-11-16 22:43:35 +01:00
aap
3564b85b4e
animation compression from PS2
2020-11-16 22:43:15 +01:00
erorcun
f33ed2892a
Fix mouse lock/high-dpi 2
2020-11-16 15:49:00 +03:00
erorcun
3b1debaa0d
Fix mouse lock/high-dpi
2020-11-16 15:28:10 +03:00
Sergeanur
cdd30f4da5
Move ColStore to collision
2020-11-16 12:49:23 +02:00
aap
6804ad62c6
little fix to ps2 CPad
2020-11-16 09:48:15 +01:00
aap
5335b46cbb
little fix to ps2 CPad
2020-11-16 09:48:02 +01:00
withmorten
abcda2ce29
add mission switcher from miami
2020-11-16 00:41:03 +01:00
withmorten
207f8576d8
move config.h define to CUSTOM_FRONTEND_OPTIONS
2020-11-16 00:21:04 +01:00
withmorten
f0071c094a
remove unneeded ifdef
2020-11-16 00:07:27 +01:00
Sergeanur
9bb8ebaa10
Make collision code placement more like original (+ small fixes)
...
# Conflicts:
# premake5.lua
# src/CMakeLists.txt
# src/collision/Collision.cpp
# src/core/Collision.h
2020-11-16 00:36:54 +02:00
withmorten
ac29ae6e23
add CFO for invertlook4pad; update american.gxt
2020-11-15 23:06:29 +01:00
withmorten
0669df763c
Merge branch 'upstream/master'
2020-11-15 22:08:40 +01:00
withmorten
ad10d3e64e
revert frontend changes for invertlook4pad
2020-11-15 22:07:44 +01:00
Sergeanur
a6f5f4634c
Make collision code placement more like original (+ small fixes)
2020-11-15 19:51:35 +02:00
Sergeanur
8374a346e5
Fix loading island LODs with big buildings
2020-11-13 18:28:15 +02:00
Nikolay Korolev
2e915780aa
some fixes
2020-11-13 13:19:54 +03:00
Nikolay Korolev
55c9a81922
fixed zone bug
2020-11-12 17:32:16 +03:00
aap
90b624a3e0
Merge pull request #812 from Nick007J/miami
...
CWorld done + top gear fix
2020-11-12 11:40:19 +01:00
Sergeanur
feeab0b74a
Fix ini reader
2020-11-11 20:57:44 +02:00
aap
ff44f29616
ped fix for new renderer
2020-11-11 14:42:02 +01:00
erorcun
67e57d1368
Fix RestoreDef crash
2020-11-11 13:08:22 +03:00
Nikolay Korolev
35874b5fd2
fix
2020-11-11 12:27:40 +03:00
Nikolay Korolev
a67d4c70d7
Merge remote-tracking branch 'upstream/miami' into miami
2020-11-11 12:22:57 +03:00
Nikolay Korolev
be92957328
fixed top gear
2020-11-11 12:21:30 +03:00
aap
546ed0ff07
changes to RW layer so loading foreign files works
2020-11-11 09:42:30 +01:00
aap
48d0653331
urgh, merge and changes to RW layer in one commit.
2020-11-11 09:38:33 +01:00
Nikolay Korolev
612a6dd06c
Merge remote-tracking branch 'upstream/miami' into miami
2020-11-11 00:08:54 +03:00
Nikolay Korolev
ef2089cafb
CWorld done
2020-11-11 00:08:32 +03:00
erorcun
460f3cea44
Frontend: Scroll for All, some care for PS2-like menu
...
Don't show Back button on PS2-like menu
Removed PS2-style reversed fade-in, because it was a hack and taking too much space
2020-11-10 02:07:02 +03:00
erorcun
59f9c009ef
Font: Hud: Use orig. text dimensions, fix right-align calculations
2020-11-10 01:50:34 +03:00
erorcun
f8367ebdef
Revert "Font: Fix text dimensions"
...
This reverts commit 6729de49b1
.
2020-11-08 21:11:55 +03:00
erorcun
fe5d0c9cdf
Font: Hud: Use orig. text dimensions, fix right-align calculations
2020-11-08 20:49:47 +03:00
erorcun
c96ffb05b1
Merge pull request #809 from erorcun/master
...
Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults
2020-11-07 23:51:07 +03:00
erorcun
163c12608f
Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults
2020-11-07 21:58:23 +03:00
Sergeanur
7f4498e0f0
Check if buttons txd exsist
2020-11-07 20:54:38 +02:00
aap
092f32ba67
move stuff into define
2020-11-07 12:52:11 +01:00
Filip Gawin
f442793d20
Allow to handle larger files via 64bit variables
2020-11-06 18:42:28 +01:00
withmorten
bd78b5ff4e
add bInvertLook4Pad from VC (doesn't get saved yet)
2020-11-05 19:57:13 +01:00
Sergeanur
8224a6a381
Button icons
2020-11-05 17:05:16 +02:00
Sergeanur
5a59542679
Fix inverted vertical camera
2020-11-05 16:38:41 +02:00
aap
0d55b6182a
Merge pull request #795 from withmorten/master
...
enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
# Conflicts:
# premake5.lua
# src/core/config.h
2020-11-05 16:38:02 +02:00
aap
881a3e1091
Merge pull request #795 from withmorten/master
...
enable static runtime for all windows builds; fast floating point for x86/x64 builds; no sized dealloc for windows builds
2020-11-05 10:59:02 +01:00
aap
67c894cda9
more fixes to new renderer
2020-11-04 23:11:27 +01:00
aap
244b91ee80
fixed boats for new renderer
2020-11-04 16:22:15 +01:00
aap
e1279b01bc
forget ifdef
2020-11-03 20:40:33 +01:00
aap
3c5bb4e8f3
new LCS-style renderer
2020-11-03 20:33:07 +01:00
aap
ebddb7956c
fix mistake in custom menu; update librw
2020-11-03 14:37:00 +01:00
Sergeanur
f08b9cf033
fix build
2020-11-03 15:00:48 +02:00
erorcun
770a1f8012
Merge pull request #789 from erorcun/master
...
rewrite CFO + postfx/pipeline options
2020-11-03 01:43:53 +03:00
shfil
e587974759
Fix include in Frontend_PS2.cpp
2020-11-02 13:31:25 +01:00
Sergeanur
30d1cbfecd
Fix the goddamn spaces for tabs master race
2020-11-01 13:46:12 +02:00
Sergeanur
37943a87cb
Show Xbox buttons when playing with a controller
2020-11-01 13:42:02 +02:00
withmorten
e9735f928f
add ifdef LIBRW guard for pipelines and colourfilter
2020-11-01 01:09:46 +01:00
aap
3665a82418
Merge pull request #792 from withmorten/master
...
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
# Conflicts:
# src/core/Frontend.cpp
2020-10-31 19:21:10 +02:00
aap
6eef54e3fc
Merge pull request #792 from withmorten/master
...
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
2020-10-31 17:06:25 +01:00
aap
7d64698322
foobar!
2020-10-31 14:45:26 +01:00
aap
ea5b86774d
couple of fixes and cleanup
2020-10-31 14:33:49 +01:00
Sergeanur
0e1257cf17
Disable loading screen
2020-10-30 20:32:41 +02:00
erorcun
ded7c89602
Update MenuScreensCustom.cpp
2020-10-30 17:36:13 +03:00
erorcun
7784ba052e
Update config.h
2020-10-30 17:24:20 +03:00
withmorten
d34d591ed3
fix draw menu version text ifdef location
2020-10-29 19:53:23 +01:00
withmorten
57b01ac476
NO_MOVIES and DEBUGMENU not for MASTER
2020-10-29 19:23:59 +01:00
aap
317393d763
few more fixes to last commit
2020-10-29 19:21:16 +01:00
withmorten
e95516032f
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL, add extra defines for menu and game version text
2020-10-29 19:18:46 +01:00
aap
e97366c023
implemented extra model flags for backface culling and alpha test from mobile
2020-10-29 19:11:47 +01:00
erorcun
922d06ab1f
rewrite CFO + postfx/pipeline options
2020-10-28 15:05:04 +03:00
aap
a4d198005d
boolean for extended pipelines
...
(cherry picked from commit 78ac22ee2c
)
2020-10-27 15:57:26 +01:00
aap
78ac22ee2c
boolean for extended pipelines
2020-10-27 15:55:07 +01:00
erorcun
6729de49b1
Font: Fix text dimensions
2020-10-25 20:57:24 +03:00
aap
adfa2645bf
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-10-25 16:17:43 +01:00
aap
537c0960fe
clean up timebar ifdefs
2020-10-25 16:17:31 +01:00
aap
e3a1041a47
clean up timebar ifdefs
2020-10-25 16:17:30 +01:00
erorcun
0a36629502
Finalize frontend sounds, player setup screen
2020-10-25 18:01:09 +03:00
Sergeanur
e0394e6e69
Possible fix of linux build
2020-10-25 12:38:08 +02:00
Sergeanur
6634410aee
Fix build
2020-10-25 09:50:17 +02:00
Sergeanur
aac0c3fb67
DMAudio fixes
2020-10-25 09:40:11 +02:00
erorcun
5e5854b914
Fix bindings not loaded on Linux
2020-10-25 01:10:03 +03:00
Adrian Graber
28fb26f792
Join CdStream threads to wait for them to exit
2020-10-24 18:14:41 +03:00
erorcun
088065e0a8
Merge pull request #778 from majesticCoding/miami
...
Fluff done, FireInstantHit fix
2020-10-24 17:56:03 +03:00
Adrian Graber
a32c390a95
Join CdStream threads to wait for them to exit
2020-10-24 16:12:10 +02:00
majestic
6a89fe401a
Fluff done, FireInstantHit fix
2020-10-23 07:51:24 -07:00
Sergeanur
89a7007c6a
ObjectData
2020-10-23 08:41:23 +03:00
Sergeanur
281e45ce01
Timer fix
2020-10-23 08:38:36 +03:00
erorcun
08d78fb6ff
Timer, main
2020-10-23 04:26:52 +03:00
Sergeanur
ee61f19253
Police Radio + fixes
2020-10-22 12:38:09 +03:00
Sergeanur
bd8d8b53a3
CTempColModels small fix
2020-10-21 21:26:10 +03:00
Sergeanur
ff2665942e
CTempColModels stuff
2020-10-21 21:24:18 +03:00
erorcun
70f9832e14
Merge branch 'miami' into miami
2020-10-18 19:45:11 +03:00
erorcun
497c179245
Merge pull request #772 from Nick007J/miami
...
Original save/load support + bugfixes
2020-10-18 19:37:49 +03:00
erorcun
a6aa782d6d
Fixes and style changes from miami
2020-10-18 19:16:37 +03:00
Sergeanur
0d20f1c364
Merge branch 'master' into miami
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/RoadBlocks.cpp
# src/entities/Entity.h
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/render/Renderer.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/CarGen.cpp
# src/weapons/BulletInfo.cpp
# src/weapons/Weapon.cpp
2020-10-18 17:15:49 +03:00
Sergeanur
b91f6a4550
Setter for bIsStatic (became virtual in SA)
2020-10-18 16:40:06 +03:00
eray orçunus
f60e3d667a
Minor things
2020-10-18 13:53:17 +03:00
Nikolay Korolev
c856d88691
object field renamed
2020-10-18 12:34:34 +03:00
Nikolay Korolev
720abca826
finished save/load
2020-10-17 20:45:07 +03:00
Nikolay Korolev
cae3990eac
Merge remote-tracking branch 'upstream/miami' into miami
2020-10-17 18:50:41 +03:00
Nikolay Korolev
1195f3db7b
saves part 1
2020-10-17 18:50:16 +03:00
erorcun
4e4e0e8e04
Merge pull request #765 from erorcun/miami
...
Radar, WaterCannon, win/glfw skels
2020-10-17 18:39:56 +03:00
Sergeanur
588fb26728
Fix player model not changing in cutscenes
2020-10-17 18:26:48 +03:00
eray orçunus
b98864d134
Radar, WaterCannon, win/glfw skels
2020-10-17 17:35:26 +03:00
erorcun
971b7cba65
Merge pull request #761 from erorcun/SampleMan
...
SampleManager
2020-10-13 13:18:49 +03:00
shfil
3b40e003ab
Fix typo in fire.cpp
2020-10-12 22:51:49 +02:00
Sergeanur
6450fd2692
Fix zone saving on 64 bit
2020-10-12 22:54:46 +03:00
eray orçunus
342da2430b
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
2020-10-12 20:47:34 +03:00
eray orçunus
3772be32bf
Streaming and cross-platform fixes
2020-10-12 20:41:13 +03:00
eray orçunus
be6b97b5d8
Streaming and cross-platform fixes
2020-10-12 20:30:49 +03:00
eray orçunus
d18a55f429
SampleManager
2020-10-12 20:22:39 +03:00
Roman Masanin
417646819c
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-10-12 13:42:57 +03:00
erorcun
96f36d16ae
Merge pull request #753 from majesticCoding/miami
...
CWaterCreatures
2020-10-12 12:37:47 +03:00
eray orçunus
40020f4e1e
Fix forgotten wanted/busted text
2020-10-12 12:36:15 +03:00
erorcun
9e0b23f065
Merge pull request #758 from erorcun/miami
...
Hud, Fire, OnscreenBlaBla
2020-10-12 11:13:46 +03:00
eray orçunus
8a622a0e72
Hud, Fire, OnscreenBlaBla
2020-10-12 06:42:54 +03:00
Sergeanur
239e09ad07
Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad
...
Zones saving and loading
2020-10-12 04:16:30 +03:00
majestic
e7ef45a606
CWaterCreatures
2020-10-10 17:49:54 -07:00
Sergeanur
f1bb09826d
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# gamefiles/TEXT/american.gxt
# premake5.lua
# src/audio/MusicManager.cpp
# src/control/Darkel.cpp
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/Frontend.cpp
# src/core/Game.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/extras/frontendoption.cpp
# src/extras/frontendoption.h
# src/render/Hud.cpp
# src/skel/glfw/glfw.cpp
# src/vehicles/CarGen.cpp
# src/vehicles/Vehicle.cpp
# src/weapons/WeaponInfo.cpp
# utils/gxt/american.txt
2020-10-11 01:18:08 +03:00
Sergeanur
dd039677a0
Zones saving and loading
2020-10-10 23:50:00 +03:00
Roman Masanin
881db86895
CSpecialFX and some other classes
2020-10-09 20:29:38 +03:00
eray orçunus
a01b14f301
Fix sniper and water creatures bug, mark some files
2020-10-09 12:24:21 +03:00
majestic
c091a5c11a
CWaterCreatures
2020-10-08 19:28:31 -07:00
eray orçunus
22c9e8b581
Fix POSIX streaming
2020-10-09 02:22:02 +03:00
eray orçunus
ed82c55475
Fix POSIX streaming
2020-10-09 02:19:49 +03:00
eray orçunus
570ccb7db1
Merge branch 'miami' of https://github.com/GTAmodding/re3 into new
2020-10-08 22:45:37 +03:00
eray orçunus
73a3e9d5bb
Fixes, some thanks to ASan
2020-10-08 22:41:51 +03:00
Filip Gawin
6bae5a6031
Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)
2020-10-08 18:45:07 +03:00
eray orçunus
fec01aeff1
Fix some sanitizer errors, improve POSIX streamer
2020-10-08 17:58:18 +03:00
Andrew Udvare
1a3e254b6c
CdStreamPosix: fix type issues
2020-10-08 17:53:32 +03:00
Andrew Udvare
2bb29a50b7
core/CdStreamPosix: switch to named semaphores to support macOS
...
macOS does not support unnamed semaphores. The functions return ENOSYS.
2020-10-08 17:52:12 +03:00
Andrew Udvare
d590fdddf6
macOS support; thanks to @MrYadro
...
This should support ARM64 and x86-64.
-target flag based on information from
https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377 .
2020-10-08 17:51:43 +03:00
majestic
7861992fe6
CWaterCreatures
2020-10-08 05:59:08 -07:00
erorcun
fa373c7fdb
Merge branch 'miami' into miami
2020-10-08 01:29:35 +03:00
eray orçunus
da39624f1c
Pad, BulletInfo, ProjectileInfo, fixes
2020-10-08 00:26:24 +03:00
eray orçunus
c5a61b3d3b
Merge branch 'master' of https://github.com/GTAmodding/re3
2020-10-05 14:26:42 +03:00
shfil
c31e3e6823
Merge pull request #741 from ShFil119/fix/make_space
...
Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)
2020-10-04 22:02:28 +02:00
eray orçunus
8c170a62ee
Fix some sanitizer errors, improve POSIX streamer
2020-10-04 22:39:54 +03:00
erorcun
fae97f29c4
Merge branch 'master' into master
2020-10-04 22:12:57 +03:00
Filip Gawin
0ac2be0093
Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size)
2020-10-04 13:18:24 +02:00
Roman Masanin
063a80ecfb
now BETTER_ALLCARSDODO_CHEAT tweak original cheat to be useful.
2020-10-03 02:26:49 +03:00
Roman Masanin
55d94c99b8
Merge remote-tracking branch 'upstream/miami' into miami
2020-10-03 01:52:37 +03:00
eray orçunus
3bd3330227
Load and write our settings in re3.ini & fixes
2020-10-02 21:18:34 +03:00
Andrew Udvare
f6bc2b654c
CdStreamPosix: fix type issues
2020-10-01 20:45:38 -04:00
Andrew Udvare
bbb578c5b1
core/CdStreamPosix: switch to named semaphores to support macOS
...
macOS does not support unnamed semaphores. The functions return ENOSYS.
2020-10-01 03:21:06 -04:00
Roman Masanin
fe46aa5cc2
better flying cars, some refractoring and fixes
2020-10-01 02:20:09 +03:00
Andrew Udvare
01ea7801fd
macOS support; thanks to @MrYadro
...
This should support ARM64 and x86-64.
-target flag based on information from
https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377 .
2020-09-30 15:40:28 -04:00
eray orçunus
595421da39
Fixes, mouse AUX buttons, joystick detect menu
2020-09-30 20:03:01 +03:00
eray orçunus
f740588780
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-09-30 02:44:02 +03:00
eray orçunus
f71953077d
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
2020-09-30 02:41:42 +03:00
Filip Gawin
73e4350320
Use Const instead of const (last commit)
2020-09-30 02:19:04 +03:00
Filip Gawin
6c59d97520
Fix warning ISO C++11 does not allow conversion from string literal to
...
'char *
2020-09-30 02:18:55 +03:00
shfil
35d7591def
some SilentPatch fixes
...
# Conflicts:
# src/core/Camera.cpp
# src/weapons/Weapon.cpp
2020-09-30 02:14:10 +03:00
erorcun
f9dc00a458
Merge pull request #718 from Nick007J/miami
...
VC replays
2020-09-29 23:00:50 +03:00
Filip Gawin
874b31d82b
Use Const instead of const (last commit)
2020-09-29 17:27:36 +02:00
Filip Gawin
eeb26cfc7d
Fix warning ISO C++11 does not allow conversion from string literal to
...
'char *
2020-09-29 17:16:02 +02:00
eray orçunus
7646ceeaaa
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-09-29 02:30:48 +03:00
eray orçunus
a0588ef8b1
Restore All Cars are Heli cheat
2020-09-29 02:29:10 +03:00
erorcun
e2314c7852
Merge pull request #717 from theR4K/miami
...
Helicopters not ringing, and other audio stuff
2020-09-29 01:48:11 +03:00
shfil
bc0bdd02f4
Merge pull request #721 from theR4K/miamiUpstream
...
fix for original bug in flying cars cheat
2020-09-28 20:07:14 +02:00
Roman Masanin
ca73f0344c
fixed original bug, when heli go ma if cars fly cheat activated
2020-09-28 01:38:05 +03:00
eray orçunus
70aac0f460
Fixes: PS2/PS2-like menu, Hud, new sliding text found
2020-09-27 19:22:21 +03:00
eray orçunus
9b76424540
Fixes
2020-09-27 04:39:25 +03:00
Roman Masanin
b956be0f44
another clamp
2020-09-27 04:22:59 +03:00
eray orçunus
a5d6c952a7
Credits & fixes
2020-09-27 02:36:49 +03:00
Nikolay Korolev
f7d5021ac5
VC replays
2020-09-26 21:10:23 +03:00
Nikolay Korolev
2eb2e9ac12
fixed tab
2020-09-26 14:12:42 +03:00
Nikolay Korolev
b42d9e3e7c
silentpatch fixes
2020-09-26 13:30:22 +03:00
Sergeanur
c3d7a73c0b
Fix OpenGL Z-write
...
# Conflicts:
# src/core/main.cpp
2020-09-26 00:26:43 +03:00
Sergeanur
0ce8082bda
Fix OpenGL Z-write
2020-09-26 00:25:39 +03:00
Sergeanur
a043902d9a
Merge pull request #703 from Nick007J/miami
...
script fixes + LCS cheat
2020-09-22 15:38:50 +03:00
Roman Masanin
8f948228d5
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-09-13 21:45:53 +03:00
Roman Masanin
aa2f1b6b29
vehicle audio(first part) and temp fix for openAL
2020-09-13 21:45:42 +03:00
Nikolay Korolev
084efb1f14
Merge remote-tracking branch 'upstream/miami' into miami
2020-09-13 12:06:44 +03:00
Sergeanur
25a22cc6f2
Merge pull request #702 from Sergeanur/VC/MusicManager
...
cMusicManager, cDMAudio, radio position save/load, a few commands imp…
2020-09-13 03:10:14 +03:00
Nikolay Korolev
e5faeea2e5
wall climb cheat from LCS
2020-09-11 18:46:16 +03:00
erorcun
e9a7ab789d
Merge pull request #701 from erorcun/miami
...
Peds objectives and wait states done, fixes
2020-09-10 03:21:23 +03:00
Sergeanur
f0ccbcb281
CStats::PopulateFavoriteRadioStationList
2020-09-09 20:37:36 +03:00
Sergeanur
4f4b1f9145
cMusicManager, cDMAudio, radio position save/load, a few commands implemented
2020-09-09 19:37:44 +03:00
erorcun
350b1ec67e
Merge pull request #698 from majesticCoding/miami
...
cheats, fixes, cosmetic changes
2020-09-06 10:14:55 +03:00
eray orçunus
3f402d23ff
Peds objectives and wait states done, fixes
2020-09-05 20:28:50 +03:00
majestic
9f43b1988b
cheats, fixes, cosmetic changes
2020-09-01 09:42:17 -07:00
aap
6fc6ed8635
Merge pull request #696 from Fire-Head/miami
...
Miami Weapon, WeaponEffects done
2020-09-01 17:30:49 +02:00
erorcun
b7456c604d
Merge pull request #697 from erorcun/miami
...
CGame done, Peds, fixes
2020-08-30 23:24:39 +03:00
eray orçunus
3e549a7d44
CGame done, Peds, fixes
2020-08-30 12:40:30 +03:00
aap
e0f6459674
stupid zone load fix
2020-08-30 00:57:00 +02:00
Fire_Head
a8999bbf38
Merge pull request #1 from GTAmodding/miami
...
Miami
2020-08-27 20:35:14 +03:00
Fire-Head
a38702a7d2
weapons
2020-08-27 19:52:43 +03:00
eray orçunus
7658577260
CFO fixes
2020-08-25 03:27:38 +03:00
eray orçunus
082c4caecf
new frontend customization
2020-08-25 00:55:57 +03:00
aap
8e7989087d
Merge pull request #694 from Sergeanur/miami_CutsceneMgr
...
CutsceneMgr done
2020-08-24 22:46:17 +02:00
Sergeanur
963e85f047
Fix
2020-08-24 23:01:51 +03:00
eray orçunus
cb813bd1ab
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
2020-08-24 22:36:03 +03:00
Sergeanur
a3322f17d5
Merge branch 'master' into miami
...
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/core/ControllerConfig.cpp
# src/core/ControllerConfig.h
# src/core/Streaming.cpp
# src/peds/PedChat.cpp
# src/render/Weather.cpp
# src/rw/TexRead.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
2020-08-24 21:59:32 +03:00
Sergeanur
bbcf3fd7d2
CutsceneMgr done
2020-08-24 21:52:16 +03:00
aap
56b80cb0ab
fixes to zones and vehicle comp rules
2020-08-24 17:21:45 +02:00
aap
6c63dfd86d
accidentally enabled extended stuff....
2020-08-23 13:30:54 +02:00
aap
771235d213
weather fixes
2020-08-23 13:30:21 +02:00
aap
38a01a59fa
CWeather done
2020-08-23 13:27:56 +02:00
aap
13c34b0863
finished cullzones
2020-08-21 13:28:33 +02:00
aap
cc2f13710d
fix streaming bug
2020-08-21 12:09:45 +02:00
aap
dace79c7c3
small streaming fixes
2020-08-20 23:45:45 +02:00
aap
a6fe606ce6
CStreaming done, hopefully
2020-08-20 23:44:40 +02:00
aap
857cef776d
Merge pull request #693 from majesticCoding/miami
...
stable CScriptPaths
2020-08-20 23:01:21 +02:00
Sergeanur
73dd29ea3a
Cleanup CControllerConfigManager deletion a bit
2020-08-20 19:56:02 +03:00
majestic
03c90b7c40
stable CScriptPaths
2020-08-20 09:44:26 -07:00
Sergeanur
b5ccc721ae
Add VEHICLE_FIREWEAPON (disabled by default)
2020-08-20 19:40:35 +03:00
aap
517e2ee9a5
small fixes
2020-08-20 12:55:41 +02:00
aap
764af8735c
rw stuff done & other small things
2020-08-20 12:53:17 +02:00
Sergeanur
9fd91e6250
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# src/core/Collision.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/extras/custompipes.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
# src/extras/shaders/Makefile
# src/extras/shaders/colourfilterVC.frag
# src/extras/shaders/colourfilterVC_fs_gl3.inc
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/render/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
# src/save/GenericGameStorage.cpp
2020-08-19 23:44:08 +03:00
Sergeanur
dab6d6dd6d
Merge remote-tracking branch 'origin/miami' into miami
...
# Conflicts:
# src/core/config.h
2020-08-19 23:35:10 +03:00
Sergeanur
827b240078
Merge branch 'master' into miami
...
# Conflicts:
# gamefiles/TEXT/american.gxt
# src/control/Garages.cpp
# src/control/Record.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Streaming.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/ModelInfo.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# utils/gxt/american.txt
2020-08-19 23:34:33 +03:00
aap
bb948904b6
small stuff
2020-08-19 21:58:00 +02:00
eray orçunus
be638a4973
Revert "remove CFO"
...
This reverts commit 0418ba597b
.
2020-08-19 20:30:57 +03:00
aap
827ba62671
neo pipelines; postfx fix
2020-08-19 16:10:22 +02:00
aap
5ac83e4b4c
changing silly streaming memory limit
2020-08-19 14:58:43 +02:00
aap
76fe1247c8
Merge pull request #688 from aap/master
...
Neo pipelines
2020-08-19 14:36:38 +02:00
Sergeanur
4d1cfb7214
Island loading cleanup and fix
2020-08-19 03:31:42 +03:00
aap
e3405f4be4
Merge branch 'master' of github.com:gtamodding/re3
2020-08-18 11:09:50 +02:00
aap
c556cbbbe0
neo pipelines
2020-08-18 10:58:15 +02:00
Nikolay Korolev
cc66df18ac
Merge remote-tracking branch 'upstream/miami' into miami
2020-08-16 18:41:17 +03:00
Nikolay Korolev
d303c33c2e
CarCtrl finished, minor Script things
2020-08-16 18:39:11 +03:00
eray orçunus
0418ba597b
remove CFO
2020-08-16 17:58:40 +03:00
Sergeanur
732681db08
Island loading and PS2 alpha test added to options
2020-08-16 17:26:44 +03:00
eray orçunus
980dd1b5a1
2 new opcodes
2020-08-16 17:10:59 +03:00
Sergeanur
a728a542be
Graphics menu + MSAA
2020-08-16 01:37:09 +03:00
Sergeanur
9956b27767
Merge branch 'master' into miami
...
# Conflicts:
# src/control/Darkel.cpp
# src/core/main.cpp
2020-08-15 15:13:46 +03:00
erorcun
07038ce88e
Merge pull request #686 from erorcun/miami
...
Stats(except displaying) and PlayerInfo done, Frontend, marker fix
2020-08-15 02:28:17 +03:00
eray orçunus
8b3ca9564b
Continue to Frontend, fix savegame list bug
2020-08-14 22:44:12 +03:00
Sergeanur
e7945625b5
Original screen grabber
2020-08-14 18:57:23 +03:00
eray orçunus
f403a63a5c
Wheelie opcode
2020-08-14 18:54:01 +03:00
Sergeanur
28dc67dc86
Merge branch 'master' into miami
...
# Conflicts:
# src/core/Game.cpp
# src/core/re3.cpp
# src/extras/postfx.cpp
# src/extras/postfx.h
# src/extras/shaders/Makefile
# src/render/Clouds.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Sprite2d.cpp
2020-08-14 13:52:10 +03:00
eray orçunus
b54bb62c94
Stats(except displaying), PlayerInfo, marker fix
2020-08-14 01:14:04 +03:00
aap
afed831aed
extended postfx and sniper hud fix
2020-08-13 18:14:24 +02:00
eray orçunus
2034d7b2ae
Register start button for real
2020-08-13 01:29:34 +03:00
aap
b468d010a8
implemented extended postfx
2020-08-11 18:40:04 +02:00
majestic
2d1b48267d
improved mission switcher
2020-08-10 14:04:33 -07:00
Sergeanur
1c1fa25e6c
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# premake5.lua
# src/render/Coronas.cpp
# src/render/Timecycle.cpp
# src/render/Timecycle.h
2020-08-10 19:15:51 +03:00
majestic
70029752f5
CWindModifiers
2020-08-09 21:42:12 -07:00
majestic
b73b6b8e13
CWindModifiers
2020-08-09 12:32:30 -07:00
aap
43bf854374
timecycle done
2020-08-09 19:11:44 +02:00
aap
0bb46f3f8c
rubbish done
2020-08-09 16:49:15 +02:00
aap
b02c7cdc44
coronas done
2020-08-09 13:17:48 +02:00
Fire-Head
d2e090317f
static shadows fix, cutscene shadows switches
2020-08-08 15:06:45 +03:00
erorcun
8428b99c0d
Merge pull request #678 from blingu/master
...
added support for FreeBSD
2020-08-08 14:58:42 +03:00
blingu
4b6cc0188b
Update CdStreamPosix.cpp
2020-08-07 17:51:15 +02:00
Sergeanur
7d8ffa9ebd
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
2020-08-07 12:34:41 +03:00
aap
f14b1fba09
Merge pull request #675 from erorcun/master
...
Squeeze performance option, minor fixes
2020-08-07 10:18:46 +02:00
aap
0d7fa6df3c
Merge pull request #676 from aap/master
...
VU0 collision
2020-08-07 10:18:40 +02:00
aap
40185161b8
Merge pull request #670 from Fire-Head/miami
...
Miami Shadows
2020-08-07 10:18:35 +02:00
blingu
7a7b352793
added FreeBSD support
2020-08-05 14:32:37 +02:00
Sergeanur
456cb01f16
Enable PS2 Alpha test Emu in debug menu on RW
2020-08-05 13:36:07 +03:00
aap
d801167637
Merge pull request #668 from majesticCoding/miami
...
CEscalators done
2020-08-04 12:27:09 +02:00
majestic
394134f774
CEscalators done
2020-08-03 15:31:42 -07:00
aap
abb640c6b6
VU0 collision
2020-08-03 17:32:06 +02:00
eray orçunus
e14252914e
Squeeze performance option, minor fixes
...
Fixes are already in miami
2020-08-03 16:00:32 +03:00
Fire-Head
224fd77641
NULL -> nil
2020-07-31 21:21:58 +03:00
eray orçunus
eafa9cc107
new opcodes, buyable properties, minor fixes
2020-07-30 15:32:34 +03:00
Sergeanur
9df1d08348
Fixes after merge
2020-07-29 15:41:00 +03:00
Sergeanur
86cc86ac12
Merge remote-tracking branch 'origin/master' into miami
2020-07-29 15:35:25 +03:00
Sergeanur
acdc52116e
Merge branch 'master' into miami
...
# Conflicts:
# src/animation/RpAnimBlend.cpp
# src/audio/oal/stream.cpp
# src/audio/sampman.h
# src/control/Pickups.cpp
# src/core/Collision.cpp
# src/core/Collision.h
# src/core/FileLoader.cpp
# src/core/FileMgr.cpp
# src/core/FileMgr.h
# src/core/Streaming.cpp
# src/core/Streaming.h
# src/core/SurfaceTable.h
# src/modelinfo/VehicleModelInfo.h
# src/peds/Ped.cpp
# src/rw/RwHelper.cpp
# src/rw/RwHelper.h
# src/skel/glfw/glfw.cpp
# src/skel/platform.h
# src/text/Text.cpp
# src/text/Text.h
# src/vehicles/CarGen.cpp
# src/vehicles/Heli.cpp
2020-07-29 15:34:57 +03:00
aap
e13d80a4eb
rename shit
2020-07-29 14:31:34 +02:00
Sergeanur
6b92e9e12b
Dual pass rendering for RW 3.3
2020-07-29 15:24:42 +03:00
Sergeanur
581cb5edfa
The real pickup reflection fix
2020-07-29 14:56:06 +03:00
Fire_Head
52e77c6634
Merge pull request #1 from GTAmodding/miami
...
Miami
2020-07-29 12:20:02 +03:00
Fire-Head
1803dcc873
miami shadows
2020-07-29 12:17:53 +03:00
aap
fb4de46626
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-07-29 09:34:28 +02:00
eray orçunus
c87b639a84
Fix casepath chaos
2020-07-28 17:56:47 +03:00
erorcun
e47eaa1425
Merge pull request #663 from erorcun/master
...
Fix casepath chaos
2020-07-28 17:41:49 +03:00
eray orçunus
eb8844fd11
Fix casepath chaos
2020-07-28 17:40:12 +03:00
eray orçunus
429f6b03c4
CCopPed, except spike traps
2020-07-28 17:04:34 +03:00
aap
c0eb3d10e2
CCollision done and fixes
2020-07-27 15:43:03 +02:00
aap
6b7a8f96a6
CCollision done and fixes
2020-07-27 15:38:46 +02:00
aap
2e8048d0fe
collision fixes
2020-07-27 15:38:12 +02:00
aap
90fdc4328b
CHeli and CRopes done
2020-07-27 14:06:23 +02:00
Filip Gawin
98ec7bdaf9
Provide more memory for casepath's arg
2020-07-26 00:11:13 +02:00
Filip Gawin
3856b932dd
Disable cache for openal for now
2020-07-25 20:25:34 +02:00
eray orçunus
199d57b16c
Fix/change some Windows define
2020-07-25 15:18:15 +03:00
aap
1c44368f0a
fixed hanim for 64 bit
2020-07-24 23:29:33 +02:00
aap
b5b64ca351
fixed hanim for 64 bit
2020-07-24 23:28:55 +02:00
eray orçunus
15918feb8e
90% fixes, 10% skel refactoring
2020-07-24 21:35:04 +03:00
eray orçunus
ad6094ca1d
90% fixes, 10% skel refactoring
2020-07-24 21:02:55 +03:00
eray orçunus
732b760829
64-bit on Windows
2020-07-24 20:26:33 +03:00
Sergeanur
bcb2b7a534
Add ps2 audio paths
2020-07-23 16:15:36 +03:00
eray orçunus
7e32c603fc
New math wrappers
...
from miami
2020-07-23 00:31:06 +03:00
eray orçunus
1dc6fbda1f
64-bit on Windows
2020-07-22 18:51:28 +03:00
Sergeanur
f882586eb8
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# README.md
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/render/Renderer.cpp
# src/vehicles/Plane.cpp
2020-07-22 18:29:17 +03:00
erorcun
b182fa4bb8
Merge pull request #656 from erorcun/miami
...
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 18:21:39 +03:00
eray orçunus
f40f44b14e
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 15:19:22 +03:00
Sergeanur
7d51995640
Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher
2020-07-22 03:32:46 +03:00
aap
0fba76a565
made NPC heli rotors rotate
2020-07-21 09:58:53 +02:00
aap
5bedca7692
fixed COcclusion
2020-07-20 23:25:04 +02:00
eray orçunus
70df13f9d3
Fixes from miami
2020-07-20 22:47:41 +03:00
aap
ee2d0ffc14
Merge pull request #650 from majesticCoding/miami
...
COcclusion done, I hope
2020-07-20 19:56:18 +02:00
aap
2612c9f12c
CPlaneTrails and CPlaneBanners done
2020-07-20 19:50:20 +02:00
aap
efd49962d2
avoid UB
2020-07-20 19:32:20 +02:00
majestic
1ff27e3363
cosmetic fixes
2020-07-20 09:49:39 -07:00
Sergeanur
87eb96453a
Add compatibility with RW 3.4
2020-07-18 13:30:51 +03:00
Sergeanur
de8759eabd
Merge branch 'master' into miami
...
# Conflicts:
# src/control/Record.cpp
# src/vehicles/Automobile.cpp
2020-07-17 13:53:11 +03:00
Sergeanur
949d0c8853
Add audio cache for faster initialization
2020-07-17 13:48:25 +03:00
aap
4e3e1d0b87
make game load all platform dffs
2020-07-16 13:36:25 +02:00
Sergeanur
d0f5464200
Merge branch 'master' into miami
...
# Conflicts:
# src/control/CarAI.cpp
# src/control/Phones.cpp
# src/control/Phones.h
# src/control/Record.cpp
# src/control/Restart.cpp
# src/control/Script.cpp
# src/core/Collision.cpp
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.h
# src/core/Streaming.cpp
# src/core/TempColModels.cpp
# src/core/Wanted.cpp
# src/core/Zones.cpp
# src/core/config.h
# src/core/main.cpp
# src/core/re3.cpp
# src/entities/Entity.cpp
# src/entities/Physical.cpp
# src/extras/frontendoption.cpp
# src/modelinfo/ModelInfo.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/CivilianPed.cpp
# src/peds/CopPed.cpp
# src/peds/EmergencyPed.cpp
# src/peds/Ped.cpp
# src/peds/Ped.h
# src/peds/Population.cpp
# src/render/Renderer.cpp
# src/save/GenericGameStorage.cpp
# src/skel/win/win.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
# src/vehicles/Boat.h
# src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +03:00
Sergeanur
841fa5155c
Rename LEVEL_NONE to LEVEL_GENERIC
2020-07-13 17:43:09 +03:00
Sergeanur
6eb8f6ae5a
Add cutscene borders switch to the menu
2020-07-11 12:04:26 +03:00
eray orçunus
00bba630f6
enable island loading for now
2020-07-10 12:28:00 +03:00
eray orçunus
aabf0f4c2c
keep loading screen, but for a second
2020-07-09 21:48:43 +03:00
Sergeanur
c012e5a7ff
Disable loading screen
2020-07-09 20:40:15 +03:00
Sergeanur
cf69f22a0c
Remove island loading
2020-07-09 19:18:42 +03:00
eray orçunus
67a3c7d2ee
VC fighting, Peds, many fixes including ghost bikes
2020-07-09 17:01:07 +03:00
eray orçunus
c483a044b5
Noskillx's PR + fix .set loading
2020-07-06 19:26:41 +03:00
eray orçunus
70fa4ab79c
Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes
2020-07-06 16:38:00 +03:00
eray orçunus
ceb1defc4e
fixes from master, menu helper text
2020-07-04 23:50:43 +03:00
aap
0acade08ca
Merge pull request #647 from Fire-Head/miami
...
miami CParticleObject
2020-07-04 21:24:17 +02:00
eray orçunus
15548758ac
Bettah car enter canceling, fix CFO crash, ped objs. renaming
2020-07-03 16:51:33 +03:00
eray orçunus
ed036df3ce
Re-enable console for debugging frontend
2020-07-03 05:40:22 +03:00
Fire-Head
d4004805f5
miami pobj
2020-07-03 02:18:06 +03:00
Nikolay Korolev
01b15fe807
reenabled script logging
2020-07-03 01:28:41 +03:00
Filip Gawin
bf2624692c
Fix displaying stats
2020-07-03 00:04:49 +02:00
eray orçunus
c4cd210ae0
Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes
2020-07-02 16:01:42 +03:00
aap
2141247e08
CBoat and friends
2020-07-01 18:04:02 +02:00
Nikolay Korolev
ade5dff217
script logging for miami
2020-07-01 15:43:19 +03:00
erorcun
eda50bc32b
Restored beta police system(disabled), fixes from miami, debug info for CFO crash ( #639 )
2020-07-01 15:28:43 +03:00
Sergeanur
87fa69385c
remove TheText.Load() from CGame::Initialise
2020-06-30 07:48:09 +03:00
Sergeanur
6f81e84bd4
Restore original code of CControllerState::CheckForInput
2020-06-30 07:44:51 +03:00
Sergeanur
c80bdf3a2a
Rename IsAnyButtonPressed to CheckForInput
2020-06-30 07:43:55 +03:00
aap
94ce376a76
cleanup
2020-06-29 12:12:43 +02:00
Sergeanur
b26eec5daf
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/control/Script.cpp
# src/control/ScriptCommands.h
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/Game.cpp
# src/core/MenuScreens.cpp
# src/core/Pad.cpp
# src/core/Pad.h
# src/core/config.h
# src/entities/Entity.cpp
# src/render/Credits.cpp
# src/render/Fluff.cpp
# src/render/Hud.cpp
# src/render/MBlur.cpp
# src/render/Timecycle.cpp
# src/skel/glfw/glfw.cpp
# src/skel/win/win.cpp
# src/text/Text.cpp
2020-06-29 12:56:50 +03:00
Fire-Head
63fdcf7e64
menu fixes
2020-06-29 10:29:02 +03:00
Fire_Head
860f75d66c
Merge branch 'master' into ps2menu
2020-06-29 09:37:53 +03:00
aap
3370ae04cb
renamed 2dfx shadowRange to Size
2020-06-28 12:08:46 +02:00
aap
418bee9c22
renamed 2dfx shadowRange to Size
2020-06-28 12:05:42 +02:00
Nikolay Korolev
d6e111bb67
script logging fixes
2020-06-28 11:59:20 +03:00
Fire-Head
b8f633de24
fixes
2020-06-28 01:57:01 +03:00
Fire-Head
233792e2b8
fixfixfix
2020-06-28 00:31:45 +03:00
Fire-Head
1c11a8081f
mips overdose
2020-06-28 00:01:51 +03:00
aap
592a6aef0b
Merge pull request #638 from erorcun/miami
...
CWanted, anim fix, ped objs renaming, remove III beta features
2020-06-25 15:15:01 +02:00
aap
2b21f92347
rename attractor flag to type
2020-06-25 15:13:33 +02:00
aap
cafe4d6f0c
rename attractor flag to type
2020-06-25 15:13:08 +02:00
aap
077bcf1c82
CPad fix
2020-06-24 19:11:33 +02:00
Nikolay Korolev
043f09f3fb
Merge pull request #637 from Nick007J/master
...
script logging
2020-06-22 13:27:25 +03:00
eray orçunus
f3ed6659c3
CWanted, anim fix, ped objs renaming, remove III beta features
2020-06-22 04:20:56 +03:00
Nikolay Korolev
7a71a47f74
updated player control names
2020-06-21 16:00:17 +03:00
aap
60f736f20f
FOV fix
2020-06-21 14:52:44 +02:00
aap
b81bf1e138
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-06-21 14:52:19 +02:00
aap
e563450cb6
synch with re3
2020-06-21 14:52:03 +02:00
aap
98baa36f1a
FOV fix
2020-06-21 14:50:00 +02:00
Nikolay Korolev
08af34bc99
Merge remote-tracking branch 'upstream/master'
2020-06-21 15:49:30 +03:00
aap
3859efff42
ps2 cam transitions done (hopefully)
2020-06-21 14:41:39 +02:00
Nikolay Korolev
f5cba0ce89
script logging
2020-06-21 13:46:23 +03:00
aap
586e8a2ab4
tried to reconstruct bills cam
2020-06-21 11:03:20 +02:00
aap
e1c58131c4
PS2 cam transition mostly working
2020-06-21 00:40:07 +02:00
eray orçunus
d6a853bd60
killing peds increase chaos level
2020-06-20 22:44:31 +03:00
eray orçunus
fd3cd2c26a
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-06-20 16:23:42 +03:00
eray orçunus
0625954bb7
Ducking, shooting vehicle occupants and weapon fixes
2020-06-20 16:23:32 +03:00
aap
c5205a89ee
CCamera done
2020-06-20 14:54:11 +02:00
aap
5ad739f096
some PS2 cam code; fix for arrest cam
2020-06-20 14:38:21 +02:00
aap
4cd4f91e57
ccamera cleanup
2020-06-19 09:15:23 +02:00
erorcun
d322a8033e
Merge branch 'miami' into miami
2020-06-16 23:02:21 +03:00
aap
7ceedc1d47
CCam done
2020-06-16 13:54:18 +02:00
aap
5f3eb76cff
CCam fixes yet again
2020-06-16 13:50:29 +02:00
aap
62024217b7
more CCam
2020-06-15 20:50:01 +02:00
Sergeanur
655eaa36ce
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# src/control/Script.cpp
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/render/Fluff.cpp
# src/render/Hud.cpp
2020-06-15 17:44:47 +03:00
eray orçunus
686d6e9834
Fix vehicle cam. zoom values
2020-06-15 16:17:22 +03:00
eray orçunus
ef4c8f53c5
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-06-15 00:26:27 +03:00
eray orçunus
2d976827dd
much better mission switcher
2020-06-15 00:26:19 +03:00
aap
e6d2b49121
more cleanup
2020-06-14 23:16:22 +02:00
aap
0741fd5b1d
some more camera stuff
2020-06-14 23:15:56 +02:00
erorcun
f64d3ad7de
Merge pull request #631 from erorcun/miami
...
Peds, mission switcher & fixes
2020-06-14 22:59:02 +03:00
eray orçunus
db6110e996
Peds, mission switcher & fixes
2020-06-14 22:57:26 +03:00
majestic
015921522d
fixed condition in CBoat::ProcessControl and changed enum
2020-06-14 07:53:45 -07:00
aap
c7a32bb83d
some camera code
2020-06-14 09:36:30 +02:00
aap
3fe282fbe4
a few cam fixes
2020-06-13 23:39:35 +02:00
Nikolay Korolev
f78f707935
script fix
2020-06-13 02:02:59 +03:00
aap
41dac0773f
little CCam cleanup; fix in CWorld sphere test
2020-06-12 21:53:39 +02:00
aap
5a961d0284
some cam cleanup; unused PS2 train cams
2020-06-10 23:50:27 +02:00
majestic
287987b8fe
SmokeTrail(s) moved to Fluff, variables' names fixed, floats rounded
2020-06-10 13:47:48 -07:00
majestic
a99da7b94e
more original cheats
...
- CSmokeTrails and CSmokeTrail classes added in new files
- more cheats added
2020-06-10 13:19:05 -07:00
Sergeanur
85d845c5ce
Merge pull request #623 from Sergeanur/VC/MissionAudio
...
Mission audio
2020-06-08 17:32:57 +03:00
Sergeanur
8cd87236c9
miamification of some audio structs
2020-06-08 14:29:55 +03:00
aap
f8b4c0ee1d
bla
2020-06-08 13:23:08 +02:00
aap
d5515c9d0e
cleaned up and updated animviewer; fixed animation bug
2020-06-08 13:01:23 +02:00
aap
94e5b24fc8
cleaned up and fixed animviewer
2020-06-08 13:01:20 +02:00
Nikolay Korolev
16a5c2f676
fixes
2020-06-08 01:21:49 +03:00
eray orçunus
e07b6fdce7
Message box, letterbox and ped attaching
2020-06-07 21:44:54 +03:00
Nikolay Korolev
b14e034344
fix
2020-06-07 17:52:14 +03:00
Nikolay Korolev
0b156f1d26
some stats tweaks; saves dead again
2020-06-07 15:23:52 +03:00
Fire-Head
9c0adf6a8f
Revert "FONT_BANK renamed to FONT_STANDARD"
...
This reverts commit 552205dfba
.
2020-06-07 05:03:06 +03:00
Sergeanur
1c01899799
Merge branch 'master' into miami
...
# Conflicts:
# src/control/Garages.cpp
# src/core/Frontend.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Train.cpp
2020-06-07 04:15:10 +03:00
Sergeanur
552205dfba
FONT_BANK renamed to FONT_STANDARD
2020-06-07 04:10:06 +03:00
eray orçunus
fc0498b3a8
CFont crash workaround
2020-06-06 19:25:37 +03:00
eray orçunus
4e4a3489ef
Use KnockOffRider
2020-06-06 17:19:36 +03:00
Nikolay Korolev
408f47fc9d
fixed linux saving
2020-06-06 12:58:10 +03:00
Sergeanur
afa4fa6510
Merge branch 'master' into miami
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioSamples.h
# src/audio/soundlist.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/peds/Ped.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Vehicle.h
2020-06-06 08:42:58 +03:00
aap
68caac1abd
Merge pull request #617 from majesticCoding/miami
...
some original VC's cheats and comparator for them
2020-06-05 23:43:15 +02:00
majestic
f014b29fc4
Update Pad.cpp
2020-06-05 14:31:17 -07:00
majestic
66262b14ad
Update Pad.cpp
2020-06-05 14:20:29 -07:00
eray orçunus
d3736ccb17
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-06-05 23:20:16 +03:00
eray orçunus
f045ce4386
Bike riding anims, SA bike/heli cam
2020-06-05 23:13:34 +03:00
majestic
e2cc3e1a33
some original VC's cheats and comparator for them
2020-06-04 18:19:53 -07:00
aap
647fd951ec
more CBike
2020-06-05 00:24:42 +02:00
aap
7f0474e9de
Merge pull request #615 from majesticCoding/miami
...
some orig chearts
2020-06-04 21:50:00 +02:00
eray orçunus
016ebc0b00
fixes, mostly from miami
2020-06-04 06:03:12 +03:00
Sergeanur
07d336ddf0
Merge branch 'master' into miami
...
# Conflicts:
# src/peds/Ped.cpp
# src/peds/Ped.h
2020-06-04 04:32:49 +03:00
Sergeanur
12717917cc
Restore original logic of CPed::WanderRange
2020-06-04 04:31:04 +03:00
majestic
20ffcb68b6
some orig chearts
...
- weapon model indices added
- orig weapon cheats added
- some cheats' names changed to original ones
2020-06-03 14:48:26 -07:00
eray orçunus
5dc410a999
Peds, eSound and PedState enum, fixes
2020-06-03 17:01:11 +03:00
Sergeanur
2df44208dd
Range2D and Range3D
2020-06-03 04:45:25 +03:00
Sergeanur
509ca11d76
Merge remote-tracking branch 'origin/master' into miami
...
# Conflicts:
# src/control/GameLogic.cpp
# src/control/PathFind.cpp
# src/control/RoadBlocks.cpp
# src/control/Script.cpp
# src/control/Script.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/core/TempColModels.cpp
# src/core/config.h
# src/core/re3.cpp
# src/modelinfo/SimpleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.cpp
# src/modelinfo/VehicleModelInfo.h
# src/render/Skidmarks.h
# src/render/WaterLevel.cpp
# src/save/GenericGameStorage.h
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/DamageManager.cpp
# src/vehicles/Vehicle.cpp
# src/vehicles/Vehicle.h
2020-06-03 01:24:08 +03:00
aap
2ca3c50463
some CBike code; vehicle cleanup
2020-06-02 23:35:20 +02:00
aap
04a91761df
some vehicle cleanup
2020-06-02 23:34:53 +02:00
erorcun
03d9525eb6
Merge pull request #611 from erorcun/miami
...
DrawStandardMenus, VC menu array and minor fixes
2020-06-02 00:21:07 +03:00
aap
bfd13d58e0
add freeroam; clean up debug menu
2020-06-01 22:02:22 +02:00
aap
fdf8f35049
CTimer fix
2020-06-01 20:51:18 +02:00
aap
c00f7a8d22
CTimer fix
2020-06-01 20:50:26 +02:00
aap
d8272b8812
hanim fix
2020-06-01 20:32:43 +02:00
aap
8bbb6a2a4a
hanim fix
2020-06-01 20:28:04 +02:00
aap
25273485d9
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
2020-06-01 18:05:24 +02:00
eray orçunus
abef04c637
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
2020-06-01 18:35:04 +03:00
eray orçunus
d930a25d94
DrawStandardMenus, VC menu array and minor fixes
2020-06-01 18:32:34 +03:00
aap
7c7727e7da
fixed timebar toggle
2020-06-01 13:21:19 +02:00
aap
f69313237e
Merge pull request #607 from rollschuh2282/master
...
Added toggles for the TimeBars and the "DebugStuffInRelease" to the Debug Menu
2020-06-01 10:44:45 +02:00
aap
c8b93d0575
fixed bumper colmodel
2020-06-01 10:30:01 +02:00
aap
197c49d740
fixed bumper colmodel
2020-06-01 10:29:46 +02:00
Nikolay Korolev
c1c163d78c
game logic
2020-05-31 20:59:01 +03:00
aap
bae3a3e72f
fixed to CAutomobile and friends
2020-05-31 17:45:26 +02:00
aap
21ce0a4b28
CAutomobile done
2020-05-31 17:05:59 +02:00
aap
00dc86917e
some more CAutomobile
2020-05-31 17:05:59 +02:00
aap
218772c296
gahhh
2020-05-31 17:05:59 +02:00
aap
c1e13177a1
some CAutomobile
2020-05-31 17:05:59 +02:00
Nikolay Korolev
09c9e16cb1
roadblocks
2020-05-30 20:08:31 +03:00
eray orçunus
529cec5653
R to freeroam, idle anims, weapon and cam enum fix
2020-05-29 22:05:33 +03:00
eray orçunus
517f0b9189
fix fix fix
2020-05-29 21:31:06 +03:00
eray orçunus
e38f2a7fb2
fix fix
2020-05-29 21:06:08 +03:00