a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-07-01 13:33:47 +00:00
Code Issues Projects Releases Wiki Activity
4538 commits 4 branches 2 tags 50 MiB
Commit graph

1192 commits

Author SHA1 Message Date
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 fda58fb1df added GTA_SCENE_EDIT 2020-12-02 02:34:51 +03:00
Sergeanur 24b5406a1d Add GTA_REPLAY 
# Conflicts:
#	src/control/Replay.cpp
#	src/control/Replay.h
 2020-12-01 22:53:09 +02:00
Sergeanur e33ab44b7d Add GTA_REPLAY 2020-12-01 22:08:05 +02:00
aap 56c471d02e
Merge pull request #854 from Nick007J/master 
small garages + templates revision
 2020-12-01 11:25:02 +01: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
Nikolay Korolev 8cb3c07151 some nasty FIX_BUGS for SLIDE_OBJECT 2020-11-28 21:26:38 +03:00
Zach Charo b47c505438 Update Script.cpp 
Case sensitivity fix. Causes compile issue on linux.
 2020-11-28 13:36:38 +02:00
Nikolay Korolev f50a53e290 fix garages 2020-11-27 19:18:51 +03:00
Sergeanur 164f16c85b Some TODOs done in Peds code 2020-11-25 19:39:57 +02:00
Sergeanur a35b3b4602 Script commands split to original files 2020-11-24 14:06:48 +02:00
Sergeanur bd3d09fef5 Script commands split to original files 2020-11-24 12:58:11 +02:00
Sergeanur 833bf4a619 Add some TODO stubs for unused code to be reversed 2020-11-23 18:59:50 +02:00
Sergeanur 3289bfaa87 Darkel done 2020-11-22 23:18:35 +02:00
Nikolay 2b53f267a7 one more fix 
# Conflicts:
#	src/control/Restart.cpp
 2020-11-22 23:13:43 +02:00
Nikolay 6a6551f39b small improvement 
# Conflicts:
#	src/control/Restart.cpp
 2020-11-22 23:13:23 +02:00
Nikolay 222e7f56ff
one more fix 2020-11-22 02:31:52 +03:00
Nikolay d24e1ee592
small improvement 2020-11-22 02:29:17 +03: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
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 b58a54527e
Merge pull request #820 from withmorten/mission-switcher 
add mission switcher from miami
 2020-11-18 01:45:12 +03:00
Nikolay Korolev b9b9dabd75 lcs car ctrl 2 2020-11-16 22:20:56 +03:00
Sergeanur 6bc2ed74fe Add debug code to CPathFind::PreparePathDataForType 2020-11-16 14:56:07 +02:00
Nikolay b508458f37
small fix 2020-11-16 15:13:30 +03:00
Nikolay Korolev ed5a9d5dc1 Merge branch 'miami' into lcs-dev 2020-11-16 12:48:28 +03:00
Nikolay Korolev 15b7126243 small fix of fix 2020-11-16 12:28:20 +03:00
Nikolay Korolev 0ac621588e small fix 2020-11-16 12:22:55 +03:00
Nikolay Korolev 7339ebce60 lcs car ctrl 1 2020-11-16 12:21:50 +03:00
withmorten abcda2ce29 add mission switcher from miami 2020-11-16 00:41:03 +01:00
Nikolay Korolev 26c6908d25 car AI revision 2020-11-14 14:21:56 +03:00
Nikolay Korolev 6682e56f71 small fix 2020-11-13 17:53:03 +03:00
Nikolay Korolev 3048a77a05 fix 2020-11-13 16:02:06 +03:00
Nikolay a76c6b2307 damn 2020-11-11 13:40:11 +03:00
Nikolay a8b5303207
Update src/control/Pickups.cpp 
Co-authored-by: Sergeanur <s.anureev@yandex.ua>
 2020-11-11 13:19:21 +03: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
Sergeanur 5c64dba65a
Merge pull request #771 from theR4K/miamiDev 
more audio for god of audio
 2020-11-10 22:32:12 +02:00
