Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-08-29 | 1 | -1/+1 |
|\ | | | | | | | | | | | # Conflicts: # src/audio/AudioManager.cpp # src/core/Radar.cpp | ||||
| * | fixed debug teleport | Nikolay Korolev | 2021-08-26 | 1 | -1/+1 |
| | | |||||
| * | Waypoint text fix | Sergeanur | 2021-08-12 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'miami' into lcs | Sergeanur | 2021-08-11 | 1 | -4/+4 |
|\| | | | | | | | | | | | # Conflicts: # src/core/Radar.cpp # src/core/Radar.h | ||||
| * | Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls | Sergeanur | 2021-08-11 | 1 | -2/+2 |
| | | |||||
| * | Add sprite to the waypoint marker | Sergeanur | 2021-08-11 | 1 | -5/+57 |
| | | |||||
* | | Merge branch 'miami' into lcs | Nikolay Korolev | 2021-08-08 | 1 | -0/+7 |
|\| | |||||
| * | Sync fix from miami | Sergeanur | 2021-08-08 | 1 | -0/+7 |
| | | |||||
* | | merge | Nikolay Korolev | 2021-08-08 | 1 | -0/+1 |
|\| | |||||
| * | merge | Nikolay Korolev | 2021-08-08 | 1 | -0/+1 |
| |\ | |||||
| | * | Fix waypoint disappearing after each save | Sergeanur | 2021-08-02 | 1 | -0/+12 |
| | | | |||||
| | * | Properly fix blip rendering during scripted sequences | Davi | 2021-07-22 | 1 | -3/+15 |
| | | | | | | | | | | | | Changes conditionals from "DrawBlips" and "ShowRadarTrace", "ShowRadarTraceWithHeight" to allow blips to be rendered during scripted sequences when "MENU_MAP" is enabled. | ||||
| | * | Revert "Revert "Redo ReadSaveBuf + common.h cleanup"" | withmorten | 2021-06-26 | 1 | -1/+2 |
| | | | | | | | | | | | | This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f. | ||||
| | * | Revert "Redo ReadSaveBuf + common.h cleanup" | erorcun | 2021-06-25 | 1 | -2/+1 |
| | | | | | | | | | | | | This reverts commit 2b67aba94cb6448fb24c869559465eddf2bad069. | ||||
| | * | Redo ReadSaveBuf + common.h cleanup | Sergeanur | 2021-06-25 | 1 | -1/+2 |
| | | | |||||
| | * | Fix C3dMarkers::PlaceMarker calls in Radar | Sergeanur | 2021-06-24 | 1 | -4/+4 |
| | | | |||||
| | * | proper radar clipping | aap | 2021-02-28 | 1 | -73/+117 |
| | | | |||||
| | * | Revert "First batch of fixes (CallAndMessage)" | Filip Gawin | 2021-01-31 | 1 | -3/+0 |
| | | | | | | | | | | | | This reverts commit 7a3b80a9b7f414967fe59f89ab0fe5416735babe. | ||||
| | * | First batch of fixes (CallAndMessage) | Filip Gawin | 2021-01-31 | 1 | -0/+3 |
| | | | |||||
| | * | Some regular fixes and UB fixes | erorcun | 2021-01-29 | 1 | -1/+1 |
| | | | |||||
| | * | codewarrior: finishing touches | withmorten | 2021-01-21 | 1 | -1/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into cw | withmorten | 2021-01-21 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch 'master' of github.com:GTAmodding/re3 | aap | 2021-01-19 | 1 | -0/+3 |
| | | |\ | |||||
| | | * | | pc radar fix | aap | 2021-01-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | make building with Codewarrior 7 possible | withmorten | 2021-01-21 | 1 | -6/+6 |
| | | |/ | | |/| | |||||
| | * | | fix RWLIBS build without GTA_PS2_STUFF | withmorten | 2021-01-19 | 1 | -0/+3 |
| | |/ | |||||
| | * | Fixes and style changes from miami | erorcun | 2020-10-18 | 1 | -70/+30 |
| | | | |||||
| | * | silentpatch fixes | Nikolay Korolev | 2020-09-26 | 1 | -0/+12 |
| | | | |||||
| | * | New math wrappers | eray orçunus | 2020-07-22 | 1 | -3/+3 |
| | | | | | | | | | | | | from miami | ||||
| | * | Menu map fixes and resizable window on GLFW | eray orçunus | 2020-05-09 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'miami' into lcs | Sergeanur | 2021-06-28 | 1 | -15/+16 |
|\| | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script5.cpp # src/entities/Entity.cpp | ||||
| * | | Redo ReadSaveBuf + common.h cleanup | Sergeanur | 2021-06-28 | 1 | -15/+16 |
| | | | |||||
* | | | Merge remote-tracking branch 'GitHub/miami' into lcs | Sergeanur | 2021-06-24 | 1 | -2/+2 |
|\| | | |||||
| * | | High FPS Fixes | Sergeanur | 2021-06-24 | 1 | -2/+2 |
| | | | |||||
| * | | Fix C3dMarkers::PlaceMarker calls in Radar | Sergeanur | 2021-06-24 | 1 | -4/+4 |
| | | | |||||
* | | | Fix C3dMarkers::PlaceMarker calls in Radar | Sergeanur | 2021-06-24 | 1 | -4/+4 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-04-09 | 1 | -68/+113 |
|\| | | | | | | | | | | | | | | # Conflicts: # src/modelinfo/PedModelInfo.cpp | ||||
| * | | proper radar clipping | aap | 2021-02-28 | 1 | -68/+113 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-02-16 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # premake5.lua # src/animation/AnimManager.cpp # src/animation/AnimationId.h # src/audio/MusicManager.cpp # src/audio/audio_enums.h # src/control/Script7.cpp # src/core/FileLoader.cpp # src/core/re3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/postfx.cpp # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_PS.hlsl # src/extras/shaders/make_hlsl.cmd # src/extras/shaders/obj/colourfilterVC_PS.cso # src/extras/shaders/obj/colourfilterVC_PS.inc # src/extras/shaders/obj/colourfilterVC_frag.inc # src/peds/PedFight.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Particle.cpp # src/render/WaterCannon.cpp # src/skel/win/gtavc.ico # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt | ||||
| * | | Even more fixes & shorten quit screen | erorcun | 2021-01-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'miami' into lcs | Sergeanur | 2021-01-25 | 1 | -4/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h | ||||
| * | | make building with Codewarrior 7 possible | withmorten | 2021-01-24 | 1 | -4/+7 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-22 | 1 | -2/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/animation/CutsceneMgr.cpp # src/control/CarCtrl.cpp # src/control/Script.cpp # src/control/Script2.cpp # src/core/Frontend.cpp # src/core/main.cpp # src/entities/Physical.cpp # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/text/Messages.cpp # src/vehicles/Cranes.cpp # src/vehicles/Transmission.cpp | ||||
| * | | get rid of most --MIAMI comments | withmorten | 2021-01-22 | 1 | -2/+0 |
| | | | |||||
* | | | Load LCS radar blips | Sergeanur | 2021-01-22 | 1 | -22/+136 |
| | | | |||||
* | | | sync | Nikolay Korolev | 2021-01-20 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | Merge branch 'miami' into lcs | Sergeanur | 2021-01-20 | 1 | -1/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/control/Script4.cpp # src/render/Weather.cpp # src/render/Weather.h # src/vehicles/Automobile.cpp | ||||
| | * | | pc radar fix | aap | 2021-01-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | add the bad crack "features" behind SECUROM define | withmorten | 2021-01-14 | 1 | -0/+4 |
| | | | | |||||
* | | | | sync | Nikolay Korolev | 2021-01-17 | 1 | -0/+2 |
|/ / / | |||||
* / / | can finish first mission | Nikolay Korolev | 2021-01-09 | 1 | -0/+6 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/miami' into miami | Nikolay Korolev | 2020-10-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | Minor things | eray orçunus | 2020-10-18 | 1 | -1/+1 |
| | | | |||||
* | | | finished save/load | Nikolay Korolev | 2020-10-17 | 1 | -2/+2 |
|/ / | |||||
* | | Radar, WaterCannon, win/glfw skels | eray orçunus | 2020-10-17 | 1 | -284/+472 |
| | | |||||
* | | Pad, BulletInfo, ProjectileInfo, fixes | eray orçunus | 2020-10-07 | 1 | -56/+2 |
| | | |||||
* | | some SilentPatch fixes | shfil | 2020-09-30 | 1 | -0/+12 |
| | | | | | | | | | | | | # Conflicts: # src/core/Camera.cpp # src/weapons/Weapon.cpp | ||||
* | | Peds, Hud, CFO 1/2, fixes - including zone names | eray orçunus | 2020-07-22 | 1 | -3/+3 |
| | | |||||
* | | VC fighting, Peds, many fixes including ghost bikes | eray orçunus | 2020-07-09 | 1 | -1/+2 |
| | | |||||
* | | fixes from master, menu helper text | eray orçunus | 2020-07-04 | 1 | -25/+11 |
| | | |||||
* | | Merge pull request #574 from Xinerki/miami | erorcun | 2020-05-22 | 1 | -4/+4 |
|\ \ | | | | | | | many additions | ||||
| * | | approach separation differently | Xinerki | 2020-05-21 | 1 | -9/+4 |
| | | | |||||
| * | | blip marker colors, also isolate crgba | Xinerki | 2020-05-21 | 1 | -4/+9 |
| | | | |||||
* | | | VC CMenuManager struct, ctor etc. | eray orçunus | 2020-05-22 | 1 | -14/+14 |
|/ / | |||||
* | | radar sprites | aap | 2020-05-17 | 1 | -79/+154 |
| | | |||||
* | | Weapon fixes and thingies | eray orçunus | 2020-05-17 | 1 | -14/+4 |
| | | |||||
* | | garages + script | Nikolay Korolev | 2020-05-11 | 1 | -54/+76 |
| | | |||||
* | | Menu map fixes and resizable window on GLFW | eray orçunus | 2020-05-09 | 1 | -2/+2 |
|/ | |||||
* | fix for radar | aap | 2020-05-06 | 1 | -6/+14 |
| | |||||
* | SetPosition, final part | Sergeanur | 2020-05-05 | 1 | -6/+6 |
| | |||||
* | SetPosition, part 2 | Sergeanur | 2020-05-02 | 1 | -2/+2 |
| | |||||
* | Screen mode selector and persistent map target fix | eray orçunus | 2020-05-01 | 1 | -0/+7 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -49/+1 |
| | |||||
* | rem refs | Fire-Head | 2020-04-17 | 1 | -22/+22 |
| | |||||
* | Some refs removed, little fixes and teleport | eray orçunus | 2020-04-16 | 1 | -3/+5 |
| | |||||
* | CMenuManager done and CHud fixes | eray orçunus | 2020-04-11 | 1 | -4/+4 |
| | |||||
* | Merge remote-tracking branch 'Fire-Head/master' | Sergeanur | 2020-04-09 | 1 | -133/+138 |
|\ | | | | | | | | | # Conflicts: # src/core/Radar.cpp | ||||
| * | PS2 Cheats, restored R*names | Fire-Head | 2020-04-09 | 1 | -133/+138 |
| | | |||||
* | | fixed questionable RW usage; changed radar mask to PS2 techinque | aap | 2020-04-09 | 1 | -1502/+1499 |
|/ | |||||
* | Menu map | eray orçunus | 2020-04-07 | 1 | -48/+135 |
| | |||||
* | Frontend (last-3) | eray orçunus | 2020-04-04 | 1 | -4/+114 |
| | |||||
* | fixes | Sergeanur | 2020-04-02 | 1 | -1/+4 |
| | |||||
* | Wrappers cleanup | Sergeanur | 2020-03-29 | 1 | -174/+0 |
| | |||||
* | Merge branch 'master' into Radar2 | erorcun | 2020-03-17 | 1 | -1321/+1321 |
|\ | |||||
| * | Begin work on GenericSave | Wes Hampson | 2020-03-05 | 1 | -2/+2 |
| | | |||||
* | | Finished CRadar, a bit of CExplosion | Sergeanur | 2020-03-16 | 1 | -164/+238 |
|/ | |||||
* | some changes | Nikolay Korolev | 2020-02-23 | 1 | -4/+4 |
| | |||||
* | CPhone, CPlayerInfo, CFire, CWorld | eray orçunus | 2019-12-05 | 1 | -2/+2 |
| | |||||
* | CRadar::Initialise() + fixes | Sergeanur | 2019-10-30 | 1 | -13/+90 |
| | |||||
* | ControllerConfig done | Fire-Head | 2019-10-27 | 1 | -5/+5 |
| | | | | Fix Cam enum | ||||
* | Fixed player blip heading when looking left/right/behind | Sergeanur | 2019-10-06 | 1 | -0/+4 |
| | |||||
* | Triangular radar blips | Sergeanur | 2019-10-05 | 1 | -0/+72 |
| | |||||
* | Fix radar | eray orçunus | 2019-10-04 | 1 | -107/+241 |
| | |||||
* | RunningScript, part 4, plus some fixes | Nikolay Korolev | 2019-08-03 | 1 | -8/+8 |
| | |||||
* | and of course the last commit didnt fix everything | aap | 2019-07-10 | 1 | -2/+2 |
| | |||||
* | added wrappers around math functions | aap | 2019-07-10 | 1 | -10/+10 |
| | |||||
* | the great reorganization | aap | 2019-07-07 | 1 | -0/+1117 |