a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-26 20:21:54 +00:00
Code Issues Projects Releases Wiki Activity
3996 commits 4 branches 2 tags 50 MiB
Commit graph

3373 commits

Author SHA1 Message Date
Sergeanur 6450fd2692 Fix zone saving on 64 bit 2020-10-12 22:54:46 +03:00
erorcun 1e11c1eac6
Merge pull request #762 from Nick007J/miami 
Control update
 2020-10-12 21:52:59 +03:00
Roman Masanin a4fd1a9f39 sirenes and more marks for audio. also fix cAudioMrg size 2020-10-12 20:55:19 +03:00
erorcun 4e07297503
Update sampman_miles.cpp 2020-10-12 20:51:52 +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 e34261d3ef mark some audio stuff and fix frameCounter 2020-10-12 18:09:58 +03:00
Roman Masanin 417646819c Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-12 13:42:57 +03:00
Roman Masanin 56bb7d721a mark file and fix screen offset 2020-10-12 13:41:57 +03:00
Roman Masanin e6a1ea9d4f CBrightLight::render 2020-10-12 13:28:06 +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
eray orçunus b1e235535c Cutscene aspect ratio fix 2020-10-12 12:16:24 +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
Sergeanur 239e09ad07
Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad 
Zones saving and loading
 2020-10-12 04:16:30 +03:00
Roman Masanin ca1d899413 final step 2020-10-11 22:29:49 +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
Sergeanur b0becb5a2d UnicodeMakeUpperCase move + arg fix 2020-10-11 10:39:04 +03:00
Sergeanur 9dba2386bb Merge branch 'master' into VC/TextFinish 
# Conflicts:
#	src/text/Text.cpp
 2020-10-11 10:34:47 +03:00
Sergeanur 43af5d9c1f Merge branch 'miami' into VC/TextFinish 2020-10-11 10:33:56 +03:00
Sergeanur e26e85deb8 Some unicode funcs belong to Font.cpp + small fix 2020-10-11 10:33:02 +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 6fe6d0cb9a Finish Text stuff 2020-10-11 00:56:16 +03:00
Sergeanur dd039677a0 Zones saving and loading 2020-10-10 23:50:00 +03:00
Nikolay 63611408b1
bug fix 2020-10-10 18:19:49 +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
erorcun b97f86deea
Merge pull request #750 from erorcun/miami 
Pad, BulletInfo, ProjectileInfo, fixes
 2020-10-08 21:39:11 +03:00
Roman Masanin e52c5ca1bb fix for wheelie cras 2020-10-08 20:34:59 +03:00
majestic 9a10501698 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-10-08 09:31:57 -07: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
erorcun 3435d6656c
Merge pull request #748 from theR4K/miamiUpstream 
CExplosion and some audio
 2020-10-08 16:15:18 +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 0409907438 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-08 01:26:34 +03:00
eray orçunus 07cdd06373 little renamings & librw update 2020-10-08 01:17:19 +03:00
erorcun 8b7bf76260
Merge pull request #735 from theR4K/miami 
car fly cheat enhancement
 2020-10-08 00:59:10 +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
Roman Masanin a6a1de5006 rename var 2020-10-05 19:05:13 +03:00
Filip Gawin e3571510ae Fix build on clang 2020-10-05 17:40:44 +02:00
Roman Masanin 4fd93fea51 fix mistakes 2020-10-05 17:24:57 +03:00
Roman Masanin e3273d7268 CExplosion done 2020-10-05 16:14:48 +03:00
Nikolay Korolev 6853be36c8 Merge remote-tracking branch 'upstream/master' 2020-10-05 16:10:26 +03:00
Nikolay Korolev 2bfb54b192 fixed darkel/replay 2020-10-05 16:09:44 +03:00
eray orçunus c5a61b3d3b Merge branch 'master' of https://github.com/GTAmodding/re3 2020-10-05 14:26:42 +03:00
eray orçunus 9db0d7bba1 Merge branch 'master' of https://github.com/GTAmodding/re3 into audioFix 2020-10-05 14:24:45 +03:00
eray orçunus ee27cae732 Fix Linux audio path 2020-10-05 14:23:37 +03:00
eray orçunus 1a0b71bd47 Fix Audio 2020-10-05 14:23:12 +03:00
eray orçunus 6f3f581d8a Fix Audio 2020-10-05 13:59:40 +03:00
Roman Masanin 4867d9949d some audio and part of CExplosion 2020-10-05 03:04:35 +03:00
eray orçunus 49ae7da5ce Fix Linux audio path 2020-10-05 01:25:56 +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
Roman Masanin 1b3144f978 back to the future style wheels on flying 2020-10-04 19:03:34 +03:00
Filip Gawin 0ac2be0093 Fix unsigned comparison in CStreaming::MakeSpaceFor(int32 size) 2020-10-04 13:18:24 +02:00
Nikolay Korolev 39678ba5ca small fix 2020-10-03 16:16:46 +03:00
erorcun a8c19dfed8
Merge pull request #734 from Tatsh/macos 
macOS support
 2020-10-03 13:22:08 +03: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
shfil 9d53b738cc
Merge pull request #737 from theR4K/miamiDev 
just ProcessActiveQueues
 2020-10-02 20:11:00 +02:00