erorcun 59f9c009ef Font: Hud: Use orig. text dimensions, fix right-align calculations 2020-11-10 01:50:34 +03:00
Sergeanur 51e7f44433 Pickup fix 2020-11-08 22:40:05 +02: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
Roman Masanin 95bd5b073a pointers into referencies! 2020-11-08 20:31:24 +03:00
Roman Masanin 23d23f6462 merge upstream 2020-11-08 16:23:05 +03:00
Sergeanur a2e0373d22 Pickups fix 2020-11-08 15:00:54 +02:00
Nikolay Korolev e473123a6a fixes 2020-11-03 00:07:25 +03:00
Nikolay Korolev 0ccc70c843 embarassing 2020-11-02 23:53:52 +03:00
Nikolay Korolev bae6c24209 fix 2020-11-02 15:54:42 +03:00
Roman Masanin 55c4346610 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev 2020-11-01 22:35:46 +03:00
Nikolay Korolev 5edd9e75da finished script and replay 2020-11-01 18:21:05 +03:00
Nikolay Korolev 45c09224f7 fixed KYFC 2020-11-01 16:34:39 +03:00
Nikolay Korolev 63a27fbc5f overflow fix 2020-11-01 13:55:29 +03:00
Nikolay Korolev f21cfef8fb remove autosave at end of mission under MISSION_REPLAY 2020-11-01 12:33:16 +03:00
Sergeanur 9a3758bfc1 Fix undefined colorId for pickups 2020-10-26 16:39:43 +02:00
erorcun 6729de49b1 Font: Fix text dimensions 2020-10-25 20:57:24 +03:00
Roman Masanin a12789c632 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamiDev 2020-10-24 22:26:56 +03:00
erorcun 07d1637342
Merge pull request #779 from Sergeanur/VC/Pickups 
Pickups Done
 2020-10-24 17:56:21 +03:00
Roman Masanin 39b7075502 merge Upstream 2020-10-24 14:20:08 +03:00
Sergeanur ca497e2cbd ScriptSounds 2020-10-23 16:56:34 +03:00
Sergeanur d7b9884f9d Use audio enum 2020-10-23 16:18:46 +03:00
Sergeanur 2709531f09 Rename CObject flag 2020-10-21 21:14:40 +03:00
Sergeanur e9a89236a2 Pickups Done 2020-10-21 21:00:13 +03:00
Sergeanur 632569cff3 Pickup fixes 2020-10-21 19:48:13 +03:00
erorcun 0750f04019 Messages, fix Font 2020-10-20 22:24:56 +03:00
Roman Masanin 0594ed5b46 peds 2020-10-18 23:03:03 +03:00
Nikolay Korolev a1112183de fix 2020-10-18 22:53:25 +03:00
Nikolay Korolev 6173e1dd10 fix 2020-10-18 22:52:49 +03:00
erorcun 1858904ce0
Merge pull request #769 from Sergeanur/VC/Pickups 
Partial Pickups
 2020-10-18 20:01:32 +03:00
erorcun 10758088ef
Merge pull request #766 from Fire-Head/miami 
Glass
 2020-10-18 19:59:11 +03:00
erorcun 70f9832e14
Merge branch 'miami' into miami 2020-10-18 19:45:11 +03:00
Sergeanur 8697eebbc2 Merge branch 'miami' into VC/Pickups 
# Conflicts:
#	src/control/Pickups.cpp
 2020-10-18 17:17:11 +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 cc0ae51631 lil fix 2020-10-18 16:55:11 +03:00
Sergeanur b91f6a4550 Setter for bIsStatic (became virtual in SA) 2020-10-18 16:40:06 +03:00
shfil cafe4e38db Script.cpp missing breaks 2020-10-18 13:37:17 +03:00
Sergeanur b3385015e5 Merge remote-tracking branch 'origin/miami' into VC/Pickups 2020-10-18 04:54:01 +03:00
shfil 82f54b946f Script.cpp missing breaks 2020-10-18 00:56:07 +02:00
erorcun 4e4e0e8e04
Merge pull request #765 from erorcun/miami 
Radar, WaterCannon, win/glfw skels
 2020-10-17 18:39:56 +03:00
