a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 02:40:00 +00:00
Code Issues Projects Releases Wiki Activity
3725 commits 4 branches 2 tags 50 MiB
Commit graph

1325 commits

Author SHA1 Message Date
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