a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 17:30: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
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
eray orçunus 6438244540 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-05-29 20:29:52 +03:00
eray orçunus 9adde91b3a frontend options fix 2020-05-29 20:29:18 +03:00
rollschuh2282 20cacb18f0
Add files via upload 2020-05-29 12:03:32 +02:00
erorcun e65a09ea09
Merge pull request #604 from erorcun/master 
Frontend customization functions, freecam toggle and minor things
 2020-05-28 22:06:50 +03:00
eray orçunus 9acf27fc53 remove inlining attempts + reload frontend options for real 2020-05-28 17:42:40 +03:00
Nikolay Korolev 111d23beab fix 2020-05-28 17:21:00 +03:00
eray orçunus a61736c51b theoretically fix linux build 2020-05-28 13:08:21 +03:00
eray orçunus e6401bce18 Detect R and start game on menu 2020-05-28 12:46:51 +03:00
eray orçunus 98a97a32fa config reorganization 2020-05-28 11:49:58 +03:00
eray orçunus 98fec63ca7 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-05-28 11:40:56 +03:00
eray orçunus 329a387fdf Frontend customization functions, freecam toggle, minor things 2020-05-28 11:34:12 +03:00
Fire-Head 895580c724 seagulls, ships 2020-05-28 00:15:37 +03:00
Fire_Head e4649b41e1
Merge pull request #2 from GTAmodding/miami 
Miami
 2020-05-27 21:51:40 +03:00
Fire-Head 63d0bdc863 VC Water 2020-05-27 21:50:01 +03:00
aap c068570192
Merge pull request #600 from Fire-Head/miami 
Miami Particle
 2020-05-27 07:18:47 +02:00
Sergeanur 408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
Fire-Head 6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
Nikolay Korolev 9673ecddad Merge remote-tracking branch 'upstream/master' 2020-05-27 00:25:33 +03:00
Nikolay Korolev ec1d14971c mission replay 2020-05-27 00:25:12 +03:00
aap 0ac3477035 fix UB shit 2020-05-26 18:50:27 +02:00
aap 7f60be9814 fix UB shit 2020-05-26 18:50:19 +02:00
Sergeanur 0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
 2020-05-26 17:24:47 +03:00
aap 800d706935
Merge pull request #588 from blingu/miami 
fixed compiler errors
 2020-05-26 11:39:16 +02:00
aap 7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
Nikolay Korolev ad8e8f4341 switch collision with debug menu 2020-05-25 23:59:55 +03:00
aap 3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
aap 7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
nrb d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
eray orçunus 14755a4ff4 all my fixes live in exes 2020-05-24 16:41:29 +03:00
aap 19a0c8b462
Merge pull request #583 from erorcun/miami 
Menu borders and weapon fixes
 2020-05-24 10:47:17 +02:00
eray orçunus 4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
Nikolay Korolev 6a7bd0e330 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 00:19:25 +03:00
Sergeanur 88b6168f1c Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
 2020-05-23 21:14:16 +03:00
Nikolay Korolev 2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00
Nikolay Korolev 607175f02a set pieces 2020-05-23 20:06:52 +03:00
eray orçunus 5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
aap 9313bfa155 skeleton typos 2020-05-23 11:34:48 +02:00
aap e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
Nikolay Korolev b9115b4429 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 01:43:17 +03:00
Nikolay Korolev 7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
aap a1e4b15bcc Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-22 23:58:59 +02:00
Nikolay Korolev 6e51ed3c53 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 23:35:19 +03:00
Sergeanur e858314a9f OpenAL configs 2020-05-22 18:01:09 +03:00
erorcun 4b99d7127f
Merge pull request #579 from Xinerki/miami 
InitAfterFocusLoss compile fix
 2020-05-22 16:10:35 +03:00
Xin a878e09f0f
InitAfterFocusLoss compile fix 2020-05-22 16:04:52 +03:00
erorcun 8b82e9c40f
Merge pull request #574 from Xinerki/miami 
many additions
 2020-05-22 15:49:37 +03:00