Sergeanur e465cea07b Pickup arrays done 2020-10-17 18:05:23 +03:00
eray orçunus b98864d134 Radar, WaterCannon, win/glfw skels 2020-10-17 17:35:26 +03:00
Sergeanur 7fc70179ed Pickup save/load 2020-10-17 17:06:38 +03:00
Sergeanur 7f3b51dd17 Small inner fix 2020-10-17 16:04:11 +03:00
Sergeanur 63666391d4 More Pickup stuff 2020-10-17 15:57:12 +03:00
Sergeanur 516a02d2da Fix pickup fix :P 2020-10-17 15:33:22 +03:00
Sergeanur 1f36b78c20 Pickup fixes 2020-10-17 13:48:08 +03:00
Nikolay Korolev 40434eadfd small fix 2020-10-17 12:31:14 +03:00
Sergeanur ef47dad566 Partial Pickups 2020-10-17 08:23:01 +03:00
Roman Masanin 34b4efe242 fix bullet traces rener and some renaming 2020-10-15 15:42:10 +03:00
Fire-Head e4ac934dbf Miami Glass 2020-10-15 00:33:57 +03:00
Sergeanur a96146c87b Pickup fix 2020-10-14 03:29:25 +03:00
erorcun 1e11c1eac6
Merge pull request #762 from Nick007J/miami 
Control update
 2020-10-12 21:52:59 +03:00
Nikolay Korolev d3788a9c70 Merge remote-tracking branch 'upstream/miami' into miami 2020-10-12 13:57:25 +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
Nikolay Korolev 49c48f2ec2 sync with upstream 2020-10-12 12:11:53 +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
Roman Masanin 7a3e1ef19a SpecialFX almost done 2020-10-11 21:40:11 +03:00
Nikolay Korolev 28b47b601f fix 2020-10-11 18:14:35 +03:00
Nikolay Korolev 91a274da2b small fix 2020-10-11 13:11:25 +03:00
Nikolay Korolev 68779a4dac small fix 2020-10-11 13:05:41 +03:00
Nikolay Korolev 49ad471b2d removed extra header 2020-10-11 12:58:23 +03:00
Nikolay Korolev 552f308e9e sync with upstream 2020-10-11 12:58:11 +03:00
Nikolay Korolev c4d4821327 Control updates 2020-10-11 12:56:33 +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
Roman Masanin 881db86895 CSpecialFX and some other classes 2020-10-09 20:29:38 +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 fec01aeff1 Fix some sanitizer errors, improve POSIX streamer 2020-10-08 17:58:18 +03:00
eray orçunus da39624f1c Pad, BulletInfo, ProjectileInfo, fixes 2020-10-08 00:26:24 +03:00
eray orçunus 556dbdcdd6 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-05 22:18:51 +03:00
Nikolay Korolev 2bfb54b192 fixed darkel/replay 2020-10-05 16:09:44 +03:00
eray orçunus 8c170a62ee Fix some sanitizer errors, improve POSIX streamer 2020-10-04 22:39:54 +03:00
Nikolay Korolev 39678ba5ca small fix 2020-10-03 16:16:46 +03:00
erorcun 72f342245d
Merge pull request #731 from erorcun/miami 
Population done, mouse AUX buttons, Frontend, Hud, fixes
 2020-10-02 17:39:15 +03:00
