a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-13 06:39:16 +00:00
Code Issues Projects Releases Wiki Activity
2670 commits 4 branches 2 tags 50 MiB
Commit graph

2228 commits

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