Nikolay Korolev 8761763d95 fixed cargen check 2020-10-02 20:43:24 +03:00
Roman Masanin 1991f9b362 revert some changes and little fix 2020-10-02 20:35:16 +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
Roman Masanin 6ff138ca76 fix build(bcs func CheckForAnAudioFileOnCD not used anymore) 2020-10-02 05:03:29 +03:00
Roman Masanin 064f2e66e1 letter 'c' is done 2020-10-02 04:59:06 +03:00
Roman Masanin e5a48faf89 merged from upstream 2020-10-02 04:03:17 +03:00
Roman Masanin 63e5faef11 rewieved some audio functions 2020-10-02 03:55:26 +03:00
Andrew Udvare f6bc2b654c
CdStreamPosix: fix type issues 2020-10-01 20:45:38 -04:00
Roman Masanin e54b540bd4 final processActiveQueues 2020-10-02 00:11:51 +03:00
Roman Masanin 311cffa901 second pass processActiveQueues 2020-10-01 23:48:35 +03:00
Roman Masanin eb0e89d3ea half done processActiveQueues 2020-10-01 23:11:20 +03: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 049c993ce0 fix ternary operator 2020-10-01 02:45:24 +03: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 ee3f5744f5 Merge branch 'master' of github.com:erorcun/re3 2020-09-30 20:54:42 +03:00
eray orçunus 595421da39 Fixes, mouse AUX buttons, joystick detect menu 2020-09-30 20:03:01 +03:00
Filip Gawin 4ec5e44b68 Mark audio code which is the same in re3 as done 2020-09-30 18:14:50 +02: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
Roman Masanin db0758690e new implementation for car fly enhancment 2020-09-30 13:37:43 +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
Sergeanur fae4c73ad3 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
#	src/audio/MusicManager.cpp
#	src/audio/sampman.h
#	src/audio/sampman_oal.cpp
#	src/control/CarCtrl.cpp
#	src/control/Replay.cpp
#	src/control/Script.cpp
#	src/core/Camera.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/math/Matrix.cpp
#	src/math/Matrix.h
#	src/math/Vector2D.h
#	src/peds/Ped.cpp
#	src/render/Credits.cpp
#	src/render/Hud.cpp
#	src/render/Skidmarks.cpp
#	src/weapons/Weapon.cpp
 2020-09-30 02:25:30 +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
Filip Gawin 855c6a3c05 Fix build (if -> ifdef) 2020-09-30 02:18:46 +03:00
Filip Gawin ff2998bee3 Make frequency more consistent with vanilla 2020-09-30 02:18:38 +03:00
Sergeanur 2129cc2906 Fix arg types 2020-09-30 02:18:11 +03:00
Nikolay Korolev 9cce324316 fixed cargen 
# Conflicts:
#	src/vehicles/CarGen.cpp
 2020-09-30 02:18:03 +03:00
shfil f35fd97c76 Merge pull request #722 from theR4K/master 
fix for frequency miscalculation
 2020-09-30 02:17:14 +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 8235fe08d1 Fix more 2020-09-29 17:47:48 +02:00
Filip Gawin e324f3dac0 Some more const 2020-09-29 17:43:34 +02: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
Filip Gawin 8424eabf22 Fix build (if -> ifdef) 2020-09-29 17:02:47 +02:00
Filip Gawin a0b6410801 Make frequency more consistent with vanilla 2020-09-29 16:56:40 +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
Roman Masanin a729f32c83 TEMPORALY remove flying cars 2020-09-29 01:39:59 +03:00
Sergeanur 5144b5051c Fix arg types 2020-09-28 21:37:59 +03:00
Nikolay Korolev 742ca47a43 fixed cargen 2020-09-28 21:25:14 +03:00
Roman Masanin a5269b998b reverse compare 2020-09-28 21:11:24 +03:00
Roman Masanin c317d3d9b1 tiny style fix 2020-09-28 21:09:06 +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 7576b003c6 change for better understanding 2020-09-28 20:48:28 +03:00
Greg V 7d03a6fe29 Use CLOCK_MONOTONIC_FAST when available (FreeBSD) 
CLOCK_MONOTONIC_FAST is the equivalent of Linux's CLOCK_MONOTONIC_RAW.
 2020-09-28 04:59:14 +03:00