Nikolay Korolev 1666995cd9 fixed bad bug 2020-09-30 16:29:39 +03:00
Nikolay Korolev 0a58e3e430 fixed bad bug 2020-09-30 16:25:21 +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
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
eray orçunus a5d6c952a7 Credits & fixes 2020-09-27 02:36:49 +03:00
Nikolay Korolev c5699a9b30 now fixed properly 2020-09-26 21:35:09 +03:00
Nikolay Korolev 48a10de41f bug fixed 2020-09-26 21:25:40 +03:00
Nikolay Korolev 3c5624bc56 fixed tabs 2020-09-26 21:16:55 +03:00
Nikolay Korolev 796ad66d72 fixed replay bug 2020-09-26 21:12:47 +03:00
Nikolay Korolev f7d5021ac5 VC replays 2020-09-26 21:10:23 +03:00
Nikolay Korolev b42d9e3e7c silentpatch fixes 2020-09-26 13:30:22 +03:00
Sergeanur 38ec1bd50d Move a bunch of math to cpp files + small fixes 2020-09-14 21:07:31 +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 f0b15ee053 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-11 16:39:35 +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
eray orçunus 93d77f340d Fixes from miami 2020-09-10 03:14:50 +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
Nikolay Korolev 3e4f7b7bdf fixes 2020-09-02 14:13:52 +03:00
majestic 9f43b1988b cheats, fixes, cosmetic changes 2020-09-01 09:42:17 -07:00
aap e3f607dba0
Merge pull request #699 from Nick007J/miami 
small script fix
 2020-09-01 17:30:59 +02:00
aap 6fc6ed8635
Merge pull request #696 from Fire-Head/miami 
Miami Weapon, WeaponEffects done
 2020-09-01 17:30:49 +02:00
Nikolay Korolev 647ddfa05e more fix 2020-08-31 17:18:37 +03:00
Nikolay Korolev 4ffca8954f Merge remote-tracking branch 'upstream/miami' into miami 2020-08-31 00:07:38 +03:00
Nikolay Korolev ed799fb555 script inaccuracy 2020-08-31 00:07:29 +03:00
eray orçunus 3e549a7d44 CGame done, Peds, fixes 2020-08-30 12:40:30 +03: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
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
Sergeanur 14ed50a559 Remote done 2020-08-24 22:52:07 +03:00
Sergeanur bbcf3fd7d2 CutsceneMgr done 2020-08-24 21:52:16 +03:00
Nikolay Korolev 0fd6fb1ff4 fixed a few embarassing mistakes 2020-08-23 12:27:24 +03:00
aap 537b63acb5 call streaming funcs 2020-08-21 00:05:05 +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
majestic 03c90b7c40 stable CScriptPaths 2020-08-20 09:44:26 -07: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
Sergeanur 4d1cfb7214 Island loading cleanup and fix 2020-08-19 03:31:42 +03:00
Jack Powell f09abe9ec1
Added bug fix to fix mission related crashes 2020-08-18 17:14:27 +01:00
Jack Powell 809c09938a
CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLE 2020-08-18 16:59:19 +01:00
Jack Powell db1e5a6ec4
Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside 2020-08-18 16:47:15 +01:00
Nikolay Korolev b03f13b30d fixed bugfix 2020-08-18 16:52:02 +03: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
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 9956b27767 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Darkel.cpp
#	src/core/main.cpp
 2020-08-15 15:13:46 +03:00
eray orçunus 8b3ca9564b Continue to Frontend, fix savegame list bug 2020-08-14 22:44:12 +03:00
eray orçunus f403a63a5c Wheelie opcode 2020-08-14 18:54:01 +03:00
Sergeanur 489743da41 Darkel fixes 2020-08-14 17:34:04 +03:00
eray orçunus b54bb62c94 Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
aap 43bf854374 timecycle done 2020-08-09 19:11:44 +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
eray orçunus e14252914e Squeeze performance option, minor fixes 
Fixes are already in miami
 2020-08-03 16:00:32 +03:00
eray orçunus eafa9cc107 new opcodes, buyable properties, minor fixes 2020-07-30 15:32:34 +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
Sergeanur 581cb5edfa The real pickup reflection fix 2020-07-29 14:56:06 +03: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
eray orçunus 1dc6fbda1f 64-bit on Windows 2020-07-22 18:51:28 +03:00
eray orçunus f40f44b14e Peds, Hud, CFO 1/2, fixes - including zone names 2020-07-22 15:19:22 +03:00
eray orçunus 70df13f9d3 Fixes from miami 2020-07-20 22:47:41 +03:00
Sergeanur eaf569eb6d Merge remote-tracking branch 'origin/master' into miami 2020-07-18 13:31:32 +03:00
Nikolay Korolev d4444f8252 fix 2020-07-18 13:09:37 +03:00
Sergeanur 949d0c8853 Add audio cache for faster initialization 2020-07-17 13:48:25 +03:00
Sergeanur ebdc5cca7f Merge branch 'master' into miami 2020-07-16 23:03:31 +03:00
Sergeanur ec09055599 Fix CCarStateEachFrame 2020-07-16 22:21:09 +03: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
erorcun 30723cf723
Merge pull request #654 from erorcun/miami 
VC fighting, Peds, many fixes including ghost bikes
 2020-07-10 00:06:16 +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
