summaryrefslogtreecommitdiffstats
path: root/src/core (follow)
Commit message (Collapse)AuthorAgeFilesLines
* rw stuff done & other small thingsaap2020-08-208-18/+47
|
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-192-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Merge pull request #688 from aap/masteraap2020-08-194-3/+45
| |\ | | | | | | Neo pipelines
| | * Merge branch 'master' of github.com:gtamodding/re3aap2020-08-1811-343/+677
| | |\
| | * | neo pipelinesaap2020-08-184-3/+45
| | | |
| * | | Island loading cleanup and fixSergeanur2020-08-194-25/+26
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/miami' into miamiSergeanur2020-08-1910-6/+79
|\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # src/core/config.h
| * | | small stuffaap2020-08-193-1/+9
| | | |
| * | | neo pipelines; postfx fixaap2020-08-194-2/+43
| | | |
| * | | changing silly streaming memory limitaap2020-08-191-1/+15
| | | |
| * | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-08-162-5/+26
| |\ \ \
| * | | | CarCtrl finished, minor Script thingsNikolay Korolev2020-08-162-2/+12
| | | | |
* | | | | Merge branch 'master' into miamiSergeanur2020-08-196-283/+111
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | | remove CFOeray orçunus2020-08-166-273/+21
| | | |
| * | | Island loading and PS2 alpha test added to optionsSergeanur2020-08-167-57/+317
| | | |
| * | | Graphics menu + MSAASergeanur2020-08-165-36/+323
| | | |
* | | | 2 new opcodeseray orçunus2020-08-162-5/+26
| |/ / |/| |
* | | Merge branch 'master' into miamiSergeanur2020-08-152-0/+39
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Darkel.cpp # src/core/main.cpp
| * | Original screen grabberSergeanur2020-08-142-0/+39
| |/
* | Merge pull request #686 from erorcun/miamierorcun2020-08-1513-883/+1287
|\ \ | | | | | | Stats(except displaying) and PlayerInfo done, Frontend, marker fix
| * | Continue to Frontend, fix savegame list bugeray orçunus2020-08-142-600/+436
| | |
| * | Wheelie opcodeeray orçunus2020-08-142-24/+24
| | |
| * | Stats(except displaying), PlayerInfo, marker fixeray orçunus2020-08-1412-283/+851
| | |
* | | Merge branch 'master' into miamiSergeanur2020-08-141-0/+10
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | # 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
| * extended postfx and sniper hud fixaap2020-08-133-0/+14
| |
| * Register start button for realeray orçunus2020-08-131-0/+10
| |
* | implemented extended postfxaap2020-08-114-0/+21
| |
* | improved mission switchermajestic2020-08-101-1/+24
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-101-3/+8
|\| | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/render/Coronas.cpp # src/render/Timecycle.cpp # src/render/Timecycle.h
| * Merge pull request #678 from blingu/mastererorcun2020-08-081-3/+8
| |\ | | | | | | added support for FreeBSD
| | * Update CdStreamPosix.cppblingu2020-08-071-1/+1
| | |
| | * added FreeBSD supportblingu2020-08-051-3/+8
| | |
* | | CWindModifiersmajestic2020-08-1018-28/+2071
|\ \ \
| * | | timecycle doneaap2020-08-091-1/+23
| | | |
| * | | rubbish doneaap2020-08-092-0/+2
| | | |
| * | | coronas doneaap2020-08-091-1/+1
| | | |
| * | | static shadows fix, cutscene shadows switchesFire-Head2020-08-081-0/+3
| | | |
| * | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-0714-24/+2037
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | Merge pull request #675 from erorcun/masteraap2020-08-0710-3/+40
| | |\ \ | | | | | | | | | | Squeeze performance option, minor fixes
| | | * | Squeeze performance option, minor fixeseray orçunus2020-08-0310-3/+40
| | | | | | | | | | | | | | | | | | | | Fixes are already in miami
| | * | | Merge pull request #676 from aap/masteraap2020-08-078-19/+2021
| | |\ \ \ | | | |_|/ | | |/| | VU0 collision
| | | * | VU0 collisionaap2020-08-038-19/+2021
| | | |/
| | * / Enable PS2 Alpha test Emu in debug menu on RWSergeanur2020-08-051-2/+0
| | |/
| * | Merge pull request #670 from Fire-Head/miamiaap2020-08-072-2/+5
| |\ \ | | | | | | | | Miami Shadows
| | * | NULL -> nilFire-Head2020-07-311-2/+2
| | | |
| | * | Merge pull request #1 from GTAmodding/miamiFire_Head2020-07-2942-1130/+1344
| | |\ \ | | | | | | | | | | Miami
| | * | | miami shadowsFire-Head2020-07-292-2/+5
| | | | |
* | | | | CWindModifiersmajestic2020-08-091-0/+2
|/ / / /
* | | | Merge pull request #668 from majesticCoding/miamiaap2020-08-041-0/+1
|\ \ \ \ | | | | | | | | | | CEscalators done
| * | | | CEscalators donemajestic2020-08-041-0/+1
| | | | |
* | | | | new opcodes, buyable properties, minor fixeseray orçunus2020-07-303-2/+35
|/ / / /
* | | | Fixes after mergeSergeanur2020-07-291-10/+0
| | | |
* | | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-292-5/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | rename shitaap2020-07-292-5/+5
| | | |
* | | | Merge branch 'master' into miamiSergeanur2020-07-296-11/+33
|\| | | | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | Dual pass rendering for RW 3.3Sergeanur2020-07-292-4/+15
| | |
| * | The real pickup reflection fixSergeanur2020-07-292-7/+4
| | |
| * | Merge pull request #663 from erorcun/mastererorcun2020-07-282-38/+15
| |\ \ | | | | | | | | Fix casepath chaos
| | * | Fix casepath chaoseray orçunus2020-07-282-38/+15
| | | |
| * | | collision fixesaap2020-07-275-93/+134
| |/ /
| * | Provide more memory for casepath's argFilip Gawin2020-07-262-4/+4
| | |
| * | Disable cache for openal for nowFilip Gawin2020-07-251-0/+2
| | |
| * | Fix/change some Windows defineeray orçunus2020-07-251-1/+1
| | |
| * | fixed hanim for 64 bitaap2020-07-241-0/+1
| | |
| * | 90% fixes, 10% skel refactoringeray orçunus2020-07-242-12/+18
| | |
| * | Add ps2 audio pathsSergeanur2020-07-231-0/+1
| | |
| * | New math wrapperseray orçunus2020-07-222-4/+4
| | | | | | | | | | | | from miami
| * | 64-bit on Windowseray orçunus2020-07-229-30/+44
| | |
* | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-07-295-42/+34
|\ \ \
| * | | Fix casepath chaoseray orçunus2020-07-282-38/+15
| | | |
| * | | CCopPed, except spike trapseray orçunus2020-07-283-4/+19
| | | |
* | | | CCollision done and fixesaap2020-07-271-9/+2
| | | |
* | | | CCollision done and fixesaap2020-07-275-187/+259
|/ / /
* | | CHeli and CRopes doneaap2020-07-272-0/+200
| | |
* | | fixed hanim for 64 bitaap2020-07-241-0/+1
| | |
* | | 90% fixes, 10% skel refactoringeray orçunus2020-07-242-10/+16
| | |
* | | 64-bit on Windowseray orçunus2020-07-2412-36/+42
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-224-239/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcherSergeanur2020-07-224-239/+6
| | |
| * | Fixes from miamieray orçunus2020-07-202-10/+10
| | |
| * | avoid UBaap2020-07-201-2/+2
| | |
* | | Merge pull request #656 from erorcun/miamierorcun2020-07-2210-136/+275
|\ \ \ | | | | | | | | Peds, Hud, CFO 1/2, fixes - including zone names
| * | | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-2210-136/+275
| | | |
* | | | made NPC heli rotors rotateaap2020-07-211-1/+1
|/ / /
* | | fixed COcclusionaap2020-07-202-1/+3
| | |
* | | Merge pull request #650 from majesticCoding/miamiaap2020-07-202-0/+3
|\ \ \ | | | | | | | | COcclusion done, I hope
| * | | cosmetic fixesmajestic2020-07-202-0/+3
| | | |
* | | | CPlaneTrails and CPlaneBanners doneaap2020-07-201-2/+2
| | | |
* | | | Add compatibility with RW 3.4Sergeanur2020-07-181-1/+6
| | | |
* | | | Merge branch 'master' into miamiSergeanur2020-07-172-0/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | # Conflicts: # src/control/Record.cpp # src/vehicles/Automobile.cpp
| * | | Add audio cache for faster initializationSergeanur2020-07-172-0/+5
| | | |
* | | | make game load all platform dffsaap2020-07-161-0/+17
| | | |
* | | | Merge branch 'master' into miamiSergeanur2020-07-1315-33/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | | Rename LEVEL_NONE to LEVEL_GENERICSergeanur2020-07-137-28/+28
| | | |
| * | | Add cutscene borders switch to the menuSergeanur2020-07-115-2/+39
| | | |
| * | | enable island loading for noweray orçunus2020-07-101-1/+1
| | | |
| * | | keep loading screen, but for a seconderay orçunus2020-07-091-3/+5
| | | |
| * | | Disable loading screenSergeanur2020-07-092-1/+4
| | | |
| * | | Remove island loadingSergeanur2020-07-093-3/+41
| | | |
| * | | Bettah car enter canceling, fix CFO crash, ped objs. renamingeray orçunus2020-07-034-4/+4
| | | |
| * | | Re-enable console for debugging frontenderay orçunus2020-07-031-3/+3
| | | |
| * | | reenabled script loggingNikolay Korolev2020-07-031-1/+1
| | | |
| * | | Fix displaying statsFilip Gawin2020-07-032-4/+4
| | | |
| * | | Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixeseray orçunus2020-07-021-1/+1
| | | |
| * | | Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)erorcun2020-07-015-11/+47
| | | |
| * | | Rename IsAnyButtonPressed to CheckForInputSergeanur2020-06-302-6/+5
| | | |
* | | | VC fighting, Peds, many fixes including ghost bikeseray orçunus2020-07-092-4/+5
| | | |
* | | | Noskillx's PR + fix .set loadingeray orçunus2020-07-066-63/+29
| | | |
* | | | Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixeseray orçunus2020-07-067-225/+251
| |/ / |/| |
* | | fixes from master, menu helper texteray orçunus2020-07-048-159/+112
| | |
* | | Merge pull request #647 from Fire-Head/miamiaap2020-07-041-1/+2
|\ \ \ | | |/ | |/| miami CParticleObject
| * | miami pobjFire-Head2020-07-031-1/+2
| | |
* | | CBoat and friendsaap2020-07-011-0/+2
| | |
* | | script logging for miamiNikolay Korolev2020-07-011-1/+1
| | |
* | | remove TheText.Load() from CGame::InitialiseSergeanur2020-06-301-1/+0
| | |
* | | Restore original code of CControllerState::CheckForInputSergeanur2020-06-301-3/+6
|/ /
* | cleanupaap2020-06-292-7/+0
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-2920-421/+5589
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * menu fixesFire-Head2020-06-294-56/+68
| |
| * Merge branch 'master' into ps2menuFire_Head2020-06-2931-948/+1656
| |\
| | * renamed 2dfx shadowRange to Sizeaap2020-06-281-1/+1
| | |
| | * script logging fixesNikolay Korolev2020-06-281-0/+4
| | |
| | * rename attractor flag to typeaap2020-06-251-1/+1
| | |
| | * Merge pull request #637 from Nick007J/masterNikolay Korolev2020-06-225-12/+18
| | |\ | | | | | | | | script logging
| | | * updated player control namesNikolay Korolev2020-06-214-12/+16
| | | |
| | | * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-06-212-11/+78
| | | |\
| | | * | script loggingNikolay Korolev2020-06-211-0/+2
| | | | |
| | * | | FOV fixaap2020-06-212-2/+2
| | | |/ | | |/|
| | * | ps2 cam transitions done (hopefully)aap2020-06-212-11/+78
| | |/
| | * tried to reconstruct bills camaap2020-06-213-4/+41
| | |
| | * PS2 cam transition mostly workingaap2020-06-213-9/+96
| | |
| | * some PS2 cam code; fix for arrest camaap2020-06-203-15/+101
| | |
| | * ccamera cleanupaap2020-06-192-120/+119
| | |
| | * CCam fixes yet againaap2020-06-162-33/+35
| | |
| * | fixesFire-Head2020-06-285-79/+79
| | |
| * | fixfixfixFire-Head2020-06-273-713/+708
| | |
| * | mips overdoseFire-Head2020-06-2717-116/+5370
| | |
* | | renamed 2dfx shadowRange to Sizeaap2020-06-281-1/+1
| | |
* | | Merge pull request #638 from erorcun/miamiaap2020-06-258-40/+93
|\ \ \ | | | | | | | | CWanted, anim fix, ped objs renaming, remove III beta features
| * | | CWanted, anim fix, ped objs renaming, remove III beta featureseray orçunus2020-06-228-40/+93
| | | |
* | | | rename attractor flag to typeaap2020-06-251-1/+1
| | | |
* | | | CPad fixaap2020-06-241-1/+1
| | | |
* | | | FOV fixaap2020-06-212-2/+2
| | | |
* | | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-06-216-2/+28
|\| | |
| * | | killing peds increase chaos leveleray orçunus2020-06-201-0/+2
| | | |
| * | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-204-399/+952
| |\ \ \
| * | | | Ducking, shooting vehicle occupants and weapon fixeseray orçunus2020-06-205-2/+26
| | | | |
* | | | | synch with re3aap2020-06-212-4/+5
| |/ / / |/| | |
* | | | CCamera doneaap2020-06-204-399/+952
|/ / /
* | | Merge branch 'miami' into miamierorcun2020-06-1611-924/+1119
|\ \ \
| * \ \ CCam doneaap2020-06-163-165/+238
| |\ \ \
| * | | | more CCamaap2020-06-152-331/+378
| |/ / /
| * | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-154-6/+108
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | more cleanupaap2020-06-143-41/+40
| | | |
| | * | a few cam fixesaap2020-06-133-45/+49
| | | |
| | * | little CCam cleanup; fix in CWorld sphere testaap2020-06-123-29/+37
| | | |
| | * | some cam cleanup; unused PS2 train camsaap2020-06-102-66/+156
| | | |
| | * | cleaned up and fixed animvieweraap2020-06-083-92/+76
| | | |
| | * | Revert "FONT_BANK renamed to FONT_STANDARD"Fire-Head2020-06-075-24/+24
| | | | | | | | | | | | | | | | This reverts commit 552205dfbaea70628df56a4966d269a81a97d28e.
| * | | Fix vehicle cam. zoom valueseray orçunus2020-06-153-41/+57
| | | |
| * | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-145-1401/+1427
| |\ \ \
| | * | | some more camera stuffaap2020-06-144-520/+437
| | | | |
| | * | | Merge pull request #631 from erorcun/miamierorcun2020-06-145-3/+43
| | |\ \ \ | | | | | | | | | | | | Peds, mission switcher & fixes
| * | | | | much better mission switchereray orçunus2020-06-141-1/+1
| | |/ / / | |/| | |
| * | | | Peds, mission switcher & fixeseray orçunus2020-06-145-3/+43
| | | | |
* | | | | fixed condition in CBoat::ProcessControl and changed enummajestic2020-06-142-14/+65
| |/ / / |/| | |
* | | | some camera codeaap2020-06-143-882/+991
|/ / /
* | | script fixNikolay Korolev2020-06-131-1/+1
| | |
* | | SmokeTrail(s) moved to Fluff, variables' names fixed, floats roundedmajestic2020-06-101-1/+1
| | |
* | | more original cheatsmajestic2020-06-101-54/+166
| | | | | | | | | | | | | | | - CSmokeTrails and CSmokeTrail classes added in new files - more cheats added
* | | Merge pull request #623 from Sergeanur/VC/MissionAudioSergeanur2020-06-081-2/+2
|\ \ \ | | | | | | | | Mission audio
| * | | miamification of some audio structsSergeanur2020-06-081-2/+2
| | | |
* | | | blaaap2020-06-081-1/+1
| | | |
* | | | cleaned up and updated animviewer; fixed animation bugaap2020-06-084-98/+80
|/ / /
* | | fixesNikolay Korolev2020-06-081-0/+2
| | |
* | | Message box, letterbox and ped attachingeray orçunus2020-06-074-27/+34
| | |
* | | fixNikolay Korolev2020-06-071-0/+1
| | |
* | | some stats tweaks; saves dead againNikolay Korolev2020-06-072-2/+16
| | |
* | | Merge branch 'master' into miamiSergeanur2020-06-076-22/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/Frontend.cpp # src/peds/PlayerPed.cpp # src/render/Hud.cpp # src/vehicles/Train.cpp
| * | FONT_BANK renamed to FONT_STANDARDSergeanur2020-06-075-24/+24
| | |
| * | fixed linux savingNikolay Korolev2020-06-061-1/+1
| | |
* | | CFont crash workarounderay orçunus2020-06-061-1/+5
| | |
* | | Use KnockOffRidereray orçunus2020-06-062-16/+9
| | |
* | | Merge branch 'master' into miamiSergeanur2020-06-062-77/+77
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | fixes, mostly from miamieray orçunus2020-06-044-101/+103
| | |
* | | Merge pull request #617 from majesticCoding/miamiaap2020-06-051-93/+126
|\ \ \ | | | | | | | | some original VC's cheats and comparator for them
| * | | Update Pad.cppmajestic2020-06-051-1/+1
| | | |
| * | | Update Pad.cppmajestic2020-06-051-36/+53
| | | |
| * | | some original VC's cheats and comparator for themmajestic2020-06-051-90/+106
| | | |
* | | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-051-1/+1
|\| | |
* | | | Bike riding anims, SA bike/heli cameray orçunus2020-06-051-21/+32
|/ / /
* | | more CBikeaap2020-06-051-0/+2
| | |
* | | Merge pull request #615 from majesticCoding/miamiaap2020-06-042-29/+112
|\ \ \ | | | | | | | | some orig chearts
| * | | some orig cheartsmajestic2020-06-032-29/+112
| | | | | | | | | | | | | | | | | | | | | | | | - weapon model indices added - orig weapon cheats added - some cheats' names changed to original ones
* | | | Merge branch 'master' into miamiSergeanur2020-06-044-0/+80
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | # Conflicts: # src/peds/Ped.cpp # src/peds/Ped.h
| * | Restore original logic of CPed::WanderRangeSergeanur2020-06-042-3/+16
| | |
| * | Range2D and Range3DSergeanur2020-06-034-0/+67
| | |
* | | Peds, eSound and PedState enum, fixeseray orçunus2020-06-034-31/+38
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-037-8/+169
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | some vehicle cleanupaap2020-06-021-1/+2
| | |
| * | CTimer fixaap2020-06-011-2/+2
| | |
| * | hanim fixaap2020-06-011-2/+2
| | |
| * | fixed timebar toggleaap2020-06-013-6/+4
| | |
| * | Merge pull request #607 from rollschuh2282/masteraap2020-06-014-2/+20
| |\ \ | | | | | | | | Added toggles for the TimeBars and the "DebugStuffInRelease" to the Debug Menu
| | * | Add files via uploadrollschuh22822020-05-294-2/+20
| | | |
| * | | fixed bumper colmodelaap2020-06-011-1/+1
| | | |
| * | | fixed to CAutomobile and friendsaap2020-05-311-3/+2
| | | |
| * | | fix fix fixeray orçunus2020-05-291-2/+8
| | | |
| * | | fix fixeray orçunus2020-05-291-8/+8
| | | |
| * | | Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcuneray orçunus2020-05-291-2/+2
| |\| |
| | * | Merge pull request #604 from erorcun/mastererorcun2020-05-288-126/+301
| | |\ \ | | | | | | | | | | Frontend customization functions, freecam toggle and minor things
| | * | | fixNikolay Korolev2020-05-281-2/+2
| | | | |
| * | | | frontend options fixeray orçunus2020-05-291-8/+20
| | |/ / | |/| |
| * | | remove inlining attempts + reload frontend options for realeray orçunus2020-05-281-7/+8
| | | |
| * | | theoretically fix linux builderay orçunus2020-05-283-12/+14
| | | |
| * | | Detect R and start game on menueray orçunus2020-05-281-0/+21
| | | |
| * | | config reorganizationeray orçunus2020-05-281-4/+5
| | | |
| * | | Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcuneray orçunus2020-05-285-2/+78
| |\| |
| | * | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-261-1/+1
| | |\ \
| | * | | mission replayNikolay Korolev2020-05-265-2/+78
| | | | |
| * | | | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-288-119/+269
| | |/ / | |/| |
| * | | fix UB shitaap2020-05-261-1/+1
| |/ /
* | | some CBike code; vehicle cleanupaap2020-06-023-6/+13
| | |
* | | Merge pull request #611 from erorcun/miamierorcun2020-06-017-1231/+1146
|\ \ \ | | | | | | | | DrawStandardMenus, VC menu array and minor fixes
| * \ \ Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-06-0110-10/+26
| |\ \ \
| * | | | DrawStandardMenus, VC menu array and minor fixeseray orçunus2020-06-017-1231/+1146
| | | | |
* | | | | add freeroam; clean up debug menuaap2020-06-011-12/+0
| | | | |
* | | | | CTimer fixaap2020-06-011-2/+2
| |/ / / |/| | |
* | | | hanim fixaap2020-06-011-2/+2
| | | |
* | | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-06-018-8/+37
|\| | |
| * | | game logicNikolay Korolev2020-05-318-8/+36
| | | |
| * | | roadblocksNikolay Korolev2020-05-301-0/+1
| | | |
* | | | fixed bumper colmodelaap2020-06-011-1/+1
| | | |
* | | | CAutomobile doneaap2020-05-314-4/+7
| | | |
* | | | some more CAutomobileaap2020-05-311-1/+11
| | | |
* | | | gahhhaap2020-05-312-1/+2
| | | |
* | | | some CAutomobileaap2020-05-313-1/+3
|/ / /
* | | R to freeroam, idle anims, weapon and cam enum fixeray orçunus2020-05-295-13/+39
| | |
* | | seagulls, shipsFire-Head2020-05-272-1/+28
| | |
* | | Merge pull request #2 from GTAmodding/miamiFire_Head2020-05-271-9/+9
|\ \ \ | | | | | | | | Miami
| * \ \ Merge pull request #600 from Fire-Head/miamiaap2020-05-273-1/+7
| |\ \ \ | | | | | | | | | | Miami Particle
| * | | | Support of original mp3/wav/adfSergeanur2020-05-271-9/+9
| | | | |
* | | | | VC WaterFire-Head2020-05-275-2/+18
| |/ / / |/| | |
* | | | VC CParticle doneFire-Head2020-05-273-1/+7
|/ / /
* | | fix UB shitaap2020-05-261-1/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-261-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | eSurfaceTypeaap2020-05-265-121/+120
| | |
| * | switch collision with debug menuNikolay Korolev2020-05-251-0/+8
| | |
| * | small fixesaap2020-05-251-14/+14
| | |
| * | all my fixes live in exeseray orçunus2020-05-241-1/+9
| | |
* | | Merge pull request #588 from blingu/miamiaap2020-05-262-7/+8
|\ \ \ | | | | | | | | fixed compiler errors
| * | | fixed compiler errorsnrb2020-05-242-7/+8
| | | |
* | | | eSurfaceTypeaap2020-05-265-125/+124
| | | |
* | | | CVehicleaap2020-05-258-43/+69
|/ / /
* | | Merge pull request #583 from erorcun/miamiaap2020-05-246-179/+343
|\ \ \ | | | | | | | | Menu borders and weapon fixes
| * | | Menu borders and weapon fixeseray orçunus2020-05-246-179/+343
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-232-6/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into miamiSergeanur2020-05-232-6/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | skeleton typosaap2020-05-231-4/+4
| | | |
| | * | OpenAL configsSergeanur2020-05-221-5/+0
| | | |
| | * | fixes for CPhysical and friendsaap2020-05-224-116/+75
| | | |
| | * | small fixesaap2020-05-191-1/+1
| | | |
| | * | little cleanup of handlingmgraap2020-05-191-2/+0
| | | |
| | * | little cleanup on radaraap2020-05-171-22/+22
| | |/
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-235-27/+22
|\| |
| * | Compatibility with VC weapon.dat + new shotgunseray orçunus2020-05-234-23/+18
| | |
| * | skeleton typosaap2020-05-231-4/+4
| | |
* | | set piecesNikolay Korolev2020-05-232-0/+6
|/ /
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-234-117/+84
|\ \
| * \ Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-05-2216-34/+161
| |\ \
| * | | CPhysicalaap2020-05-225-117/+85
| | | |
* | | | some fixesNikolay Korolev2020-05-232-3/+25
| |/ / |/| |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-2215-1229/+808
|\ \ \
| * \ \ Merge pull request #579 from Xinerki/miamierorcun2020-05-221-1/+1
| |\ \ \ | | | | | | | | | | InitAfterFocusLoss compile fix
| | * | | InitAfterFocusLoss compile fixXin2020-05-221-1/+1
| | | | |
| * | | | Merge pull request #574 from Xinerki/miamierorcun2020-05-2213-29/+155
| |\| | | | | |/ / | |/| | many additions
| | * | sorry my badXinerki2020-05-212-2597/+2464
| | | |
| | * | vehicle cheats and debug cheat string displayXinerki2020-05-214-981/+1040
| | | |
| | * | make reloadables optionalXinerki2020-05-212-0/+5
| | | |
| | * | menu map color changeXinerki2020-05-211-1496/+1629
| | | |
| | * | fancy HUD.TXD reloaderXinerki2020-05-211-0/+5
| | | | | | | | | | | | | | | | TODO: make optional with defines, also add more reload options
| | * | scuffed InitAfterFocusLoss implementationXinerki2020-05-212-0/+18
| | | |
| | * | add freecam toggle in control settingsXinerki2020-05-214-2/+21
| | | | | | | | | | | | | | | | comes with a free config save!
| | * | approach separation differentlyXinerki2020-05-212-9/+24
| | | |
| | * | blip marker colors, also isolate crgbaXinerki2020-05-211-4/+9
| | | |
| * | | VC CMenuManager struct, ctor etc.eray orçunus2020-05-2211-1200/+653
| |/ /
* / / new script commands - mostly stubsNikolay Korolev2020-05-223-4/+6
|/ /
* | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-202-4/+3
|\ \
| * | Fixes for melees and various thingseray orçunus2020-05-202-4/+3
| | |
* | | script revisionNikolay Korolev2020-05-202-0/+3
|/ /
* | Merge pull request #569 from aap/miamiaap2020-05-205-24/+15
|\ \ | | | | | | CEntity and friends
| * | CEntity and friendsaap2020-05-195-24/+15
| | |
* | | sync with upstreamNikolay Korolev2020-05-192-4/+5
|\ \ \
| * | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-05-1913-239/+268
| |\| |
| * | | Melee weapons(half-working), Ped and Hud bitseray orçunus2020-05-192-4/+5
| | | |
* | | | fixed annoying bugNikolay Korolev2020-05-191-0/+1
| |/ / |/| |
* | | Merge pull request #564 from Xinerki/miamiaap2020-05-192-17/+34
|\ \ \ | | | | | | | | fix audio menu crash
| * | | fix frontend control config menu a littleXinerki2020-05-191-3/+13
| | | | | | | | | | | | | | | | thank erorcun
| * | | fix audio menu crashXinerki2020-05-192-14/+21
| | | |
* | | | Merge pull request #561 from Nick007J/miamiaap2020-05-191-2/+2
|\ \ \ \ | | | | | | | | | | script revision
| * | | | script revisionNikolay Korolev2020-05-191-2/+2
| | | | |
* | | | | HandlingMgraap2020-05-191-2/+0
| | | | |
* | | | | Merge pull request #563 from Xinerki/miamiaap2020-05-192-19/+41
|\ \ \ \ \ | | |/ / / | |/| | | match frontend to vc more; isolate crgba
| * | | | match frontend to vc more; isolate crgbaXinerki2020-05-192-19/+41
| | | | |
* | | | | Merge pull request #562 from Xinerki/miamiaap2020-05-192-193/+142
|\| | | | | | | | | | | | | | Load VC frontend textures and use some
| * | | | Load VC frontend textures and use someXinerki2020-05-192-193/+142
| |/ / /
* / / / finished CFileLoader; some COcclusion stubsaap2020-05-194-7/+35
|/ / /
* | | Merge pull request #557 from Nick007J/miamiaap2020-05-187-4/+19
|\ \ \ | | | | | | | | script and script stubs
| * | | sync with upstreamNikolay Korolev2020-05-173-119/+232
| |\| |
| * | | sync with upstreamNikolay Korolev2020-05-179-72/+65
| |\ \ \
| * | | | full script basic supportNikolay Korolev2020-05-172-2/+4
| | | | |
| * | | | more script stuffNikolay Korolev2020-05-165-2/+29
| | | | |
* | | | | Merge pull request #558 from Sergeanur/VC/textaap2020-05-181-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | CText
| * | | | CTextSergeanur2020-05-181-1/+1
| |/ / /
* | / / radar spritesaap2020-05-173-119/+232
| |/ / |/| |
* | | Merge pull request #555 from erorcun/miamiaap2020-05-178-36/+29
|\ \ \ | | | | | | | | Weapon fixes and thingies
| * | | Weapon fixes and thingieseray orçunus2020-05-178-36/+29
| | | |
* | | | loading screensaap2020-05-171-22/+36
| |/ / |/| |
* | | gangs, script and replay fixesNikolay Korolev2020-05-161-14/+14
|/ /
* | minimal weather stuff + multiple bugfixesNikolay Korolev2020-05-162-0/+3
| |
* | sync with upstreamNikolay Korolev2020-05-168-29/+54
|\ \
| * | Weapon layer in Pedseray orçunus2020-05-158-29/+54
| | |
* | | ped attractors doneNikolay Korolev2020-05-163-4/+61
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-143-103/+117
|\| |
| * | Merge branch 'master' into miamiSergeanur2020-05-143-103/+117
| |\| | | | | | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| | * Fix calloc in CdStreamPosixshfil2020-05-131-1/+1
| | |
| | * Redoing some pool reading for better alignmentSergeanur2020-05-131-65/+85
| | |
| | * Changing save/load for CPlayerInfo because of alignment crapSergeanur2020-05-131-36/+30
| | |
| | * Revert to memcpyFilip Gawin2020-05-131-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-1330-96/+794
|\| |
| * | Merge branch 'master' into miamiSergeanur2020-05-1219-28/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp
| | * Fix linux warningsFilip Gawin2020-05-1221-31/+64
| | |
| * | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-1216-68/+734
| |\| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| | * remove debug shitaap2020-05-121-3/+0
| | |
| | * little fixes to CClouds; disabled object clipping for SA camaap2020-05-122-2/+5
| | |
| | * Merge pull request #533 from erorcun/mastererorcun2020-05-1117-73/+740
| | |\ | | | | | | | | Linux build support
| | | * Linux build supporteray orçunus2020-05-1117-73/+740
| | | |
| | * | random fixesaap2020-05-111-1/+1
| | | |
* | | | ped attractor: startNikolay Korolev2020-05-131-1/+13
|/ / /
* | | CClouds; disabled object clipping for SA camaap2020-05-123-2/+10
| | |
* | | Merge pull request #535 from Nick007J/miamiaap2020-05-118-62/+102
|\ \ \ | | | | | | | | garages, carctrl, script
| * \ \ sync with upstreamNikolay Korolev2020-05-1112-38/+39
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-115-9/+15
| |\ \ \ \
| * | | | | garages + scriptNikolay Korolev2020-05-118-62/+102
| | | | | |
* | | | | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-05-1113-39/+40
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/miami' into miamiSergeanur2020-05-114-9/+13
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'master' into miamiSergeanur2020-05-1113-39/+40
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimBlendAssociation.h # src/animation/AnimBlendClumpData.h # src/animation/AnimManager.h # src/animation/FrameUpdate.cpp # src/control/AutoPilot.h # src/control/PathFind.h # src/core/PlayerInfo.h # src/entities/Building.h # src/entities/Dummy.h # src/entities/Entity.h # src/entities/Physical.h # src/entities/Treadable.h # src/modelinfo/BaseModelInfo.h # src/modelinfo/ClumpModelInfo.cpp # src/modelinfo/ClumpModelInfo.h # src/modelinfo/PedModelInfo.h # src/modelinfo/SimpleModelInfo.h # src/modelinfo/TimeModelInfo.h # src/modelinfo/VehicleModelInfo.h # src/objects/CutsceneHead.h # src/objects/CutsceneObject.h # src/objects/DummyObject.h # src/objects/Object.h # src/peds/DummyPed.h # src/peds/PedIK.cpp # src/rw/VisibilityPlugins.cpp # src/vehicles/Automobile.h # src/vehicles/Boat.h # src/vehicles/Heli.h # src/vehicles/Plane.h # src/vehicles/Train.h # src/vehicles/Vehicle.h
| | * | | | few fixesaap2020-05-111-0/+3
| | | |_|/ | | |/| |
| | * | | Merge pull request #509 from Fire-Head/mastererorcun2020-05-114-17/+21
| | |\ \ \ | | | | | | | | | | | | OpenAL update
| | | * | | oal wav/mp3 stream updateFire-Head2020-05-072-0/+16
| | | | | |
| | | * | | openal-soft addedFire-Head2020-05-041-2/+2
| | | | | |
| | | * | | oal updFire-Head2020-05-042-17/+5
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/master'bigbossbro082020-05-101-1/+1
| | |\ \ \ \
| | | * | | | some fixes and cosmetic changesaap2020-05-101-1/+1
| | | | | | |
| | * | | | | fixed few more typosbigbossbro082020-05-102-21/+1
| | | | | | |
| | * | | | | Fixed typos and made all assert functions optionalbigbossbro082020-05-1010-21/+10
| | | | | | |
| | * | | | | defined out asserts.bigbossbro082020-05-108-2/+28
| | |/ / / /
* | | | / / CVisibilityPluginsaap2020-05-111-1/+3
| |_|_|/ / |/| | | |
* | | | | CRendereraap2020-05-114-9/+13
|/ / / /
* | | / little fix for camaap2020-05-111-0/+2
| |_|/ |/| |
* | | RpAnimBlend and frame updatesaap2020-05-102-1/+3
| | |
* | | vehicle model descriptions; a bit of heli codeaap2020-05-102-4/+4
| | |
* | | force load weapons as long as we dont stream em yetaap2020-05-101-0/+6
| | |
* | | update file loader for new VC fieldsaap2020-05-105-5/+40
| | |
* | | CVehicleModelInfoaap2020-05-102-1/+24
| | |
* | | CPedModelInfoaap2020-05-103-20/+5
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-101-1/+1
|\ \ \
| * | | CSimpleModelInfoaap2020-05-101-1/+1
| | | |
* | | | sync with upstreamNikolay Korolev2020-05-108-9/+22
|\| | |
| * | | CClumpModelInfo; little fixesaap2020-05-101-1/+5
| | | |
| * | | Merge branch 'master' into miamiSergeanur2020-05-107-8/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimManager.cpp # src/control/CarCtrl.cpp # src/control/Curves.cpp # src/core/templates.h
| | * | Small unificationSergeanur2020-05-101-1/+1
| | | |
| | * | Place debug menu under ifdefSergeanur2020-05-096-7/+16
| | | |
| | * | Merge pull request #527 from erorcun/erorcunerorcun2020-05-093-7/+36
| | |\ \ | | | | | | | | | | Menu map fixes and resizable window on GLFW
| | | * | Menu map fixes and resizable window on GLFWeray orçunus2020-05-093-7/+36
| | | | |
* | | | | more car controlNikolay Korolev2020-05-101-2/+34
|/ / / /
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-0910-21/+49
|\ \ \ \
| * | | | peds starting to workaap2020-05-094-10/+9
| | | | |
| * | | | removed cutscene headsaap2020-05-091-2/+2
| | | | |
| * | | | Menu map fixes and resizable window on GLFWeray orçunus2020-05-093-7/+36
| | | | |
| * | | | Merge pull request #526 from Nick007J/miamiaap2020-05-093-0/+16
| |\ \ \ \ | | | | | | | | | | | | GenerateOneRandomCar except bikes
| * \ \ \ \ Merge branch 'master' into miamiSergeanur2020-05-092-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/AnimBlendAssocGroup.cpp # src/animation/AnimBlendAssociation.cpp # src/animation/AnimManager.cpp # src/core/Streaming.cpp
| | * | | | Merge remote-tracking branch 'origin/master'Sergeanur2020-05-092-8/+18
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of github.com:GTAmodding/re3aap2020-05-082-1/+6
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | more small fixesaap2020-05-082-8/+18
| | | | | | |
| | * | | | | Fix corona scalingSergeanur2020-05-092-2/+2
| | | |/ / / | | |/| | |
* | | | | | ccarctrl big fixNikolay Korolev2020-05-093-2/+5
| |_|_|/ / |/| | | |
* | | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-082-41/+176
|\| | | |
| * | | | anims streamingaap2020-05-082-41/+176
| | | | |
* | | | | CCarCtrl::GenerateOneRandomCarNikolay Korolev2020-05-083-0/+16
|/ / / /
* | | | gangNikolay Korolev2020-05-081-8/+9
| | | |
* | | | Merge branch 'master' into miamiSergeanur2020-05-082-1/+6
|\| | |
| * | | Fix water UV on high FPS and inverted free cameraSergeanur2020-05-082-1/+6
| |/ /
| * | small fixesaap2020-05-072-2/+12
| | |
| * | got rid of superfluous enum; update librwaap2020-05-072-15/+15
| | |
| * | IsStaticNikolay Korolev2020-05-061-7/+7
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-087-21/+23
|\ \ \
| * | | most of animation system done; little stuff here and thereaap2020-05-087-21/+23
| | | |
* | | | fixNikolay Korolev2020-05-081-5/+2
|/ / /
* | | zone info commands + fixNikolay Korolev2020-05-083-2/+23
| | |
* | | tmp stuffNikolay Korolev2020-05-081-19/+35
| | |
* | | sync with upstreamNikolay Korolev2020-05-076-211/+127
|\ \ \
| * | | CBaseModelInfo doneaap2020-05-073-4/+13
| | | |
| * | | CZoneInfo mostly done; not its dependenciesaap2020-05-074-207/+114
| | | |
* | | | sync with upstreamNikolay Korolev2020-05-076-37/+67
|\| | |
| * | | typoaap2020-05-071-2/+2
| | | |
| * | | VC vehicles just barely working nowaap2020-05-076-37/+67
| | | |
* | | | car control and friendsNikolay Korolev2020-05-072-2/+4
|/ / /
* | | changed default ID ranges. old default.ide incompatible nowaap2020-05-061-3/+0
| | |
* | | checked some of streaming for VC changesaap2020-05-065-90/+101
| | |
* | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-066-49/+64
|\ \ \
| * | | CSphere and CBox for CColModelaap2020-05-066-49/+64
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-061-6/+14
|\| | |
| * | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-061-6/+14
| |\| |
| | * | fix for radaraap2020-05-061-6/+14
| | | |
| | * | little cworld bugfixaap2020-05-061-1/+1
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-061-1/+1
|\| | |
| * | | Merge branch 'miami' of github.com:GTAmodding/re3 into miamiaap2020-05-061-1/+1
| |\ \ \
| * | | | little cworld bugfixaap2020-05-061-1/+1
| | | | |
* | | | | sync with masterNikolay Korolev2020-05-069-674/+297
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-061-1/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/User.cpp # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/core/Zones.h # src/entities/Entity.cpp
| | * | some work on zonesaap2020-05-066-64/+68
| | | |
| * | | new zone stuffaap2020-05-069-674/+297
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-062-4/+2
|\| | |
| * | | implemented most of timecycle and mbluraap2020-05-062-4/+2
| | | |
* | | | not neededNikolay Korolev2020-05-061-23/+0
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-0611-285/+177
|\| | |
| * | | getting the vice city map to workaap2020-05-0511-285/+177
| | | |
* | | | script colstore stuffNikolay Korolev2020-05-061-2/+9
| | | |
* | | | colstore support in scriptNikolay Korolev2020-05-051-7/+7
| | | |
* | | | Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2020-05-0515-635/+54
|\| | |
| * | | some miami limitsaap2020-05-051-18/+17
| | | |
| * | | cleaned up MIAMI ifdefsaap2020-05-0515-617/+37
| | | |
* | | | some more miamiNikolay Korolev2020-05-051-0/+23
| | | |
* | | | Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"Sergeanur2020-05-055-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1eb817de7713ea95bbbcbd7543ffce61ced8ffec. # Conflicts: # src/core/Game.cpp
* | | | Merge branch 'master' into miamiSergeanur2020-05-055-39/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | # Conflicts: # src/core/Game.cpp
| * | Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULLSergeanur2020-05-055-39/+1
| | |
| * | Remove ColStoreSergeanur2020-05-052-274/+0
| | |
* | | remove ifdefsNikolay Korolev2020-05-051-2/+0
| | |
* | | Revert "Remove Miami stuff"Sergeanur2020-05-0514-1/+553
|/ / | | | | | | This reverts commit 9960c411933f9a804eb5f6840d75ad00fd255252.
* | Remove Miami stuffSergeanur2020-05-0514-553/+1
| |
* | Merge pull request #512 from Nick007J/masterSergeanur2020-05-051-0/+5
|\ \ | | | | | | MIAMI CAutoPilot + CCarAI + multiple fixes
| * \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-059-47/+42
| |\ \
| * | | CAutoPilot + CCarAI + fixesNikolay Korolev2020-05-051-0/+5
| | | |
* | | | merged masteraap2020-05-057-64/+60
|\ \ \ \
| * | | | Make CBaseModelInfo fields protectedSergeanur2020-05-053-34/+31
| | | | |
| * | | | More use of GetModelIndexSergeanur2020-05-055-29/+28
| | |/ / | |/| |
* | | | implemented most of streamed collisions and big buildingsaap2020-05-051-2/+0
| | | |
* | | | implemented most of streamed collisions and big buildingsaap2020-05-0518-63/+897
|/ / /
* / / SetPosition, final partSergeanur2020-05-059-47/+42
|/ /
* | GTA_ZONECULL defineaap2020-05-033-3/+23
| |
* | GTA_BRIDGE and GTA_TRAIN definesaap2020-05-032-2/+11
| |
* | implemented most of vice city path systemaap2020-05-034-4/+15
| |
* | Fix pad Y axisSergeanur2020-05-031-2/+9
| |
* | Merge pull request #504 from Sergeanur/PadInputSwitchSergeanur2020-05-023-57/+97
|\ \ | | | | | | Switching pad modes and cheats when player is switching between controller and kb&m
| * | Add CURMODE macroSergeanur2020-05-021-108/+58
| | |
| * | Switching pad modes and cheats when player is switching between controller and kb&mSergeanur2020-05-023-30/+120
| | |
* | | Revert "Disable PED_SKIN for now"Sergeanur2020-05-021-1/+1
| | | | | | | | | | | | This reverts commit d51bf48dcd5756a4c81e8faf61f495c02684c209.
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-022-5/+5
|\ \ \
| * | | Fix number of unique jumps in stat menuSergeanur2020-05-021-4/+4
| |/ /
| * | Disable PED_SKIN for nowSergeanur2020-05-021-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-0210-13/+23
|\| |
| * | SetPosition, part 2Sergeanur2020-05-025-9/+9
| | |
| * | SetPosition, part 1Sergeanur2020-05-024-4/+13
| | |
| * | fixed the CIRCLE_BACK_BUTTON define.rollschuh22822020-05-021-0/+1
| | |
* | | changed saving compatibilityNikolay Korolev2020-05-022-609/+59
| | |
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-021-0/+4
|\| |
| * | update librw (vsynch)aap2020-05-021-0/+4
| | |
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-014-0/+54
|\| |
| * | Screen mode selector and persistent map target fixeray orçunus2020-05-014-0/+54
| | |
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-05-013-0/+36
|\| |
| * | Merge pull request #499 from aap/masteraap2020-05-013-0/+36
| |\ \ | | | | | | | | Better handling of video modes, windowed mode, fixes to glfw
| | * \ Merge branch 'master' of github.com:gtamodding/re3aap2020-04-301-4/+34
| | |\ \
| | * \ \ Merge branch 'master' of github.com:gtamodding/re3aap2020-04-291-3/+4
| | |\ \ \
| | * | | | implemented improved video modes for win.cppaap2020-04-293-0/+36
| | | | | |
* | | | | | updated get/setNikolay Korolev2020-04-301-4/+4
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-309-26/+56
|\| | | | |
| * | | | | Fix MakeSureSlotInObjectPoolIsEmptySergeanur2020-04-301-1/+1
| | | | | |
| * | | | | Adding getters and setters for type and statusSergeanur2020-04-308-21/+21
| | |_|/ / | |/| | |
| * | | | Jap fixesSergeanur2020-04-301-4/+34
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-291-3/+4
|\| | |
| * | | Mouse wheel fixeray orçunus2020-04-291-3/+4
| |/ /
* | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-295-43/+63
|\| |
| * | Merge pull request #495 from Sergeanur/MoreLanguagesaap2020-04-295-43/+63
| |\ \ | | | | | | | | Japanese support
| | * | FixesSergeanur2020-04-273-43/+51
| | | |
| | * | Merge branch 'master' into MoreLanguagesSergeanur2020-04-2677-2814/+2963
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/core/MenuScreens.h # src/render/Font.cpp # src/render/Font.h # src/text/Messages.cpp # src/text/Text.cpp
| | * | | More japaneseSergeanur2020-04-151-25/+25
| | | | |
| | * | | Merge branch 'master' into MoreLanguagesSergeanur2020-04-1452-5983/+10442
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Frontend.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Hud.h # src/text/Messages.cpp # src/text/Text.cpp
| | * \ \ \ Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-04-0510-336/+3440
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-04-052-0/+3
| | |\ \ \ \ \
| | * | | | | | JapaneseSergeanur2020-04-053-10/+22
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-281-1/+9
|\| | | | | | |
| * | | | | | | Allow keyboard controls for flying cheatsNikolay Korolev2020-04-281-1/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-271-1/+1
|\| | | | | |
| * | | | | | little support for gl3 textures; txd.img enabled againaap2020-04-271-1/+1
| | | | | | |
* | | | | | | sync with upstreamNikolay Korolev2020-04-268-27/+201
|\| | | | | |
| * | | | | | Merge pull request #489 from Nick007J/masterNikolay Korolev2020-04-269-2/+110
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 1.1 patch stuff + flying controls
| * \ \ \ \ \ \ Merge branch 'master' of github.com:gtamodding/re3aap2020-04-261-7/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Remove little hackSergeanur2020-04-261-7/+0
| | | | | | | |
| * | | | | | | tried to fix some half-pixel bugsaap2020-04-261-0/+7
| |/ / / / / /
| * | | | | | Remove struct workaround in CControllerConfigManagerSergeanur2020-04-261-8/+6
| | | | | | |
| * | | | | | A few fixesSergeanur2020-04-262-6/+16
| | | | | | |
| * | | | | | Initial GLFW supporteray orçunus2020-04-268-21/+187
| | | | | | |
* | | | | | | pools compatibilityNikolay Korolev2020-04-263-4/+622
| |/ / / / / |/| | | | |
* | | | | | helis done + cheatsNikolay Korolev2020-04-253-0/+50
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-251-22/+26
|\| | | | |
| * | | | | using librw GS alpha test emulationaap2020-04-251-22/+26
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-252-2/+5
|\| | | | |
| * | | | | few fixesaap2020-04-252-2/+5
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-255-195/+8
|\| | | | |
| * | | | | implemented debugmenuaap2020-04-245-195/+8
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-2511-9/+98
|\| | | | |
| * | | | | implemented skinned peds, no cutscene hands yetaap2020-04-248-8/+78
| | | | | |
| * | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-235-6/+8
| |\ \ \ \ \
| * | | | | | fixed extra directory issuesaap2020-04-213-1/+20
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-235-6/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' into masterFire_Head2020-04-234-5/+3
| |\ \ \ \ \ \
| | * | | | | | Crossplatform work continueseray orçunus2020-04-224-5/+3
| | |/ / / / /
| * / / / / / ps2 particles, sampman oal startedFire-Head2020-04-232-1/+5
| |/ / / / /
* | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-2126-252/+251
|\| | | | |
| * | | | | Merge pull request #477 from ShFil119/mingwshfil2020-04-2026-252/+251
| |\ \ \ \ \ | | | | | | | | | | | | | | Try to make code working on more platforms
| | * | | | | Try to build with mingwFilip Gawin2020-04-2026-252/+251
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-202-0/+10
|\| | | | | |
| * | | | | | update librw (matfx)aap2020-04-201-0/+8
| | | | | | |
| * | | | | | camerapickup ps2 codeFire-Head2020-04-201-0/+1
| | | | | | |
| * | | | | | beta OddJob(unique jump etc) sliding textFire-Head2020-04-201-0/+1
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-205-2/+20
|\| | | | | |
| * | | | | | MenuScreens.h fixFire-Head2020-04-191-1/+1
| | | | | | |
| * | | | | | MenuScreens.h fixFire-Head2020-04-191-1/+1
| | | | | | |
| * | | | | | Add polish lang supportFire-Head2020-04-195-0/+18
| |/ / / / /
* | | | | | fixesNikolay Korolev2020-04-202-1/+5
| | | | | |
* | | | | | sync with masterNikolay Korolev2020-04-195-9/+9
|\| | | | |
| * | | | | Merge pull request #474 from Nick007J/mastererorcun2020-04-196-2/+58
| |\ \ \ \ \ | | | | | | | | | | | | | | Bug fixes, mostly replay; added RegisterReference for player ped pointer
| * | | | | | Struct cleanup, various fixes, enable PS2 randeray orçunus2020-04-195-9/+9
| | | | | | |
* | | | | | | 1.1 patch stuffNikolay Korolev2020-04-195-2/+56
| |/ / / / / |/| | | | |
* | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-182-12/+12
|\| | | | |
| * | | | | slider fixeray orçunus2020-04-181-3/+2
| | | | | |
| * | | | | Merge pull request #472 from gennariarmando/mastererorcun2020-04-182-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Hide Vehicle/Zone name during Wasted/Busted...
| | * | | | | Hide Vehicle/Zone name during Wasted/Busted...gennariarmando2020-04-182-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed little mistake in my latest commit.
| * | | | | | Vc ped ports and Frontend fixeseray orçunus2020-04-181-6/+4
| |/ / / / /
* / / / / / replays bug fixNikolay Korolev2020-04-186-2/+58
|/ / / / /
* | | | | Changed extraOffset value.gennariarmando2020-04-181-1/+1
| | | | |
* | | | | Merge pull request #464 from gennariarmando/mastererorcun2020-04-182-38/+31
|\ \ \ \ \ | | | | | | | | | | | | Fixed menu radio icons.
| * | | | | Fixed menu radio icons.gennariarmando2020-04-182-44/+44
| | | | | |
* | | | | | bug fixesNikolay Korolev2020-04-181-1/+2
| | | | | |
* | | | | | Revert "Part one"Filip Gawin2020-04-187-30/+27
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 63951d9b957b30a110f42a03edb4833cbbaf380e.
* | | | | | Merge branch 'master' of https://github.com/GTAmodding/re3Filip Gawin2020-04-187-216/+102
|\ \ \ \ \ \
| * | | | | | Zones save/loadSergeanur2020-04-181-192/+87
| | | | | | |
| * | | | | | Remove padding fieldsSergeanur2020-04-184-18/+2
| | | | | | |
| * | | | | | Various fixeseray orçunus2020-04-182-6/+13
| |/ / / / /
* / / / / / Part oneFilip Gawin2020-04-177-27/+30
|/ / / / /
* | | | | Remove patchesSergeanur2020-04-1735-965/+66
| | | | |
* | | | | Merge remote-tracking branch 'samler/world' into StandaloneSergeanur2020-04-171-8/+10
|\ \ \ \ \
| * | | | | Fix CWorld::FindObjectsOfTypeInRangeSectorList bugsaml1er2020-04-171-8/+10
| | | | | |
| | | | | |
| \ \ \ \ \
*-. | | | | | Merge remote-tracking branches 'origin/master' and 'samler/world' into StandaloneSergeanur2020-04-171-1100/+1124
|\ \| | | | |
| | * | | | | Apply clang format to CWorldsaml1er2020-04-171-938/+1031
| | | | | | |
| | * | | | | CWorld fixessaml1er2020-04-171-220/+151
| | | | | | |
* | | | | | | Merge remote-tracking branch 'Fire-Head/master' into StandaloneSergeanur2020-04-1748-458/+446
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/render/Coronas.cpp
| * | | | | | | rem refsFire-Head2020-04-1748-458/+446
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'samler/world' into StandaloneSergeanur2020-04-172-34/+984
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | More CWorld fixessaml1er2020-04-171-24/+24
| | | | | | |
| * | | | | | Fix CWorld::RepositionOneObject bugssaml1er2020-04-171-16/+45
| | | | | | |
| * | | | | | CWorld completesaml1er2020-04-172-23/+126
| | | | | | |
| * | | | | | Merge branch 'master' into worldsaml1er2020-04-1621-150/+171
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/World.cpp # src/core/World.h
| * | | | | | | Reverse CWorldsaml1er2020-04-162-30/+849
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Ped fixes and ref removaleray orçunus2020-04-171-3/+3
| |_|/ / / / |/| | | | |
* | | | | | Some refs removed, little fixes and teleporteray orçunus2020-04-164-6/+27
| |/ / / / |/| | | |
* | | | | More refs removedSergeanur2020-04-164-38/+4
| | | | |
* | | | | Increase alpha entity list capacity for wide screenSergeanur2020-04-161-1/+2
| | | | |
* | | | | More refs removedSergeanur2020-04-162-3/+1
| | | | |
* | | | | first fake RW implementation workingaap2020-04-162-0/+5
| | | | |
* | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-165-2/+17
|\ \ \ \ \
| * | | | | Various fixeseray orçunus2020-04-161-0/+1
| | | | | |
| * | | | | Default native resolution mode and small camera fixesSergeanur2020-04-154-2/+16
| | | | | |
* | | | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-1511-78/+107
|\| | | | |
| * | | | | Merge pull request #440 from Fire-Head/masterNikolay Korolev2020-04-155-1/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | CWeapon done, fixes
| | * | | | | CWeapon done, ps2 cheats fixFire-Head2020-04-155-1/+12
| | | | | | |
| * | | | | | Merge pull request #429 from Nick007J/masterNikolay Korolev2020-04-153-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Scene edit
| | * | | | | | fix debug stuffNikolay Korolev2020-04-142-3/+2
| | | | | | | |
| | * | | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-144-50/+148
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-1410-91/+272
| | |\ \ \ \ \ \
| | * | | | | | | scene editNikolay Korolev2020-04-133-4/+7
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into game_devNikolay Korolev2020-04-1220-2600/+1722
| | |\ \ \ \ \ \ \
| | * | | | | | | | scene initNikolay Korolev2020-04-121-1/+1
| | | | | | | | | |
| * | | | | | | | | Many fixes and cleanuperay orçunus2020-04-157-74/+90
| | |_|_|/ / / / / | |/| | | | | | |
* / | | | | | | | implemented most of librw wrapperaap2020-04-152-24/+32
|/ / / / / / / /
* | | | | | | | Debug font and CProfilesSergeanur2020-04-142-0/+99
| | | | | | | |
* | | | | | | | Some cleanup erorcun2020-04-142-50/+49
| |_|/ / / / / |/| | | | | |
* | | | | | | review fixNikolay Korolev2020-04-131-2/+2
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-139-89/+270
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge pull request #412 from whampson/save-stufferorcun2020-04-131-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | GenericLoad() done
| | * | | | | | FixesWes Hampson2020-04-131-0/+3
| | | | | | | |
| * | | | | | | Merge pull request #413 from erorcun/erorcunerorcun2020-04-136-47/+203
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | CFileLoader last funcs and Frontend cleanup
| | * | | | | | | CFileLoader last funcs and Frontend cleanuperay orçunus2020-04-136-47/+203
| | |/ / / / / /
| * | | | | | | Merge pull request #410 from Sergeanur/PacManPickupserorcun2020-04-131-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | CPacManPickups
| | * | | | | | | CPacManPickupsSergeanur2020-04-131-0/+1
| | |/ / / / / /
| * / / / / / / finished CBoataap2020-04-131-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #409 from erorcun/erorcunerorcun2020-04-125-42/+62
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Frontend fixes + triangle for back as default
| | * | | | | | Frontend fixes + triangle for back as defaulteray orçunus2020-04-125-42/+62
| | | | | | | |
* | | | | | | | obviously forgot about itNikolay Korolev2020-04-121-1/+1
| | | | | | | |
* | | | | | | | sync with masterNikolay Korolev2020-04-1219-2592/+1385
|\| | | | | | |
| * | | | | | | Merge pull request #402 from Nick007J/masterNikolay Korolev2020-04-123-7/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / Record
| * | | | | | CDebug fixeray orçunus2020-04-121-1/+1
| | | | | | |
| * | | | | | Merge pull request #400 from erorcun/erorcunerorcun2020-04-117-640/+1378
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | CMenuManager done and CHud fixes
| | * | | | | | CMenuManager done and CHud fixeseray orçunus2020-04-117-640/+1378
| | | | | | | |
| * | | | | | | Link with RW libsSergeanur2020-04-1112-1951/+6
| | | | | | | |
* | | | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-112-1/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-112-1/+2
| |\| | | | | |
| | * | | | | | Fix cutscene camera latencySergeanur2020-04-112-1/+2
| | | | | | | |
* | | | | | | | CPoolsNikolay Korolev2020-04-112-9/+338
|/ / / / / / /
* | | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-113-6/+14
|\| | | | | |
| * | | | | | fixing r* visioned leakSergeanur2020-04-101-4/+6
| | | | | | |
| * | | | | | implemented CTrafficLightsaap2020-04-102-2/+8
| |/ / / / /
* | | | | | RecordNikolay Korolev2020-04-112-2/+3
| | | | | |
* | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-1028-3616/+4363
|\| | | | |
| * | | | | PlayerSkin small cleanupSergeanur2020-04-102-192/+0
| | | | | |
| * | | | | Fixing mixed IsCutsceneProcessing and IsRunningSergeanur2020-04-102-490/+0
| | | | | |
| * | | | | Fix sprite vertical scaleSergeanur2020-04-101-2/+0
| |/ / / /
| * | | | normalized line endings to LFaap2020-04-097-875/+875
| | | | |
| * | | | Merge remote-tracking branch 'Fire-Head/master'Sergeanur2020-04-0913-806/+1595
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Radar.cpp
| | * | | | PS2 Cheats, restored R*namesFire-Head2020-04-098-178/+292
| | | | | |
| | * | | | cleanupFire-Head2020-04-091-21/+45
| | | | | |
| | * | | | (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowModeFire-Head2020-04-099-655/+1306
| | | | | |
| * | | | | Merge pull request #393 from Sergeanur/txdimgaap2020-04-092-7/+203
| |\ \ \ \ \ | | | | | | | | | | | | | | txd.img creator
| | * | | | | txd.img creatorSergeanur2020-04-092-7/+203
| | |/ / / /
| * | | | | Merge pull request #395 from aap/masteraap2020-04-094-1507/+1504
| |\ \ \ \ \ | | | | | | | | | | | | | | fixed questionable RW usage; changed radar mask to PS2 technique
| | * | | | | fixed questionable RW usage; changed radar mask to PS2 techinqueaap2020-04-094-1507/+1504
| | | | | | |
| * | | | | | CStats finishedSergeanur2020-04-092-19/+245
| |/ / / / /
| * | | | | Merge pull request #391 from Sergeanur/Cheatsaap2020-04-091-25/+241
| |\ \ \ \ \ | | | | | | | | | | | | | | Cheats
| | * | | | | CheatsSergeanur2020-04-081-25/+241
| | |/ / / /
| * | | | | Merge pull request #390 from Sergeanur/Explosionaap2020-04-093-1/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | Finished CExplosion
| | * | | | | Finished CExplosionSergeanur2020-04-093-1/+7
| | |/ / / /
| * | | | | Merge pull request #389 from Nick007J/masteraap2020-04-091-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Weather
| * \ \ \ \ \ Merge branch 'master' of github.com:gtamodding/re3aap2020-04-081-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | implemented CSkidmarksaap2020-04-081-0/+1
| | | | | | |
| * | | | | | Reverting tabs back to spaces for aapSergeanur2020-04-081-34/+34
| | | | | | |
* | | | | | | record initNikolay Korolev2020-04-103-6/+12
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-085-44/+56
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Reverting tabs back to spaces for aapSergeanur2020-04-081-34/+34
| |/ / / /
| * | | | Merge pull request #385 from aap/masteraap2020-04-082-19/+22
| |\ \ \ \ | | | | | | | | | | | | implemented CRubbish, CShinyTexts, CBrightLights, CMotionBlurStreaks, CSpecialFX
| | * | | | finished CMotionBlurStreaks, CSpecialFXaap2020-04-072-19/+20
| | | | | |
| | * | | | implemented CRubbishaap2020-04-071-0/+1
| | | | | |
| | * | | | implemented CShinyTextsaap2020-04-071-0/+1
| | | | | |
| * | | | | Small camera fixesSergeanur2020-04-083-58/+67
| | | | | |
* | | | | | fixesNikolay Korolev2020-04-081-1/+1
|/ / / / /
* | | | | Menu map changeseray orçunus2020-04-071-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new texture by AG - map now centers when zoomed out too much - background darkened a bit - mouse wheel up/down switched - cross add target on gamepad - LeftStickY inverted
* | | | | Menu maperay orçunus2020-04-078-68/+462
|/ / / /
* | | | finished CCollisionaap2020-04-062-3/+81
| | | |
* | | | fixed typoaap2020-04-061-4/+4
| | | |
* | | | Merge pull request #379 from erorcun/erorcunaap2020-04-066-82/+1208
|\ \ \ \ | | | | | | | | | | Frontend (last-3)
| * | | | Frontend (last-3)eray orçunus2020-04-046-82/+1208
| | |/ / | |/| |
* | | | Merge pull request #381 from aap/masteraap2020-04-062-0/+2593
|\ \ \ \ | | | | | | | | | | PS2 Frontend Controls
| * | | | PS2 Frontend Controlsaap2020-04-052-0/+2593
| | | | |
| * | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-04-033-1/+7
| |\| | |
* | | | | stats fixNikolay Korolev2020-04-062-61/+50
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-062-6/+87
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into masterNikolay Korolev2020-04-0653-2196/+11004
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Implement Init for StatsPerikiyoXD2020-03-242-5/+88
| | | | | |
* | | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-0610-336/+3440
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | fixed look behind bugaap2020-04-051-1/+1
| | | | | |
| * | | | | Merge pull request #378 from aap/masteraap2020-04-0510-335/+3439
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | | finished CCamera
| | * | | CCamera fixesaap2020-04-0310-335/+3439
| | | | |
* | | | | Merge branch 'master' into garages_devNikolay Korolev2020-04-053-1/+7
|\| | | |
| * | | | Merge pull request #377 from Fire-Head/masteraap2020-04-032-0/+3
| |\ \ \ \ | | |_|_|/ | |/| | | Glass
| | * | | Glass doneFire-Head2020-04-012-0/+3
| | | | |
| * | | | fixesSergeanur2020-04-021-1/+4
| | |/ / | |/| |
* / | | cranes initNikolay Korolev2020-04-051-1/+3
|/ / /
* | | timebarsSergeanur2020-03-318-2/+220
| | |
* | | Merge pull request #373 from erorcun/erorcunaap2020-03-315-12/+676
|\ \ \ | | | | | | | | Mouse free cam for peds&cars (under FREE_CAM)
| * | | Mouse free cam for peds&cars (under FREE_CAM)eray orçunus2020-03-315-12/+676
| |/ /
* | | Merge remote-tracking branch 'origin/master' into MoreLanguagesSergeanur2020-03-3024-291/+839
|\| |
| * | Merge pull request #366 from Nick007J/masteraap2020-03-297-2/+15
| |\ \ | | | | | | | | Garage part 1
| | * | fixed PS2 buildNikolay Korolev2020-03-291-0/+2
| | | |
| | * | merge with upstreamNikolay Korolev2020-03-2920-288/+699
| | |\ \
| | * \ \ Merge branch 'master' into garages_devNikolay Korolev2020-03-283-63/+60
| | |\ \ \
| | * \ \ \ merge with masterNikolay Korolev2020-03-289-14/+27
| | |\ \ \ \
| | * | | | | garage update part 2Nikolay Korolev2020-03-282-0/+2
| | | | | | |
| | * | | | | Merge branch 'master' into garages_devNikolay Korolev2020-03-2831-1743/+5745
| | |\ \ \ \ \
| | * | | | | | garages part 1Nikolay Korolev2020-03-286-2/+11
| | | | | | | |
| * | | | | | | Merge pull request #369 from erorcun/erorcunerorcun2020-03-297-40/+166
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | CShotInfo, CWanted done, Frontend fix
| | * | | | | | CShotInfo, CWanted done, Frontend fixeray orçunus2020-03-297-40/+166
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' into masterFire_Head2020-03-2911-284/+318
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #367 from Sergeanur/wrappers_cleanupaap2020-03-294-190/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wrappers cleanup
| | | * | | | | | Wrappers cleanupSergeanur2020-03-294-190/+0
| | | | | | | | |
| | * | | | | | | rotating FollowPed cam (disabled by default for now)aap2020-03-294-0/+217
| | |/ / / / / /
| * | | | | | | style & cosmetic fixesFire-Head2020-03-291-8/+0
| | | | | | | |
| * | | | | | | style & cosmetic fixesFire-Head2020-03-291-14/+14
| | | | | | | |
| * | | | | | | CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* namesFire-Head2020-03-2811-63/+445
| | |/ / / / / | |/| | | | |
* | | | | | | Add russian lang supportSergeanur2020-03-306-0/+40
| |/ / / / / |/| | | | |
* | | | | | Fire and PlayerSkin fixSergeanur2020-03-292-39/+41
| |_|_|/ / |/| | | |
* | | | | Merge pull request #360 from ShFil119/impr/assemblyaap2020-03-283-63/+60
|\ \ \ \ \ | |/ / / / |/| | | | Cleanup patching system
| * | | | Cleanup patching systemFilip Gawin2020-03-282-54/+57
| | | | |
| * | | | Remove assembly from patcher.hFilip Gawin2020-03-272-10/+4
| | | | |
* | | | | Merge pull request #363 from erorcun/erorcunerorcun2020-03-288-13/+26
|\ \ \ \ \ | | | | | | | | | | | | CCopPed done and #include cleanup
| * | | | | CCopPed done and #include cleanuperay orçunus2020-03-288-13/+26
| | |_|/ / | |/| | |
* / | | | CCam fixaap2020-03-281-1/+1
|/ / / /
* | | | remove include <new> from common.haap2020-03-284-9/+18
| | | |
* | | | Merge branch 'master' of github.com:gtamodding/re3aap2020-03-281-1/+20
|\ \ \ \
| * | | | Set Xinput version to 9.1.0 + vibration setSergeanur2020-03-281-1/+20
| |/ / /
* / / / CCam fixaap2020-03-281-1/+1
|/ / /
* | | removed windows.h for most .cppsaap2020-03-279-329/+357
| | |
* | | XInputSergeanur2020-03-273-1/+60
| | |
* | | Merge pull request #357 from aap/masteraap2020-03-2711-1243/+4658
|\ \ \ | | | | | | | | Finished CCam; various smaller things
| * | | implemented some unused PS2 camsaap2020-03-273-4/+300
| | | |
| * | | Finished CCam; various smaller thingsaap2020-03-2711-1243/+4362
| |/ /
* | | Merge pull request #356 from blingu/mastererorcun2020-03-262-31/+428
|\ \ \ | | | | | | | | CFire and CFireManager classes nearly done
| * | | Update Fire.cppblingu2020-03-261-5/+5
| | | |
| * | | Update Fire.cppblingu2020-03-261-1/+1
| | | |
| * | | Update Fire.cppblingu2020-03-261-1/+1
| | | |
| * | | Update Fire.cppblingu2020-03-251-2/+2
| | | |
| * | | Update Fire.cppblingu2020-03-251-2/+2
| | | |
| * | | m_snTimeInMilliseconds to GetTimeInMilliseconds()blingu2020-03-251-12/+12
| | | |
| * | | Update Fire.cppblingu2020-03-251-6/+6
| | | |
| * | | renamed field_24 to m_nNextTimeToAddFlamesblingu2020-03-251-1/+1
| | | |
| * | | Update Fire.cppblingu2020-03-251-8/+0
| | | |
| * | | Update Fire.hblingu2020-03-251-1/+1
| | | |
| * | | Update Fire.hblingu2020-03-251-3/+3
| | | |
| * | | Update Fire.cppblingu2020-03-251-118/+114
| | | |
| * | | Update Fire.cppblingu2020-03-241-15/+419
| | | |
| * | | Update Fire.hblingu2020-03-241-1/+1
| | | |
| * | | Update Fire.hblingu2020-03-241-16/+21
| | |/ | |/|
* | | CCopPed 2 and fixeseray orçunus2020-03-267-130/+205
| |/ |/|
* | obrstr + DebugSergeanur2020-03-244-5/+221
|/
* merge with upstreamNikolay Korolev2020-03-226-77/+87
|\
| * Fixes for reviewFilip Gawin2020-03-221-0/+11
| |
| * Remove unneeded double to float castsFilip Gawin2020-03-221-1/+1
| |
| * Fixes for Serge's reviewFilip Gawin2020-03-224-69/+68
| |
| * Implement ProcessGarages + small cleanupFilip Gawin2020-03-221-5/+7
| |
| * Implement ProcessFiresFilip Gawin2020-03-221-1/+1
| |
* | missing endlinesNikolay Korolev2020-03-222-2/+2
| |
* | merge with masterNikolay Korolev2020-03-223-0/+5
|\|
| * ConsoleSergeanur2020-03-223-1/+6
| |
| * Merge pull request #350 from Nick007J/masteraap2020-03-221-0/+1
| |\ | | | | | | bullet traces
| * | fixed vehicle rendering bugaap2020-03-221-0/+1
| | |
* | | CGame::InitialiseNikolay Korolev2020-03-2213-12/+216
| |/ |/|
* | bullet traces fixesNikolay Korolev2020-03-221-0/+1
|/
* ProcessButtonPresses and fixeseray orçunus2020-03-216-684/+1691
|
* Merge branch 'master' into Radar2erorcun2020-03-1712-1345/+1382
|\
| * Merge pull request #347 from Nick007J/mastererorcun2020-03-171-0/+4
| |\ | | | | | | replay fixes + script crash fix
| | * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-03-153-38/+45
| | |\
| | * | replay bug fixes, script bug fixNikolay Korolev2020-03-151-0/+4
| | | |
| * | | Merge pull request #345 from whampson/save-stufferorcun2020-03-1712-27/+60
| |\ \ \ | | |_|/ | |/| | GenericSave() done
| | * | Spacing fixWes Hampson2020-03-131-3/+3
| | | |
| | * | Add CTimeStepWes Hampson2020-03-132-0/+15
| | | |
| | * | Style fixesWes Hampson2020-03-111-1/+1
| | | |
| | * | GenericSave complete, still needs some testingWes Hampson2020-03-114-5/+9
| | | |
| | * | Add Load/Save functionsWes Hampson2020-03-114-18/+32
| | | |
| | * | Begin work on GenericSaveWes Hampson2020-03-052-3/+3
| | |/
* | / Finished CRadar, a bit of CExplosionSergeanur2020-03-164-251/+261
|/ /
* / CPopulation done, CCopPed and fixeseray orçunus2020-03-113-38/+45
|/
* Fixes and cleanuperay orçunus2020-03-022-4/+4
|
* merge with upstreamNikolay Korolev2020-03-012-79/+69
|\
| * CPopulation 3 and fixeseray orçunus2020-02-272-79/+69
| |
* | more stuff + intro fixNikolay Korolev2020-02-241-1/+2
| |
* | Merge branch 'master' into script_devNikolay Korolev2020-02-241-1/+1
|\|
| * Merge pull request #333 from Nick007J/masteraap2020-02-238-2/+138
| |\ | | | | | | script 1000-1154
| * | some fixeseray orçunus2020-02-221-1/+1
| | |
* | | some changesNikolay Korolev2020-02-233-8/+8
| |/ |/|
* | mergeNikolay Korolev2020-02-223-3/+6
|\|
| * CPopulation 2eray orçunus2020-02-191-2/+3
| |
| * Merge pull request #328 from erorcun/erorcunerorcun2020-02-172-1/+3
| |\ | | | | | | CPopulation 1
| | * CPopulation 1eray orçunus2020-02-172-1/+3
| | |
* | | script 1000-1154Nikolay Korolev2020-02-168-2/+138
|/ /
* | sync with upstreamNikolay Korolev2020-02-159-8/+13
|\|
| * CPlayerPed doneeray orçunus2020-02-134-1/+5
| |
| * cMusicManagerSergeanur2020-02-073-3/+5
| |
| * CullZone fixSergeanur2020-02-041-3/+3
| |
| * Some fixes and some cosmetic thingseray orçunus2020-02-021-1/+0
| |
* | script 900-999Nikolay Korolev2020-02-154-0/+10
| |
* | script 900-999 initNikolay Korolev2020-02-022-0/+2
|/
* Fixed wrong slot indexing in FrontendSergeanur2020-01-311-1/+1
|
* Merge pull request #299 from Sergeanur/PedIKaap2020-01-313-7/+74
|\ | | | | CPedIK finished, bit of CCamera
| * suggested fixesSergeanur2020-01-301-1/+2
| |
| * acosSergeanur2020-01-291-1/+1
| |
| * cameraSergeanur2020-01-292-6/+72
| |
* | Merge pull request #298 from Sergeanur/saveaap2020-01-315-61/+17
|\ \ | | | | | | save
| * | saveSergeanur2020-01-275-61/+17
| |/
* / CRemoteSergeanur2020-01-313-2/+16
|/
* Fix invert mouse on/offSergeanur2020-01-261-1/+1
|
* audio stuffSergeanur2020-01-252-2/+3
| | | | | | | | | | | Collision audio and police radio stuff moved to a separate cpp's like in the original code cPoliceRadioQueue added, code refactored correspondingly cAudioManager::ServiceCollisions reversed PlayOneShotScriptObject reversed cAudioScriptObject moved to AudioScriptObject.cpp Fixed use of numbers on non-integer types (bools, pointers) enum is now used for ped audio calculation Added fixes for vehicle description in the police radio (missing vehicles and wrong colors)
* CPlayerPed continues (#294)erorcun2020-01-233-10/+27
|
* Fixing possible leaks in CModelInfo::ShutDownSergeanur2020-01-232-0/+8
|
* Plane crashfix and moreSergeanur2020-01-231-2/+2
|
* ConstructMloClumpsSergeanur2020-01-212-4/+4
|
* Refactor CCullZone::CalcDistToCullZoneSquaredSergeanur2020-01-201-21/+8
|
* Atan2 and SqrtSergeanur2020-01-201-1/+1
|
* disable cullzone writerSergeanur2020-01-202-1/+2
|
* CullZone.dat writer startSergeanur2020-01-202-23/+272
|
* MLO, XtraCompsModelInfo, MovingThing, SolidSergeanur2020-01-204-5/+63
|
* Merge pull request #290 from Sergeanur/ProjectileInfoaap2020-01-121-0/+1
|\ | | | | ProjectileInfo
| * FixesSergeanur2020-01-121-0/+1
| |
* | Merge pull request #291 from Sergeanur/AccidentManagererorcun2020-01-123-1/+167
|\ \ | | | | | | AccidentManager
| * | AccidentManagerSergeanur2020-01-113-16/+94
| | |
| * | moveSergeanur2020-01-112-0/+88
| |/
* / Fixes 2eray orçunus2020-01-112-12/+12
|/
* Merge pull request #289 from erorcun/erorcunerorcun2020-01-114-22/+56
|\ | | | | Fixes
| * Fixeseray orçunus2020-01-104-22/+56
| |
* | CUserDisplay, CPlaceName, CCurrentVehicleSergeanur2020-01-072-184/+116
|/
* Finishing CDarkelSergeanur2020-01-072-0/+4
|
* CPlayerPed & CMenuManager (#286)erorcun2020-01-076-612/+592
| | | Make Frontend great again!
* script 800-899Nikolay Korolev2020-01-039-2/+30
|
* bug fixesNikolay Korolev2020-01-011-2/+4
|
* Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2020-01-011-1/+1
|\
| * fixed vehicle enter crashNikolay Korolev2020-01-011-1/+1
| |
* | fix merge with upstreamNikolay Korolev2020-01-012-5/+1
| |
* | fix mergeNikolay Korolev2020-01-011-1/+0
| |
* | merge with upstreamNikolay Korolev2020-01-0128-437/+1442
|\|
| * CPlayerInfo doneeray orçunus2019-12-164-8/+264
| |
| * CPhone, CPlayerInfo, CFire, CWorlderay orçunus2019-12-0510-26/+315
| |
| * fixed mouse bindingFire_Head2019-11-301-56/+49
| |
| * CCivilianPed done & restore peds running to phoneeray orçunus2019-11-263-5/+8
| |
| * CPed completed!eray orçunus2019-11-202-8/+8
| | | | | | | | And a few fixes
| * Frontend, Peds & logic and overflow fixeseray orçunus2019-11-125-315/+471
| |
| * fixesSergeanur2019-11-111-22/+34
| |
| * TempColModelsSergeanur2019-11-111-1/+263
| |
| * Merge pull request #263 from Sergeanur/strcmperorcun2019-11-097-24/+55
| |\ | | | | | | Implemented faststrcmp, faststricmp, strcasecmp
| | * Implemented faststrcmp, faststricmp, strcasecmpSergeanur2019-10-307-24/+55
| | |
* | | some not fully tested stuffNikolay Korolev2020-01-014-3/+54
|/ /
* | Readme revision (#268)erorcun2019-11-061-5/+5
| |
* | Peds & a few fixeseray orçunus2019-11-051-0/+1
| |
* | Renderer fixeseray orçunus2019-11-031-0/+3
| |
* | Merge pull request #255 from Nick007J/mastererorcun2019-10-305-0/+34
|\ \ | |/ |/| script 500-599
| * mergeNikolay Korolev2019-10-2628-483/+391
| |\
| * | script 500-599 plus bugfixNikolay Korolev2019-10-219-0/+38
| | |
* | | CRadar::Initialise() + fixesSergeanur2019-10-302-15/+92
| | |
* | | Fixed settings loading, added TopLineEmptyFileSergeanur2019-10-303-4/+7
| | |
* | | Small CPad fixesSergeanur2019-10-294-6/+8
| | |
* | | Implement PreloadMissionAudio + small fixesFilip Gawin2019-10-271-1/+1
| | |
* | | const fixSergeanur2019-10-271-1/+1
| | |
* | | Simplify CControllerConfigManager::InitialiseControllerActionNameArraySergeanur2019-10-271-112/+45
| | |
* | | fix Pad.hFire_Head2019-10-271-7/+7
| | |
* | | Merge branch 'master' into masterFire_Head2019-10-279-266/+2795
|\ \ \ | |_|/ |/| |
| * | ControllerConfig doneFire-Head2019-10-279-213/+2793
| | | | | | | | | | | | Fix Cam enum
* | | A bit more enums for ChangeMusicModeSergeanur2019-10-261-2/+2
| | |
* | | Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicModeSergeanur2019-10-262-5/+3
| | |
* | | Added timing to RwTextureGtaStreamReadSergeanur2019-10-261-2/+16
| | |
* | | Fixes for aap review (audio8)Filip Gawin2019-10-263-3/+3
| | |
* | | Fixes for nitpicksFilip Gawin2019-10-262-11/+9
| | |
* | | More audio (to hook and test)Filip Gawin2019-10-265-4/+6
| | |
* | | More workFilip Gawin2019-10-261-2/+2
| | |
* | | audio7Filip Gawin2019-10-261-4/+4
| | |
* | | Fixes&Pedseray orçunus2019-10-252-0/+5
| | |
* | | Merge pull request #247 from Sergeanur/3dMarkerserorcun2019-10-232-1/+2
|\ \ \ | | | | | | | | Full C3dMarkers
| * | | Full C3dMarkersSergeanur2019-10-172-1/+2
| | | |
* | | | Merge pull request #252 from Sergeanur/MessagesPagerTexterorcun2019-10-238-427/+60
|\ \ \ \ | |_|/ / |/| | | Full CMessages, full CPager, CText fixes
| * | | Full MessagesSergeanur2019-10-212-5/+58
| | | |
| * | | Full CPagerSergeanur2019-10-202-8/+2
| | | |
| * | | Move MessagesSergeanur2019-10-202-82/+0
| | | |
| * | | CText encoding fixesSergeanur2019-10-202-332/+0
| | | |
* | | | CGame::FinalShutdownSergeanur2019-10-211-2/+15
| | | |
* | | | Merge pull request #246 from Sergeanur/PoolsSergeanur2019-10-215-30/+113
|\ \ \ \ | |/ / / |/| | | Some CPool and CPools funcs, restoring original logic of pool lookup loops
| * | | Some CPool and CPools funcs, restoring original logic of pool lookup loopsSergeanur2019-10-165-30/+113
| |/ /
* | | Merge pull request #248 from Nmzik/masteraap2019-10-2010-1/+166
|\ \ \ | |_|/ |/| | CPopulation::Initialise() && CGame::Process() && CGame::ReloadIPLs()
| * | typo fixnmzik2019-10-191-1/+1
| | |
| * | getter and enum fixnmzik2019-10-191-2/+2
| | |
| * | CGame::Process() && CGame::ReloadIPLsnmzik2019-10-1910-1/+166
| | |
* | | Moved CCutsceneMgr::ms_cutsceneProcessing to privateSergeanur2019-10-192-3/+2
|/ /
* | Fixed nasty warningsSergeanur2019-10-171-1/+1
| |
* | Gangs save and missed sound enumsSergeanur2019-10-171-2/+1
|/
* Merge remote-tracking branch 'upstream/master' into script_devNikolay Korolev2019-10-132-2/+17
|\
| * Fixed widescreen turning off during cutscenesSergeanur2019-10-132-2/+17
| |
* | 400-499Nikolay Korolev2019-10-132-0/+10
|/
* Fixed save game Load/Save failed assertion on Debug buildSergeanur2019-10-112-1/+5
|
* Merge pull request #229 from Sergeanur/SaveLoadTemplatesSergeanur2019-10-113-9/+61
|\ | | | | Added read/write template functions for save data
| * Added read/write template functions for save data, small Load/Save arguments unificationSergeanur2019-10-083-9/+61
| |
* | CalculateBoundingSphereRadiusCBSergeanur2019-10-101-15/+29
|/
* Full CGameLogicSergeanur2019-10-0811-5/+64
|
* Fixing typo for cursor coordsSergeanur2019-10-071-1/+1
|
* Aspect ratio fix for player skin menuSergeanur2019-10-072-1/+13
|
* Little fixeray orçunus2019-10-071-1/+1
|
* Pedseray orçunus2019-10-063-8/+9
|
* Fixed player blip heading when looking left/right/behindSergeanur2019-10-061-0/+4
|
* Fixed CCamera::SetWideScreenOff dupe, removed goto in CStreaming::RetryLoadFileSergeanur2019-10-063-17/+30
|
* Merge pull request #225 from erorcun/erorcunerorcun2019-10-051-4/+2
|\ | | | | Fixes
| * Fixeseray orçunus2019-10-051-4/+2
| |
* | Merge pull request #223 from Sergeanur/fix/WideCoronaaap2019-10-051-1/+3
|\ \ | |/ |/| Corona widescreen fix
| * Corona widescreen fixSergeanur2019-10-051-1/+3
| |
* | Triangular radar blipsSergeanur2019-10-053-1/+84
| |
* | CDarkel, walkaround fixeray orçunus2019-10-052-6/+21
|/
* Fix radareray orçunus2019-10-042-122/+256
|
* CPickupsSergeanur2019-10-033-1/+8
|
* Added missed config.hSergeanur2019-10-031-0/+1
|
* Fixes & pedseray orçunus2019-10-031-1/+0
|
* zero checkSergeanur2019-09-281-1/+1
|
* PlayerSkinSergeanur2019-09-285-4/+205
|
* Added CUTSCENEDIRSIZE to Config enum and CUTSCENENAMESIZE macroSergeanur2019-09-283-4/+7
|
* Added f for floats, removed checks for deleteSergeanur2019-09-281-7/+5
|
* RefactoringSergeanur2019-09-282-41/+41
|
* Full CCutsceneMgrSergeanur2019-09-287-2/+466
|
* Peds, ProcessObjective and fixeseray orçunus2019-09-261-1/+2
|
* Peds, a fix and a tad of VCeray orçunus2019-09-172-9/+3
|
* CCarCtrlNikolay Korolev2019-09-153-2/+37
|
* fix typoNikolay Korolev2019-09-142-2/+2
|
* Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-09-121-16/+16
|\
| * fixed launch in space bugNikolay Korolev2019-09-121-1/+1
| |
| * Merge pull request #205 from erorcun/erorcunaap2019-09-121-15/+15
| |\ | | | | | | Little cleanup
| | * Little cleanuperay orçunus2019-09-121-15/+15
| | |
* | | Merge remote-tracking branch 'upstream/master' into carctrl_devNikolay Korolev2019-09-1210-4/+262
|\| |
| * | Merge pull request #204 from erorcun/erorcunaap2019-09-1210-4/+262
| |\| | | | | | | World and Peds
| | * World and Pedseray orçunus2019-09-1210-4/+262
| | |
* | | DragCarToPointNikolay Korolev2019-09-122-2/+3
|/ /
* / ccarctrlNikolay Korolev2019-09-111-1/+4
|/
* Fix and cancellable car entereray orçunus2019-09-051-0/+1
|
* CPed::ProcessControl and some cleanuperay orçunus2019-09-031-1/+1
|
* CleanupFilip Gawin2019-08-279-39/+39
|
* More more more audioFilip Gawin2019-08-2713-53/+53
|
* CleanupFilip Gawin2019-08-279-544/+35
|
* More audio pedFilip Gawin2019-08-2718-47/+587
|
* Pedseray orçunus2019-08-231-4/+3
|
* AnimViewer messages, Particle fix, Pedseray orçunus2019-08-176-7/+54
|
* Little CPed fixes & Peddebugeray orçunus2019-08-163-13/+19
|
* AnimViewer fixeseray orçunus2019-08-152-86/+51
|
* Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-08-152-3/+19
|\
| * Merge branch 'master' into masterFire_Head2019-08-1516-45/+128
| |\
| * | CParticleObject done, cDMAudio doneFire-Head2019-08-151-0/+18
| | |
* | | AnimViewer!eray orçunus2019-08-1516-5/+527
| |/ |/|
* | Merge pull request #186 from Nick007J/masteraap2019-08-111-0/+2
|\ \ | | | | | | more CCarCtrl
| * \ Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-102-0/+7
| |\ \
| * | | More CCarCtrlNikolay Korolev2019-08-101-0/+2
| | | |
* | | | P.e.d.s. and fixeseray orçunus2019-08-112-0/+31
| |/ / |/| |
* | | finished CPathFindaap2019-08-092-0/+7
|/ /
* | CCarCtrl::GenerateOneRandomVehicle!Nikolay Korolev2019-08-063-1/+39
| |
* | CPed part 218eray orçunus2019-08-051-0/+4
| |
* | implemented CHeliaap2019-08-046-31/+17
| |
* | fixed collisionNikolay Korolev2019-08-031-1/+1
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-08-033-0/+4
|\|
| * Merge pull request #178 from Fire-Head/masteraap2019-08-023-0/+4
| |\ | | | | | | sampman done
| | * Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-08-0216-20/+80
| | |\
| | * | sampman doneFire-Head2019-08-023-0/+4
| | | |
* | | | RunningScript, part 4, plus some fixesNikolay Korolev2019-08-034-12/+27
|/ / /
* | | The Pedseray orçunus2019-08-021-0/+3
| | |
* | | implemented CPlaneaap2019-07-312-1/+2
| | |
* | | implemented CTrainaap2019-07-314-3/+5
| |/ |/|
* | fixed wantedNikolay Korolev2019-07-281-0/+3
| |
* | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-271-1/+14
|\ \
| * | CAutomobile effect stuffaap2019-07-261-1/+14
| | |
* | | cargen + some scriptNikolay Korolev2019-07-275-0/+8
|/ /
* | fixed wantedNikolay Korolev2019-07-261-5/+5
| |
* | CAutomobile::FireTruckControl and HydraulicControlaap2019-07-265-5/+8
| |
* | Merge branch 'master' into masteraap2019-07-265-6/+29
|\ \
| * | Ped & fixes, including peds dive into danger fixeray orçunus2019-07-252-0/+13
| | |
| * | implemented CAutomobile::TankControlaap2019-07-253-6/+16
| | |
* | | Running script part 3Nikolay Korolev2019-07-252-0/+10
|/ /
* / fixed dinputaap2019-07-252-3/+3
|/
* Merge branch 'master' into masterFire_Head2019-07-248-11/+373
|\
| * updateFire-Head2019-07-243-18/+3
| |
| * shadows doneFire-Head2019-07-249-14/+393
| |
* | bit more CAutomobileaap2019-07-231-0/+12
| |
* | added CPool<cAudioScriptObject, cAudioScriptObject>Nikolay Korolev2019-07-202-1/+6
| |
* | couple of fixesaap2019-07-203-5/+5
| |
* | ComputeDopplerEffectedFrequencyFilip Gawin2019-07-193-6/+7
| |
* | implemented col line renderingaap2019-07-196-12/+242
| |
* | CAutomobile ctor, car spawner, fixesaap2019-07-191-38/+59
| |
* | *cough*aap2019-07-191-1/+1
| |
* | fixed eventlist bugaap2019-07-191-1/+1
| |
* | CAutomobile::ProcessControl doneaap2019-07-183-1/+11
| |
* | more CAutomobile::ProcessControlaap2019-07-172-3/+2
| |
* | Fluffguard32019-07-174-6/+5
| |
* | fix fixNikolay Korolev2019-07-171-1/+1
| |
* | script fix, bomb fix, flying components fixNikolay Korolev2019-07-172-2/+3
| |
* | more fixes; started CAutomobile::ProcessControlaap2019-07-161-8/+8
| |
* | Merge branch 'master' into erorcunaap2019-07-1611-414/+419
|\ \
| * | testNikolay Korolev2019-07-151-1/+1
| | |
| * | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-143-425/+403
| |\ \
| | * | started making frontend accurate to gameaap2019-07-143-425/+403
| | | |
| * | | RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes)Nikolay Korolev2019-07-144-1/+19
| | | |
| * | | Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-07-142-228/+233
| |\| |
| | * | Merge pull request #131 from gennariarmando/masteraap2019-07-142-228/+233
| | |\ \ | | | | | | | | | | Frontend fixes.
| | | * | Frontend fixes._AG2019-07-112-228/+233
| | | |/ | | | | | | | | | | | | Fix #125 #119 #105 #98 #54.
| * | / Partial RunningScript part2Nikolay Korolev2019-07-143-0/+4
| |/ /
| * | fixed policeDontCareNikolay Korolev2019-07-131-0/+2
| | |
* | | Phone, World, Pederay orçunus2019-07-158-45/+214
|/ /
* | more CWanted; added CEventListaap2019-07-127-53/+642
| |
* | CAutomobile::ProcessControlInputsaap2019-07-112-1/+16
|/
* Merge branch 'master' into masterFire_Head2019-07-1137-273/+889
|\
| * tried to fix CMenuManager::Process but still issuesaap2019-07-101-56/+60
| |
| * and of course the last commit didnt fix everythingaap2019-07-105-13/+13
| |
| * added wrappers around math functionsaap2019-07-108-79/+80
| |
| * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-07-1024-140/+543
| |\
| | * fixed some stuff in frontend, badly broke others; disabled reversed frontend for the momentaap2019-07-106-203/+323
| | |
| | * Merge pull request #127 from gennariarmando/masteraap2019-07-109-92/+305
| | |\ | | | | | | | | More frontend inputs.
| | | * More frontend inputs._AG2019-07-109-92/+305
| | | |
| | * | Merge pull request #126 from Nick007J/masteraap2019-07-102-0/+2
| | |\ \ | | | |/ | | |/| RunningScript part 1
| | | * sync with upstreamNikolay Korolev2019-07-0915-19/+82
| | | |\
| | | * | RunningScript: 1/12Nikolay Korolev2019-07-092-0/+2
| | | | |
| | * | | more CVehicleaap2019-07-093-2/+8
| | | |/ | | |/|
| | * | yet more CAutomobileaap2019-07-098-10/+51
| | | |
| | * | more CAutomobileaap2019-07-093-5/+9
| | | |
| | * | Merge branch 'master' of github.com:GTAmodding/re3aap2019-07-081-0/+1
| | |\ \
| | * | | more CAutomobileaap2019-07-084-4/+21
| | | |/ | | |/|
| * | | Phone start, ped spinning and cop car fix, and some love to CPederay orçunus2019-07-102-1/+81
| | |/ | |/| | | | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
| * | One driver owns all the cars fixeray orçunus2019-07-081-0/+1
| |/ | | | | | | Signed-off-by: eray orçunus <erayorcunus@gmail.com>
| * little changes; one more function of CAutomobileaap2019-07-081-4/+4
| |
| * cleaned up patching of virtual functions; started CAutomobileaap2019-07-084-5/+33
| |
| * Merge pull request #111 from gennariarmando/masteraap2019-07-076-9/+128
| |\ | | | | | | Darkel/Wanted update.
| | * blah_AG2019-07-071-1/+1
| | |
| | * Merge branch 'master' of https://github.com/gtamodding/re3_AG2019-07-076-10/+129
| | |
| * | IntoTheScripts!Nikolay Korolev2019-07-072-22/+2
| |/
* / WaterLevel doneFire-Head2019-07-111-0/+1
|/
* the great reorganizationaap2019-07-0787-0/+24112
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 21:09:10 +0100