aap 21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
aap a53ca58e56 CPhysical 2020-05-22 14:27:16 +02:00
eray orçunus a5f23a0342 VC CMenuManager struct, ctor etc. 2020-05-22 03:48:12 +03:00
Nikolay Korolev 864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
Xinerki 0db3d03c3c sorry my bad 2020-05-21 17:36:12 +03:00
Xinerki 1c00e3cf2c vehicle cheats and debug cheat string display 2020-05-21 17:28:03 +03:00
Xinerki 6692f5b2aa make reloadables optional 2020-05-21 16:47:48 +03:00
Xinerki 6912cfe98a menu map color change 2020-05-21 16:26:56 +03:00
Xinerki 46c6b0d29d fancy HUD.TXD reloader 
TODO: make optional with defines, also add more reload options
 2020-05-21 16:25:46 +03:00
Xinerki 1cb7b9876f scuffed InitAfterFocusLoss implementation 2020-05-21 14:23:12 +03:00
Xinerki b4060a4789 add freecam toggle in control settings 
comes with a free config save!
 2020-05-21 13:06:09 +03:00
Xinerki 2db26d304f approach separation differently 2020-05-21 12:45:45 +03:00
Xinerki 6d32cf4a11 blip marker colors, also isolate crgba 2020-05-21 12:21:02 +03:00
Nikolay Korolev 510261cb05 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-20 23:54:22 +03:00
Nikolay Korolev 0085ed894f script revision 2020-05-20 23:47:44 +03:00
eray orçunus 2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
aap fd4cd3e8f1
Merge pull request #569 from aap/miami 
CEntity and friends
 2020-05-20 12:41:12 +02:00
Nikolay Korolev fec0028e12 sync with upstream 2020-05-19 23:27:41 +03:00
aap 0b0ba49abc small fixes 2020-05-19 21:42:55 +02:00
aap bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
Nikolay Korolev e967db4a3c fixed annoying bug 2020-05-19 21:10:40 +03:00
eray orçunus 99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
eray orçunus a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
aap 8a90e32f1b
Merge pull request #564 from Xinerki/miami 
fix audio menu crash
 2020-05-19 13:26:43 +02:00
aap 6b0b984909
Merge pull request #561 from Nick007J/miami 
script revision
 2020-05-19 13:26:21 +02:00
Xinerki ffd175c705 fix frontend control config menu a little 
thank erorcun
 2020-05-19 14:23:59 +03:00
aap 0d0f4da27a little cleanup of handlingmgr 2020-05-19 13:09:20 +02:00
Xinerki 12b48edada fix audio menu crash 2020-05-19 14:07:24 +03:00
aap 53cdf6ab41 HandlingMgr 2020-05-19 13:07:12 +02:00
aap 401e45d63e
Merge pull request #563 from Xinerki/miami 
match frontend to vc more; isolate crgba
 2020-05-19 12:50:47 +02:00
Xinerki 9e14e8553f match frontend to vc more; isolate crgba 2020-05-19 13:47:55 +03:00
aap 9d16df5aa8
Merge pull request #562 from Xinerki/miami 
Load VC frontend textures and use some
 2020-05-19 10:41:17 +02:00
aap 62db8cd9b0 finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
Xinerki d425358181 Load VC frontend textures and use some 2020-05-19 10:07:15 +03:00
Nikolay Korolev 6510b15704 script revision 2020-05-19 01:49:09 +03:00
aap 2d4861454c
Merge pull request #557 from Nick007J/miami 
script and script stubs
 2020-05-18 13:08:24 +02:00
aap 8f9ce275c8
Merge pull request #558 from Sergeanur/VC/text 
CText
 2020-05-18 13:07:59 +02:00
Sergeanur af22bb1495 CText 2020-05-18 01:28:40 +03:00
Nikolay Korolev fd2948f045 sync with upstream 2020-05-17 23:32:32 +03:00
aap d4a429d986 little cleanup on radar 2020-05-17 22:24:23 +02:00
aap 13903d7c46 radar sprites 2020-05-17 22:21:39 +02:00
Nikolay Korolev 3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
Nikolay Korolev a5b84eb9fe full script basic support 2020-05-17 21:43:11 +03:00
aap 8a7210cad1
Merge pull request #555 from erorcun/miami 
Weapon fixes and thingies
 2020-05-17 20:20:14 +02:00
eray orçunus 84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap a0703fd9e1 loading screens 2020-05-17 19:45:21 +02:00
Nikolay Korolev b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Nikolay Korolev e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
Nikolay Korolev 4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
Nikolay Korolev 21329b8440 sync with upstream 2020-05-16 01:50:45 +03:00
Nikolay Korolev 08b2138c7e ped attractors done 2020-05-16 01:49:30 +03:00
eray orçunus acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Nikolay Korolev 09a0207e55 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-14 22:29:23 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00