Dominik fa1263b6a4
CDarkel miami hud colors. 2020-07-07 01:02:39 +02:00
eray orçunus c483a044b5 Noskillx's PR + fix .set loading 2020-07-06 19:26:41 +03:00
eray orçunus ceb1defc4e fixes from master, menu helper text 2020-07-04 23:50:43 +03:00
aap 2c50cf8ac6
Merge pull request #648 from Nick007J/miami 
ice cream attractor + bike respray
 2020-07-04 21:24:23 +02:00
eray orçunus addb701638 Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-07-03 16:51:58 +03:00
eray orçunus 15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
Nikolay Korolev 49a8dd7459
fixed typo 2020-07-03 15:21:11 +03:00
Nikolay Korolev 9bb8b39956
fixed typo 2020-07-03 15:17:02 +03:00
Nikolay Korolev 85e899c1a5
fixed typo 2020-07-03 15:15:42 +03:00
Nikolay Korolev 48ebbb7292 ice cream attractor + bike respray 2020-07-03 11:08:19 +03: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
Nikolay Korolev 389123cff3 fix 2020-07-01 16:06:16 +03:00
Nikolay Korolev ade5dff217 script logging for miami 2020-07-01 15:43:19 +03:00
Nikolay Korolev a1356f1001
copypaste bug 2020-07-01 15:38:32 +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
Nikolay Korolev 779d4e02a4 little fix 2020-07-01 15:12:25 +03: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 860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Nikolay Korolev 920bc0a1bf fix 2020-06-28 16:24:09 +03:00
Nikolay Korolev d6e111bb67 script logging fixes 2020-06-28 11:59:20 +03:00
Fire-Head 1c11a8081f mips overdose 2020-06-28 00:01:51 +03:00
Nikolay Korolev ba3fe38f2e fixes 2020-06-22 14:07:19 +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
Nikolay Korolev 0ab4496423 copypaste 2020-06-21 13:51:20 +03:00
Nikolay Korolev f5cba0ce89 script logging 2020-06-21 13:46:23 +03:00
Nikolay Korolev 144f12525e fix 2020-06-20 13:51:39 +03:00
Nikolay Korolev eab6741afe fix 2020-06-20 13:26:27 +03:00
Nikolay Korolev e9e533b0cb bikes in garages + bugfix 2020-06-18 00:03:43 +03:00
eray orçunus e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
eray orçunus a822692c26 fix crash-VC pickup scaling 2020-06-16 22:55:28 +03:00
eray orçunus c6bb1f5d0d some cutscene opcodes and heli guns 2020-06-16 20:35:09 +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
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
aap c7a32bb83d some camera code 2020-06-14 09:36:30 +02:00
Nikolay Korolev f78f707935 script fix 2020-06-13 02:02:59 +03:00
Nikolay Korolev d415c4edd3
minor fix 2020-06-13 00:16:10 +03:00
Nikolay Korolev 3900366a6b debug fix 2020-06-12 22:39:33 +03:00
Nikolay Korolev 17dd26e1ca heli AI fix 2020-06-12 22:38:37 +03:00
aap b07b1f0b51
Merge pull request #624 from erorcun/miami 
Peds, bike center of mass and reversing fixes
 2020-06-09 15:43:25 +02:00