Greg V 0205960a2f Use GLFW_CURSOR_DISABLED (glfw's native mouse restriction) 
On Wayland, clients cannot move the mouse pointer.
Mouse constraints, as required for 3D camera movement, are an explicit specific thing,
and glfw supports it with GLFW_CURSOR_DISABLED.
Use DISABLED, unless we're in a menu in windowed mode, where HIDDEN is still appropriate.
 2020-09-28 04:53:15 +03:00
Greg V b95accb8ff glfw: scale cursor position by the ratio of framebuffer to screen size 
This fixes the mouse being constrained to the top left quarter of the window on Wayland HiDPI setups.
 2020-09-28 04:52:13 +03:00
Greg V 5654347c5d Use glfwSetFramebufferSizeCallback instead of glfwSetWindowSizeCallback 
Framebuffer size is scaled by the display scale.
This fixes the game being shrunk to the bottom left quarter of the window on Wayland HiDPI setups.

Corresponding change in librw: glfwGetWindowSize -> glfwGetFramebufferSize.
 2020-09-28 04:50:57 +03:00
Roman Masanin 1ea89f5aed Merge remote-tracking branch 'upstream/master' 2020-09-28 03:40:58 +03:00
Roman Masanin 37e382c758 fix for frequency misscalculation 2020-09-28 03:29:45 +03: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
Roman Masanin f67275be13 correction of defects and another two audio functions 2020-09-27 03:35:15 +03:00
eray orçunus a5d6c952a7 Credits & fixes 2020-09-27 02:36:49 +03:00
Sergeanur 4cfc61da14 Use enums in aVehicleSettings 2020-09-27 02:26:35 +03:00
Roman Masanin c403df0861 processEngineDamage 2020-09-27 02:03:36 +03:00
Roman Masanin bb2e601e13 Merge remote-tracking branch 'upstream/miami' into miami 2020-09-26 21:38:37 +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
shfil db1137b5a1
Merge pull request #715 from Nick007J/master 
some SilentPatch fixes
 2020-09-26 20:11:25 +02:00
Nikolay Korolev f7d5021ac5 VC replays 2020-09-26 21:10:23 +03:00
Roman Masanin 4c220b1f95 return bridge, crane and fix structures in fluff.h 2020-09-26 21:07:51 +03:00
Roman Masanin 356c50ec1e mark completed functions in audioManager.h 2020-09-26 20:50:51 +03:00
Roman Masanin ec8ac117ed Improve dodo cheat to allow fly on cars 2020-09-26 20:36:07 +03:00
Roman Masanin c61160fee3 small fixes and cleanup 2020-09-26 20:24:25 +03:00
Roman Masanin 1bd497effc complete cleanup heli and flatTyre 2020-09-26 14:32:14 +03:00
Sergeanur 4d1182bdb1 Fix coronas reflections 2020-09-26 14:24:21 +03:00
Sergeanur 05e65baabe Fix coronas reflections 2020-09-26 14:23:34 +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
Roman Masanin e256eaf014 cleanup carHeli 2020-09-26 05:41:10 +03:00
Sergeanur dd93a90ab2 Fix MASTER build with glfw 2020-09-26 05:14:24 +03:00
Sergeanur 3f0a80f7c7 Fix MASTER build with glfw 2020-09-26 05:10:22 +03:00
Roman Masanin a75ddd0d0c processVehicleOneShots for heli, and heli blade fix 2020-09-26 04:10:00 +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
Roman Masanin 6e3523d594 flat tyre and minimal refractoring 2020-09-25 23:27:28 +03:00
Roman Masanin 4d1023ca30 safe before clean up 2020-09-25 04:57:11 +03:00
Roman Masanin f097b9c972 fix deaddodo 2020-09-25 03:10:11 +03:00
Roman Masanin 4414288b86 remove anther goto 2020-09-25 02:30:51 +03:00
Roman Masanin b3cbe3d338 removed some goto 2020-09-25 02:17:58 +03:00
Roman Masanin 1d22c78f9f processCarHeli half done 2020-09-25 01:43:19 +03:00
eray orçunus dbc458a4d7 CPed and CCivilianPed funcs done 2020-09-24 01:54:37 +03:00
Roman Masanin b2e3d90734 ProcessEscalators + some fixes 2020-09-22 19:32:05 +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 a9c3fdd63f rewisited: 
ProcessReverseGear
ProcessWeather
ProcessScriptObject
ProcessExtraSounds
ProcessEntity
and so, more info in my repo
 2020-09-22 03:28:14 +03:00
Sergeanur bde17bb395
Merge pull request #706 from theR4K/miami 
Miami
 2020-09-21 19:55:51 +03:00
Roman Masanin 579d96534d fix enum edditing effects for oal target and small improvements 2020-09-21 03:21:17 +03:00
Roman Masanin 0f119ed371 cleanup processVehicleEngine and some fixes 2020-09-21 02:49:35 +03:00
Roman Masanin 5b9e4c4780 some style and bug fixes, updated sfx enum, and implemented processVehicleEngine 2020-09-21 01:55:22 +03:00
shfil 3bad82db3b
Fix build (renamed var name in definiton file) 2020-09-19 20:45:57 +02:00
Sergeanur ec2f4fde93 Fixes to MusicManager 2020-09-19 16:40:30 +03:00
Sergeanur db2c34923d Fixes to MusicManager 2020-09-19 16:39:31 +03:00
Sergeanur 7efc153dc9 Renaming audio enum entries to something more like original 2020-09-19 15:55:27 +03:00
Roman Masanin 223cd11835 just more cleanup... 2020-09-18 20:32:25 +03:00
Roman Masanin 5f810ff21c cleanup processVehicle 2020-09-18 19:14:36 +03:00
Roman Masanin 7f77e8a441 cleanup processPlayerVehicleEngine 2020-09-18 19:11:28 +03:00
Roman Masanin 3ab01fa6a3 fix conditions for processPlayerVehicleEngine 2020-09-18 18:11:49 +03:00
Roman Masanin c19c5ca083 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-15 23:24:22 +03:00
Roman Masanin 2d3d5d67ee revisit processVehicle 2020-09-15 22:06:18 +03:00
Sergeanur 9c2e9fcf88 Fix RotateY 2020-09-15 00:31:57 +03:00
Sergeanur dff49e9c23 Fix RotateY 2020-09-15 00:31:32 +03:00
Roman Masanin 97550b4fd9 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-09-14 21:47:15 +03:00
Roman Masanin 16dab00bec finish work on ProcessPlayerVehicleEngine and cleanup 2020-09-14 21:47:00 +03:00
Sergeanur a8a28c1512 Move a bunch of math to cpp files + small fixes 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/math/Matrix.h
#	src/math/Vector2D.h
#	src/math/math.cpp
#	src/render/Skidmarks.cpp
 2020-09-14 21:10:23 +03:00
Sergeanur 38ec1bd50d Move a bunch of math to cpp files + small fixes 2020-09-14 21:07:31 +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
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 bc0a97af04 Add missing file 2020-09-10 01:08:44 +03:00
Sergeanur f6c0bcf201 Fix getter types 2020-09-10 00:57:14 +03:00
Sergeanur 7aca08a954 player mood enum 2020-09-10 00:32:51 +03:00
Sergeanur c5b411c1ed Fix crash on assert 2020-09-09 22:36:53 +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
Sergeanur 9b47625115 More stinger fix 2020-09-02 21:03:02 +03:00
Sergeanur fa7334c74f Stinger fixes 2020-09-02 20:55:28 +03:00
Nikolay Korolev 3e4f7b7bdf fixes 2020-09-02 14:13:52 +03:00
eray orçunus 16e10d788a Enable Stinger 2020-09-01 21:10:35 +03:00
majestic 9f43b1988b cheats, fixes, cosmetic changes 2020-09-01 09:42:17 -07:00
aap 0640ec7f5a
Merge pull request #700 from Sergeanur/VC/Stinger 
Stinger done
 2020-09-01 17:31:35 +02: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
Sergeanur 3bb0e78e1c Rename vars 2020-09-01 12:35:59 +03:00
Sergeanur 6778640b52 Rename states 2020-08-31 21:35:26 +03:00
Sergeanur df67c73d81 vars rename 2020-08-31 21:21:50 +03:00
Sergeanur 024f0a5027 use SetOrientation 2020-08-31 21:15:04 +03:00
Sergeanur 8a0a29c64e Stinger done 2020-08-31 21:09:48 +03: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
erorcun b7456c604d
Merge pull request #697 from erorcun/miami 
CGame done, Peds, fixes
 2020-08-30 23:24:39 +03:00
Fire-Head c22d252246 fix melee car damage 2020-08-30 17:50:03 +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 210c7b8785 bike shooting fix + trace temp fix 2020-08-27 20:27:28 +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
Sergeanur 14ed50a559 Remote done 2020-08-24 22:52:07 +03:00
Sergeanur 041d342faf PlayerSkin done 2020-08-24 22:37:38 +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 85cf043e4a Compilation fix 2020-08-24 22:14:05 +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 1d907ac91f small fix 2020-08-24 21:56:34 +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 0a19925e99 finished sprites 2020-08-24 14:26:17 +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
Nikolay Korolev 0fd6fb1ff4 fixed a few embarassing mistakes 2020-08-23 12:27:24 +03:00
aap 4545ddee6d ... 2020-08-21 23:35:47 +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 23c52c1c86 fixed CRenderer::ScanSectorPoly again 2020-08-21 09:40:31 +02:00
aap ac5af18891 fixed CRenderer::ScanSectorPoly again 2020-08-21 09:40:10 +02:00
aap 537b63acb5 call streaming funcs 2020-08-21 00:05:05 +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
Sergeanur 0f5a771292 Fix cAudioScriptObject 2020-08-20 14:47:53 +03:00
aap a9a1bf5056 changed a sound enum 2020-08-20 13:21:08 +02:00
aap 7da4f7fc35 fixed sound enum 2020-08-20 13:20:48 +02: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
aap 30dadcfb22 transmission done 2020-08-20 10:24:12 +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 c2e20070ab txd.img bug 2020-08-19 16:54:09 +02:00
aap 895055a3d1 update librw; fix txd.img bug 2020-08-19 16:53:11 +02: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
Nikolay Korolev c559b71bc9 little fix 2020-08-18 20:08:27 +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
Jack Powell 2dcf31b6c7
Call CWorld::Remove before the delete, the original game does this and its safer. 2020-08-18 15:57:40 +01:00
Nikolay Korolev b03f13b30d fixed bugfix 2020-08-18 16:52:02 +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 72088a000b Don't react if player's targeting with melee 2020-08-14 19:42:15 +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 489743da41 Darkel fixes 2020-08-14 17:34:04 +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
aap 85d76dc171 fixed clouds render 2020-08-14 09:28:17 +02:00
aap 2a0a508a10 fixed clouds render 2020-08-14 09:27:54 +02:00
eray orçunus 80a83d48f3 Guardian Angels fix 2020-08-14 02:41:18 +03:00
eray orçunus b54bb62c94 Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
aap cdebea71f3 fixes to HUD and sprite2d 2020-08-13 18:47:39 +02:00
aap afed831aed extended postfx and sniper hud fix 2020-08-13 18:14:24 +02:00
aap 0d8fcb41ee fix render poly bug 2020-08-13 16:30:23 +02:00
aap f0503edf62 fix render poly bug 2020-08-13 16:29:42 +02:00
eray orçunus 2034d7b2ae Register start button for real 2020-08-13 01:29:34 +03:00
aap 878ffa8998 sun reflection fix 2020-08-12 10:48:00 +02:00
aap a9935dcd45 tiny postfx cleanup 2020-08-11 19:42:08 +02: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
aap c2c65207a3
Merge pull request #677 from majesticCoding/miami 
CWindModifiers
 2020-08-10 17:12:32 +02:00
aap 2f987e315e update librw (shadows are working now) 2020-08-10 17:04:57 +02:00
majestic 70029752f5 CWindModifiers 2020-08-09 21:42:12 -07:00
majestic b73b6b8e13 CWindModifiers 2020-08-09 12:32:30 -07:00
aap e57d450809 drunk blur done 2020-08-09 19:51:16 +02:00
aap a149d9d511 little timecycle cleanup 2020-08-09 19:32:32 +02:00
aap 43bf854374 timecycle done 2020-08-09 19:11:44 +02:00
aap 4118d2aa55 finished skidmarks 2020-08-09 17:14:24 +02:00
aap 0bb46f3f8c rubbish done 2020-08-09 16:49:15 +02:00
aap 59d25d3ad8 pointlight fixes 2020-08-09 15:45:54 +02:00
aap 6514bc6b39 pointlights done 2020-08-09 15:45:38 +02:00
aap 951439486f Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-08-09 13:18:01 +02:00
aap b02c7cdc44 coronas done 2020-08-09 13:17:48 +02:00
aap 5dc7ff98f2 corona fixes 2020-08-09 13:17:05 +02:00
Fire-Head d2d8bea51e rem pobj assert 2020-08-09 01:30:57 +03:00
aap bad2b4b3c2
Merge pull request #681 from withmorten/master 
remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't …
 2020-08-08 17:40:17 +02:00
withmorten 24a1644b2a don't CoUninitialize for NO_MOVIES 2020-08-08 17:12:23 +02:00
Fire-Head 265b07a8d9 Update Ped.cpp 2020-08-08 18:04:46 +03: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
withmorten ce0633a0c2 remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't check return value for CoInitialize 2020-08-07 18:52:33 +02:00
blingu 8392b9ad2f
Update glfw.cpp 2020-08-07 17:51:43 +02: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
Fire_Head 6fcc75032e
Update CutsceneShadow.h 2020-08-05 17:13:21 +03:00
blingu 56ea53a5db
clang throws an error if fixed comparisons are against NULL 2020-08-05 14:35:24 +02:00
blingu c4f9bfdc44
added FreeBSD support 2020-08-05 14:33:50 +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
Fire-Head 89fd7759a3 fixes 2020-08-04 16:24:59 +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
Sergeanur 4b3faea965 Update mpg123.32 2020-08-03 17:04:00 +03: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 90689a1717 shadow fixes 2020-08-03 01:25:29 +03:00
Sergeanur 3e24ae8812 Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
#	sdk/rwsdk/include/d3d8/baaplylt.c
#	sdk/rwsdk/include/d3d8/rpstereo.h
#	sdk/rwsdk/include/d3d8/rpstereo.rpe
#	sdk/rwsdk/include/d3d8/rtintel.h
#	sdk/rwsdk/include/d3d8/rtintel.rpe
#	src/audio/oal/stream.cpp
 2020-08-02 19:49:12 +03:00
Sergeanur a786dd45a4 Move sdk and eax 2020-08-02 19:36:50 +03:00
Fire-Head f6663b01bc Update CutsceneShadow.h 2020-07-31 21:34:52 +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
Fire-Head e2ded2d6ce cutsceneshadow fixes 2020-07-30 01:32:21 +03:00
Sergeanur 57d5782588
Merge pull request #587 from Sergeanur/opus 
OPUS support for OpenAL
 2020-07-29 15:52:17 +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 4a4feb948d Add forgotten file 2020-07-29 15:25:57 +03: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 f2f19ccea3 Update RwHelper.cpp 2020-07-29 12:41:53 +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 2f40c3dc8b synch fakerw with reVC; update librw 2020-07-29 09:50:06 +02:00
aap c649028b01 some fakerw additions for shadows; update librw 2020-07-29 09:49:41 +02: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
aap e2d56f00dd heli fixes 2020-07-26 23:40:26 +02:00
Filip Gawin 98ec7bdaf9 Provide more memory for casepath's arg 2020-07-26 00:11:13 +02:00
Filip Gawin 40c09d28f7 fix windows build, don't use crossplatform 2020-07-25 22:38:42 +02:00
Filip Gawin b0414c84b9 Small fixes for linux build 2020-07-25 22:04:59 +02:00
Filip Gawin 3856b932dd Disable cache for openal for now 2020-07-25 20:25:34 +02:00
eray orçunus 7fea567eb2 Fix/change some Windows define 2020-07-25 15:24:24 +03: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
aap fdb262bca0 update librw 2020-07-22 14:02:43 +02:00
aap c813630aad update librw 2020-07-22 14:02:14 +02: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
eray orçunus d596f979aa Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun 2020-07-21 20:23:13 +03:00
eray orçunus 4cf6024cdb cosmetic changes 2020-07-21 20:22:52 +03:00
aap 34b162d2c9 fixed to renderer 2020-07-21 11:12:15 +02:00
aap d4d6290403 fixed to renderer 2020-07-21 11:12:10 +02:00
aap 0fba76a565 made NPC heli rotors rotate 2020-07-21 09:58:53 +02:00
eray orçunus 6dbc0c7dda a cute mistake 2020-07-21 06:41:41 +03: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
aap e74b569115 CPlane done 2020-07-19 00:56:30 +02:00
aap b8c2cf597d figured out magic 2020-07-19 00:56:13 +02:00
aap 2cfd3a9e92 CPlane fixes 2020-07-19 00:37:12 +02:00
Sergeanur f760696a9f Fix another float 2020-07-18 19:37:28 +03:00
Sergeanur 28d7d6b2f1 Fix some audio floats 2020-07-18 19:18:58 +03:00
Sergeanur a1412d1cdb Fix OneShotPriority overflow 2020-07-18 14:15:06 +03:00
Sergeanur eaf569eb6d Merge remote-tracking branch 'origin/master' into miami 2020-07-18 13:31:32 +03:00
Sergeanur 87eb96453a Add compatibility with RW 3.4 2020-07-18 13:30:51 +03:00
Sergeanur dd717b2d93 Actual fix now xD 2020-07-18 13:27:31 +03:00
Nikolay Korolev d4444f8252 fix 2020-07-18 13:09:37 +03:00
Sergeanur cf5dd6289e Fix TempVertexBuffer overflow 2020-07-18 13:09:21 +03:00
Sergeanur 30384bb4ef Merge branch 'master' into miami 
# Conflicts:
#	src/render/Credits.cpp
 2020-07-17 21:15:47 +03:00
Sergeanur e8ded77e27 Add fix/workaround for black screen at startup 2020-07-17 21:14:48 +03:00
Sergeanur 1b161275e1 Fix CalcScreenCoors... again 2020-07-17 18:23:11 +03:00
Sergeanur 27e1fa1d28 Add missing f's 2020-07-17 17:56:59 +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
Sergeanur 693a5e0c2a Fix wheel water splash with PC_PARTICLE 2020-07-17 12:57:47 +03:00
Sergeanur ebdc5cca7f Merge branch 'master' into miami 2020-07-16 23:03:31 +03:00
Sergeanur 81c03f8e6d Audio fixes 2020-07-16 22:30:55 +03:00
Sergeanur ec09055599 Fix CCarStateEachFrame 2020-07-16 22:21:09 +03:00
aap 4e3e1d0b87 make game load all platform dffs 2020-07-16 13:36:25 +02:00
aap 23da99622c tiny cleanup 2020-07-16 13:35:35 +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
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
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
Dominik fa1263b6a4
CDarkel miami hud colors. 2020-07-07 01:02:39 +02:00
Dominik 478d4246c4
Miami Colors. 
Miami colors for MissionPassed/Failed, oddjob text 1 and 2 + fixed wrong busted/wasted color (it was pink and in the original its actually green)
 2020-07-07 00:32:13 +02: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 2c50cf8ac6
Merge pull request #648 from Nick007J/miami 
ice cream attractor + bike respray
 2020-07-04 21:24:23 +02:00
aap 0acade08ca
Merge pull request #647 from Fire-Head/miami 
miami CParticleObject
 2020-07-04 21:24:17 +02:00
aap 1e679dcb8d
Merge pull request #641 from aap/miami 
CBoat and friends
 2020-07-04 21:24:11 +02:00
eray orçunus 1cea84d2b1 Remove console and fix sth 2020-07-04 16:01:07 +03:00
eray orçunus 716740f918 Peds & fixes 2020-07-04 15:31:28 +03:00
Fire-Head 4c65ec28d6 NULL->nil 2020-07-03 20:26:35 +03: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 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
aap 575f35f2c4 fixes to CBoat 2020-07-01 18:03:59 +02: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 8045bec6a5 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2020-06-30 19:12:06 +03:00
Sergeanur da93b0a078 Audio fixes 2020-06-30 19:06:58 +03:00
Sergeanur cbed027c0e Merge branch 'master' into miami 2020-06-30 08:24:05 +03:00
Sergeanur a15f3ddb8b Fix glfw build 2020-06-30 08:08:50 +03:00
Sergeanur 87fa69385c remove TheText.Load() from CGame::Initialise 2020-06-30 07:48:09 +03:00
Sergeanur 1d2d5fe6ae Merge branch 'master' into miami 
# Conflicts:
#	src/render/MBlur.cpp
#	src/render/MBlur.h
 2020-06-30 07:45:54 +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
Sergeanur 6d396ba73b Fix MBlur 2020-06-30 07:43:20 +03:00
Filip Gawin 6cf698badd Fix glfw.cpp 2020-06-29 16:24:40 +02:00
aap b072cbca93 cleanup 2020-06-29 12:12:52 +02: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 7b22b7e2af
Update MemoryCard.cpp 2020-06-29 11:38:30 +03:00
Fire-Head 3b3324de38 Update MBlur.cpp 2020-06-29 11:14:00 +03:00
Fire-Head d9cb9583bf update glfw.cpp 2020-06-29 11:04:30 +03:00
Fire-Head 2f12d0e231 Update MBlur.cpp 2020-06-29 10:40:06 +03:00
Fire-Head fcac1f9a34 fix linux build? 2020-06-29 10:36:35 +03:00
Fire-Head 63fdcf7e64 menu fixes 2020-06-29 10:29:02 +03:00
Fire_Head 0cd2ac7e5e
Update AudioLogic.cpp 2020-06-29 09:41:56 +03:00
Fire_Head 860f75d66c
Merge branch 'master' into ps2menu 2020-06-29 09:37:53 +03:00
Nikolay Korolev 209b7891d1 Merge remote-tracking branch 'upstream/master' 2020-06-28 16:24:37 +03:00
Nikolay Korolev 920bc0a1bf fix 2020-06-28 16:24:09 +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 1f1782c587 restore Text.cpp 2020-06-28 08:32:56 +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
eray orçunus c72fab15b4 fix anims again 2020-06-25 16:20:20 +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 fe77b2ac53 Merge remote-tracking branch 'upstream/master' 2020-06-22 14:07:49 +03:00
Nikolay Korolev ba3fe38f2e fixes 2020-06-22 14:07:19 +03:00
Nikolay Korolev 043f09f3fb
Merge pull request #637 from Nick007J/master 
script logging
 2020-06-22 13:27:25 +03:00
aap 3989e3df18 anim fix 2020-06-22 08:58:49 +02: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 0ab4496423 copypaste 2020-06-21 13:51:20 +03: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 cc60ad1946 ducking & anim fix 2020-06-20 20:26:27 +03:00
eray orçunus 2d2833f2e4 more weapon fixes 2020-06-20 17:30:28 +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 7700970c93
Merge pull request #636 from aap/miami 
CCamera done
 2020-06-20 15:03:00 +02: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
Nikolay Korolev 144f12525e fix 2020-06-20 13:51:39 +03:00
Nikolay Korolev eab6741afe fix 2020-06-20 13:26:27 +03:00
aap 4cd4f91e57 ccamera cleanup 2020-06-19 09:15:23 +02: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 e9d5d42ea9 fix clipped subtitles 2020-06-17 11:11:44 +03:00
Nikolay Korolev f54af8b973 fixed bar brawl 2020-06-17 02:33:03 +03:00
erorcun d322a8033e
Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
erorcun 812b26b668
Update ModelIndices.h 2020-06-16 22:58:42 +03:00
eray orçunus a822692c26 fix crash-VC pickup scaling 2020-06-16 22:55:28 +03:00
erorcun 7ae0b8ef06
Merge pull request #633 from aap/miami 
CCam done
 2020-06-16 20:48:46 +03:00
eray orçunus c6bb1f5d0d some cutscene opcodes and heli guns 2020-06-16 20:35:09 +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
eray orçunus 3a600b4684 Bike anim. fix 2020-06-16 00:20:08 +03:00
aap dc7d4e1134 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-15 22:51:47 +02:00
eray orçunus 595576b151 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-15 23:49:59 +03:00
eray orçunus c4e129509b Peds & fixes continues 2020-06-15 23:43:20 +03: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 b77d044729 fixed boat wake 2020-06-14 09:50:00 +02: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
eray orçunus 3231c6c3dd ProcessTrainAnnouncements fix 2020-06-13 17:33:30 +03:00
Sergeanur beb6f3bf80 small fixes 2020-06-13 13:57:25 +03: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
aap 41dac0773f little CCam cleanup; fix in CWorld sphere test 2020-06-12 21:53:39 +02: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
majestic 2cc8ecbb90 removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun 2020-06-11 01:36:45 -07:00
majestic 94e3c30054 original multiplying rotational cords for minigun 2020-06-11 00:59:23 -07:00
majestic 669db1a293 minigun rotation fix 2020-06-10 23:26:51 -07:00
aap 5a961d0284 some cam cleanup; unused PS2 train cams 2020-06-10 23:50:27 +02:00
majestic cf8fcada6e m_density renamed to m_opacity 2020-06-10 14:01:37 -07: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
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 85d845c5ce
Merge pull request #623 from Sergeanur/VC/MissionAudio 
Mission audio
 2020-06-08 17:32:57 +03:00
Sergeanur 95e9fe7693 fixes 2020-06-08 16:22:49 +03:00
Sergeanur 03f3b4fc5a remove numbers from enum 2020-06-08 14:33:10 +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
Sergeanur 5942f1a8f9 Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/render/Font.cpp
 2020-06-08 10:36:37 +03:00
Sergeanur 36a6d124aa Mission audio slots 2020-06-08 10:34:31 +03:00
Sergeanur be9954ecc6 IsMissionAudioSamplePlaying (from VC) 2020-06-08 10:33:32 +03:00
Sergeanur 0afb1d9e24 Scale font shadow 2020-06-08 10:30:09 +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
Nikolay Korolev 5ec46bcdfb Merge remote-tracking branch 'upstream/miami' into miami 2020-06-08 01:01:39 +03:00
eray orçunus a77b181e32 CarCtrl fixes 2020-06-08 00:59:43 +03:00
Nikolay Korolev 5a09eeea27 more accurate code 2020-06-08 00:53:25 +03:00
eray orçunus e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Nikolay Korolev 23f20ceaf8 fix 2020-06-07 19:35:05 +03:00
Nikolay Korolev 27eaa10873 Merge remote-tracking branch 'upstream/miami' into miami 2020-06-07 19:32:51 +03:00
Nikolay Korolev 2f9becbac6 fix 2020-06-07 19:31:15 +03:00
eray orçunus 6cc39e9bdb Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 19:13:27 +03:00
eray orçunus 88f066f469 HUD sizes 2020-06-07 19:13:12 +03:00
aap dda9d03e54 nother bike bug 2020-06-07 17:35:22 +02:00
aap 464b232321 accidental shadowing in CBike::ProcessControl 2020-06-07 17:27:23 +02:00
Nikolay Korolev c5a24eaf70 Merge remote-tracking branch 'upstream/miami' into miami 2020-06-07 18:20:00 +03:00
Nikolay Korolev 1748aabd69 fix 2020-06-07 18:19:44 +03:00
aap 3f5ecbe007
Merge pull request #622 from Sergeanur/VC/Font 
some font stuff
 2020-06-07 17:19:12 +02:00
Nikolay Korolev b14e034344 fix 2020-06-07 17:52:14 +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
Sergeanur fe3a3ad8b5 cleanup 2020-06-07 15:19:29 +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
Nikolay Korolev 5fd330b35e making it close to original 2020-06-07 11:31:52 +03:00
aap 1234fe9c1c removed a "fix" 2020-06-07 10:24:33 +02:00
Sergeanur a44510d1df more font 2020-06-07 10:36:37 +03:00
Sergeanur 31569d512c font fix 2020-06-07 09:10:09 +03:00
Sergeanur 91e2b427ef more font stuff 2020-06-07 05:12:01 +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 fc7e35e1cd fixes 2020-06-07 04:20:02 +03:00
Sergeanur 24bf4c2cba Merge branch 'miami' into Font 
# Conflicts:
#	src/render/Font.cpp
#	src/render/Font.h
 2020-06-07 04:16:10 +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 678a19ce3b a bit of fonts 2020-06-07 04:11:10 +03:00
Sergeanur 552205dfba FONT_BANK renamed to FONT_STANDARD 2020-06-07 04:10:06 +03:00
aap 44e2fcee39 disable skidding bugfix 2020-06-07 00:03:51 +02:00
aap 5711159e68 CBike done 2020-06-07 00:01:59 +02:00
eray orçunus db9057f5a8 fix 2020-06-06 22:24:30 +03:00
eray orçunus 096ecc1d14 Some wait states 2020-06-06 22:16:59 +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 e099aaaa6b minor fixes 2020-06-06 16:36:26 +03:00
aap d6640832f1 bla 2020-06-06 14:43:35 +02:00
aap ef4f8ec713 more CBike functions 2020-06-06 14:42:42 +02:00
aap c0481e7207 CBike::KnockOffRider 2020-06-06 13:22:55 +02:00
Nikolay Korolev 3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +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
Sergeanur 2016cd54b0 ps2 audio banks 2020-06-06 03:45:24 +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
aap 1bfb01d5f5 a bit more CBike 2020-06-05 15:09:45 +02:00
aap 98de658c8f
Merge pull request #619 from ShFil119/heads 
Fix collision with peds heads
 2020-06-05 13:43:07 +02:00
Nikolay Korolev 83e4023dc0 fix 2020-06-05 12:59:27 +03:00
Sergeanur 147dca44fa ProcessTrainAnnouncements 2020-06-05 11:27:33 +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
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
aap f7612c4a49 forgot to delete debug code 2020-06-04 17:49:27 +02:00
aap 95e96c86a1 minor stuff 2020-06-04 17:39:26 +02:00
aap 3e36428568 more CBike and fixes 2020-06-04 17:38:41 +02:00
eray orçunus 016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
Sergeanur 07c6752cf7 Merge branch 'master' into miami 
# Conflicts:
#	src/peds/Ped.cpp
 2020-06-04 05:10:50 +03:00
Sergeanur 2578880e1c PedChat & PedDebug 2020-06-04 05:04:00 +03:00
Sergeanur a6e4619378 Revert "fix accident~" 
This reverts commit 04de93796b.
 2020-06-04 04:42:42 +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
aap e1201fc6e2 fixed CPed::AddInCarAnims 2020-06-03 16:55:23 +02:00
eray orçunus 5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
aap c498af29aa get rid of III code 2020-06-03 09:24:26 +02:00
aap 04de93796b fix accident~ 2020-06-03 09:24:02 +02:00
aap ad03d9543b Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-03 08:26:33 +02:00
aap b73e42346e forgot the fucking file 2020-06-03 08:26:24 +02: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
aap 2e3cb77702 fixed radar rendering 2020-06-02 22:49:57 +02:00
aap 06c761e9ac few bike things 2020-06-02 15:26:11 +02:00
aap 575c5466df renamed a vehicle thing 2020-06-02 14:38:57 +02:00
aap dbeaafbe99 initial CBike struct 2020-06-02 14:38:30 +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
Filip Gawin 5d90e4b2f0 Fix collision with peds heads 2020-06-01 22:10:11 +02: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
Nikolay Korolev 0803c821ae fixed roadblocks 2020-06-01 12:45:03 +03:00
aap de1018d7a6 gravity 2020-06-01 10:56:15 +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
aap 12cc0e4132 getting rid of strnicmp 2020-05-31 22:35:29 +02:00
Nikolay Korolev 0631bd9d89 fix 2020-05-31 23:16:24 +03:00
Nikolay Korolev 815d3e0f61 fix 2020-05-31 22:50:32 +03:00
Nikolay Korolev f945dbc0fb dumb 2020-05-31 21:01:36 +03: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 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
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
Nikolay Korolev 627ffb0f82 fix 2020-05-29 16:52:02 +03:00
rollschuh2282 2d5f7d92e5
Add files via upload 2020-05-29 12:04:20 +02: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
aap 9bcec54291
Merge pull request #599 from Nick007J/master 
Mission replay
 2020-05-28 10:25:14 +02:00
aap ab7a21e017
Merge pull request #603 from Fire-Head/miami 
Miami Water, Seagulls, Ships
 2020-05-28 10:23:28 +02:00
Fire-Head 8280e04b23 rem unnecessary asserts 2020-05-28 02:40:23 +03:00
Nikolay Korolev d9d57f12fc
crash fix 2020-05-28 01:00:49 +03:00
Nikolay Korolev 7e4ef2162a Merge remote-tracking branch 'upstream/master' 2020-05-28 00:59:03 +03:00
Fire_Head 7f30a2ae1b
cockbuilding ejaculation fix 2020-05-28 00:45:45 +03:00
Fire-Head fab2c8699c surfacetable included 2020-05-28 00:36:52 +03:00
Fire-Head 98af5e4ddb fix SURFACE_SAND 2020-05-28 00:28:36 +03:00
Fire-Head 895580c724 seagulls, ships 2020-05-28 00:15:37 +03:00
aap 0bc6eef55d bla 2020-05-27 22:34:10 +02:00
aap 2a1b9281e4 automobile fixes 2020-05-27 22:32:57 +02: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 717b0a6514 librw update 2020-05-27 20:42:15 +02:00
aap d8749c2305 librw update 2020-05-27 20:41:36 +02:00
Sergeanur 53ac163a3e Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/vehicles/Automobile.h
 2020-05-27 20:50:40 +03:00
Sergeanur 3a5a122887 Fix city sound playing on restarting a new game 2020-05-27 20:48:47 +03:00
Nikolay Korolev d4ae40ae99 crash fix 2020-05-27 19:39:04 +03:00
aap 02741dc64f RwCameraGetCurrentCamera 2020-05-27 09:47:57 +02:00
aap 1af4edd43a RwCameraGetCurrentCamera 2020-05-27 09:47:21 +02:00
aap d71cbae9df CVehicle loose ends 2020-05-27 07:43:38 +02:00
aap c068570192
Merge pull request #600 from Fire-Head/miami 
Miami Particle
 2020-05-27 07:18:47 +02:00
aap 4868bf13a8
Merge pull request #601 from Sergeanur/VC/audio3 
Support of original mp3/wav/adf
 2020-05-27 07:10:36 +02:00
Sergeanur 591c35d51b OpenAL support 2020-05-27 07:52:45 +03:00
aap d0d060d321 MT function for fakerw 2020-05-27 06:50:05 +02:00
aap 926281f909 MT function for fakerw 2020-05-27 06:49:38 +02:00
Sergeanur 7a79b74778 Restore original logic 2020-05-27 03:33:27 +03: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 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 ea09825d10
Merge pull request #553 from Sergeanur/VC/audio 
Very basic compatibility with original sfx.raw/sdt
 2020-05-26 22:02:12 +02:00
aap 4f1ce8bd42 added some unused enums 2020-05-26 20:44:03 +02: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 1991aa388b Very basic compatibility with original sfx.raw/sdt 2020-05-26 18:25:34 +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
Nikolay Korolev f40677c7a4 fixed crash 2020-05-26 16:17:40 +03:00
aap 314e56b7b9 fix2 2020-05-26 12:11:04 +02:00
aap dfa95002aa fix 2020-05-26 12:10:08 +02: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
aap 0b8f045d36
Merge pull request #586 from aap/miami 
CVehicle
 2020-05-26 11:25:23 +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
Nikolay Korolev ad8e8f4341 switch collision with debug menu 2020-05-25 23:59:55 +03:00
Nikolay Korolev 15a99da50e cranes fix 2020-05-25 23:34:47 +03:00
aap 3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
Sergeanur 52644192e3 Even more audio cleanups 2020-05-25 19:36:09 +03:00
aap 7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
Sergeanur ad896d5f81 Ped comments cleanup 2020-05-25 19:10:15 +03:00
Sergeanur cebc3bbd48 More audio cleanup and bugfixes 2020-05-25 18:39:16 +03:00
Sergeanur fd06ab4db8 Fix names of static variables 2020-05-25 03:56:17 +03:00
Sergeanur 80c2018b51 cAudioManager::ProcessPlayersVehicleEngine cleanup and fixes 2020-05-25 03:40:47 +03:00
Sergeanur 56683dbed3 Clean cAudioManager::ProcessGarages up a bit 2020-05-24 20:33:30 +03:00
blingu 79c652e115
Ped.h include not needed 2020-05-24 17:48:13 +02:00
Sergeanur e259bb6609 fixes 2020-05-24 18:43:50 +03:00
blingu 55ece14f42
Update CopPed.cpp 2020-05-24 17:36:37 +02:00
nrb d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
Sergeanur e4f136344c Merge remote-tracking branch 'origin/master' into opus 2020-05-24 18:25:53 +03:00
Nikolay Korolev 6235e2140e fixed filename 2020-05-24 17:23:14 +03:00
eray orçunus 14755a4ff4 all my fixes live in exes 2020-05-24 16:41:29 +03:00
aap 3fdd352ca2 CVehicle fixes 2020-05-24 15:14:56 +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 e248cbcc7d say goodbye to your saves 2020-05-24 14:01:01 +03:00
Nikolay Korolev 9c93cc7d6f Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 13:48:41 +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
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
Sergeanur 13a9441d5e Merge branch 'master' into opus 2020-05-24 01:45:10 +03:00
Sergeanur f92770f74a Optimize ALDeviceList 2020-05-24 01:44:10 +03:00
Sergeanur 0c4ce002f1 Merge branch 'master' into opus 2020-05-24 01:07:03 +03:00
Sergeanur 7d30878418 Fix OAL crash 2020-05-24 01:06:19 +03:00
Sergeanur 3a7651e7ab Cleanup 2020-05-24 00:56:20 +03:00
Sergeanur bd67db523a Merge branch 'master' into opus 
# Conflicts:
#	eax/eax.h
#	premake5.lua
#	src/audio/oal/stream.cpp
 2020-05-24 00:45:45 +03:00
Nikolay Korolev 6a7bd0e330 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 00:19:25 +03:00
Sergeanur ac208ce02c Even more small audio cleanup 2020-05-23 23:25:14 +03:00
Sergeanur f2790f610b More audio cleanup 2020-05-23 22:48:50 +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 c3b41d79a2 Cleanup and one needed function 2020-05-23 18:04:33 +03:00
eray orçunus 5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Nikolay Korolev 100e59886d
cranes fix 2020-05-23 16:14:39 +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 9c6046455e fixed script 2020-05-23 12:17:05 +03:00
Nikolay Korolev 7b7b0fb5f2 removed debug 2020-05-23 02:18:16 +03:00
Nikolay Korolev f8a509ffb3 fixes 2020-05-23 02:17:27 +03: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 e18eb0ce01
script fix 2020-05-23 00:50:15 +03:00
Nikolay Korolev 6e51ed3c53 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-22 23:35:19 +03:00
eray orçunus c993e99e00 Fix linux build 2020-05-22 22:49:54 +03:00
Sergeanur a9f332f2d9 Possibly fix travis 2020-05-22 21:26:31 +03:00
Sergeanur e858314a9f OpenAL configs 2020-05-22 18:01:09 +03:00
Sergeanur ab161d12d8 Merge remote-tracking branch 'origin/master' into opus 2020-05-22 17:41:03 +03:00
Sergeanur 0af4d57408 opus support 2020-05-22 17:40:19 +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 900d5a4ce0 focus loss improvement 
for u aap
 2020-05-21 21:48:39 +03:00
Xinerki e0345732c0 wasted/busted text color 
how did nobody change it yet
 2020-05-21 17:50:08 +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