eray orçunus dba2b052a6 Peds, bike center of mass and reversing fixes 2020-06-09 01:29:55 +03:00
Sergeanur 95e9fe7693 fixes 2020-06-08 16:22:49 +03:00
Sergeanur 36a6d124aa Mission audio slots 2020-06-08 10:34:31 +03:00
Nikolay Korolev 2de3c6d67b some fixes to heli AI (not all yet) 2020-06-08 02:34:53 +03:00
Nikolay Korolev b498ad800c Merge remote-tracking branch 'upstream/miami' into miami 2020-06-08 02:04:58 +03:00
Nikolay Korolev d48749f797 fixed attached ped 2020-06-08 02:04:37 +03:00
eray orçunus 94e9101ce0 more fixes 2020-06-08 01:51:11 +03:00
Nikolay Korolev 16a5c2f676 fixes 2020-06-08 01:21:49 +03:00
Nikolay Korolev af564d865c fixes 2020-06-08 01:16:21 +03:00
eray orçunus a77b181e32 CarCtrl fixes 2020-06-08 00:59:43 +03:00
Nikolay Korolev 23f20ceaf8 fix 2020-06-07 19:35:05 +03:00
Nikolay Korolev 2f9becbac6 fix 2020-06-07 19:31:15 +03:00
Nikolay Korolev d0213e466c more script commands 2020-06-07 15:49:25 +03:00
Nikolay Korolev 0b156f1d26 some stats tweaks; saves dead again 2020-06-07 15:23:52 +03:00
Nikolay Korolev c50a61d52a fixed some arithmetic 2020-06-07 15:08:58 +03:00
Nikolay Korolev be2291e44c fixed some arithmetic 2020-06-07 15:07:36 +03:00
eray orçunus de4323f949 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 12:46:15 +03:00
eray orçunus d1a02e6ddc New ped objectives 2020-06-07 12:45:53 +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
Nikolay Korolev 3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +03:00
eray orçunus f045ce4386 Bike riding anims, SA bike/heli cam 2020-06-05 23:13:34 +03:00
Nikolay Korolev 83e4023dc0 fix 2020-06-05 12:59:27 +03:00
Nikolay Korolev d325a3d247 basic bike support in traffic, script and car gen; some heli AI 2020-06-05 11:22:15 +03:00
eray orçunus 5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +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
Nikolay Korolev 0803c821ae fixed roadblocks 2020-06-01 12:45:03 +03:00
Nikolay Korolev c1c163d78c game logic 2020-05-31 20:59:01 +03:00
Nikolay Korolev 49a897c3b3 better name 2020-05-30 20:09:58 +03:00
Nikolay Korolev 09c9e16cb1 roadblocks 2020-05-30 20:08:31 +03:00
Nikolay Korolev e6b9c20131
fix 2020-05-30 18:07:01 +03:00
eray orçunus dd162c3aa0 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-29 22:05:52 +03:00
eray orçunus 529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
Nikolay Korolev 627ffb0f82 fix 2020-05-29 16:52:02 +03:00
eray orçunus e6401bce18 Detect R and start game on menu 2020-05-28 12:46:51 +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
aap 9bcec54291
Merge pull request #599 from Nick007J/master 
Mission replay
 2020-05-28 10:25:14 +02:00
Nikolay Korolev d9d57f12fc
crash fix 2020-05-28 01:00:49 +03:00
Nikolay Korolev d4ae40ae99 crash fix 2020-05-27 19:39:04 +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 90947a608f fix linux build 2020-05-27 03:18:02 +03:00
Fire-Head 6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
Nikolay Korolev ec1d14971c mission replay 2020-05-27 00:25:12 +03: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
Nikolay Korolev 5ca0d6c6cf fixed NE bug 2020-05-26 00:45:32 +03:00
Nikolay Korolev 38d2854226 fixed FIX_BUGS 2020-05-26 00:18:04 +03:00
aap 7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
blingu 79c652e115
Ped.h include not needed 2020-05-24 17:48:13 +02:00
nrb d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
Nikolay Korolev 8705562559 how did saving even work in original III? 2020-05-24 15:58:25 +03:00
Nikolay Korolev 8c510a8d5b script fix 2020-05-24 15:00:45 +03:00
Nikolay Korolev cda3752838 comments 2020-05-24 13:48:17 +03:00
Nikolay Korolev e95de89c9a script fix 2020-05-24 12:01:07 +03:00
Nikolay Korolev 2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00