Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-22 | 1 | -3/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 |
| | | |||||
| * | m_nWantedLevel -> GetWantedLevel() | withmorten | 2021-01-22 | 1 | -1/+1 |
| | | |||||
* | | sync | Nikolay Korolev | 2021-01-20 | 1 | -4/+8 |
|\ \ | |||||
| * | | Merge branch 'miami' into lcs | Sergeanur | 2021-01-20 | 1 | -4/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.cpp # src/control/Script4.cpp # src/render/Weather.cpp # src/render/Weather.h # src/vehicles/Automobile.cpp | ||||
| | * | Get rid of bitfields in CPool | Sergeanur | 2021-01-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | # Conflicts: # src/core/templates.h | ||||
| | * | add the bad crack "features" behind SECUROM define | withmorten | 2021-01-14 | 1 | -0/+4 |
| | | | |||||
* | | | sync | Nikolay Korolev | 2021-01-18 | 1 | -35/+128 |
|/ / | |||||
* / | more script | Nikolay Korolev | 2021-01-09 | 1 | -3/+3 |
|/ | |||||
* | Fix garage messages position | Sergeanur | 2021-01-07 | 1 | -5/+1 |
| | |||||
* | CVarConsole | Sergeanur | 2021-01-02 | 1 | -0/+8 |
| | |||||
* | merge master to miami | Nikolay Korolev | 2021-01-01 | 1 | -1/+5 |
|\ | |||||
| * | Small type use fixes | Sergeanur | 2020-12-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/GTAmodding/re3 | Fire-Head | 2020-12-19 | 1 | -6/+4 |
| |\ | |||||
| * \ | Merge branch 'master' of https://github.com/GTAmodding/re3 | Fire-Head | 2020-12-07 | 1 | -101/+115 |
| |\ \ | |||||
| * | | | ps2 hud, restore original code | Fire-Head | 2020-12-07 | 1 | -6/+32 |
| | | | | |||||
* | | | | fixed some bugs (saves might be broken though) | Nikolay Korolev | 2020-12-31 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/miami' into miami | Nikolay Korolev | 2020-12-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Small type use fixes | Sergeanur | 2020-12-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/control/Garages.cpp # src/vehicles/Cranes.cpp | ||||
* | | | | | fix garage | Nikolay Korolev | 2020-12-25 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | merge attempt | Nikolay Korolev | 2020-12-19 | 1 | -30/+28 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | removed obsolete ifdef (since we have GTA_REPLAY) | Nikolay Korolev | 2020-12-12 | 1 | -2/+0 |
| | | | | |||||
| * | | | int8 enums fixed | withmorten | 2020-12-07 | 1 | -4/+4 |
| | |/ | |/| | |||||
| * | | fixed parenthesis | Nikolay | 2020-12-06 | 1 | -2/+2 |
| | | | |||||
| * | | small garages revision + small template stuff | Nikolay Korolev | 2020-11-30 | 1 | -88/+102 |
| | | | |||||
| * | | fix garages | Nikolay Korolev | 2020-11-27 | 1 | -5/+5 |
| | | | |||||
| * | | Font: Hud: Use orig. text dimensions, fix right-align calculations | erorcun | 2020-11-09 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Font: Fix text dimensions" | erorcun | 2020-11-08 | 1 | -1/+1 |
| |/ | | | | | | | This reverts commit 6729de49b16da9a1be3c95b146ba053bf214c91c. | ||||
| * | Font: Fix text dimensions | erorcun | 2020-10-25 | 1 | -1/+1 |
| | | |||||
| * | Fix some sanitizer errors, improve POSIX streamer | eray orçunus | 2020-10-04 | 1 | -1/+1 |
| | | |||||
| * | silentpatch fixes | Nikolay Korolev | 2020-09-26 | 1 | -0/+6 |
| | | |||||
* | | fixed garages + minor fixes | Nikolay Korolev | 2020-12-12 | 1 | -3/+35 |
| | | |||||
* | | Merge pull request #869 from Nick007J/miami | aap | 2020-12-09 | 1 | -138/+202 |
|\ \ | | | | | | | garages revision + fixes | ||||
| * | | quick fix | Nikolay Korolev | 2020-12-06 | 1 | -1/+2 |
| | | | |||||
| * | | garages revision + some fixes | Nikolay Korolev | 2020-12-06 | 1 | -140/+201 |
| | | | |||||
* | | | Merge pull request #872 from withmorten/sized-enums-miami | erorcun | 2020-12-09 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Get rid of sized enums 2: Electric Boogaloo | ||||
| * | | | int8 enums fixed | withmorten | 2020-12-07 | 1 | -3/+3 |
| |/ / | |||||
* | | | Pool fixes from master | Sergeanur | 2020-12-08 | 1 | -2/+2 |
| | | | |||||
* | | | Fixes | Sergeanur | 2020-12-08 | 1 | -2/+0 |
|/ / | |||||
* | | Font: Hud: Use orig. text dimensions, fix right-align calculations | erorcun | 2020-11-08 | 1 | -1/+1 |
| | | |||||
* | | small fix | Nikolay Korolev | 2020-10-11 | 1 | -4/+4 |
| | | |||||
* | | Control updates | Nikolay Korolev | 2020-10-11 | 1 | -6/+6 |
| | | |||||
* | | Fix some sanitizer errors, improve POSIX streamer | eray orçunus | 2020-10-08 | 1 | -1/+1 |
| | | |||||
* | | some SilentPatch fixes | shfil | 2020-09-30 | 1 | -0/+6 |
| | | | | | | | | | | | | # Conflicts: # src/core/Camera.cpp # src/weapons/Weapon.cpp | ||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-08-19 | 1 | -2/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside | Jack Powell | 2020-08-18 | 1 | -1/+1 |
| | | |||||
| * | fixed bugfix | Nikolay Korolev | 2020-08-18 | 1 | -1/+2 |
| | | |||||
| * | 90% fixes, 10% skel refactoring | eray orçunus | 2020-07-24 | 1 | -0/+3 |
| | | |||||
| * | Bettah car enter canceling, fix CFO crash, ped objs. renaming | eray orçunus | 2020-07-03 | 1 | -1/+1 |
| | | |||||
| * | Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes | eray orçunus | 2020-07-02 | 1 | -1/+1 |
| | | |||||
| * | Revert "FONT_BANK renamed to FONT_STANDARD" | Fire-Head | 2020-06-07 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 552205dfbaea70628df56a4966d269a81a97d28e. | ||||
* | | 90% fixes, 10% skel refactoring | eray orçunus | 2020-07-24 | 1 | -0/+3 |
| | | |||||
* | | Noskillx's PR + fix .set loading | eray orçunus | 2020-07-06 | 1 | -0/+1 |
| | | |||||
* | | fixes from master, menu helper text | eray orçunus | 2020-07-04 | 1 | -1/+1 |
| | | |||||
* | | ice cream attractor + bike respray | Nikolay Korolev | 2020-07-03 | 1 | -2/+2 |
| | | |||||
* | | CWanted, anim fix, ped objs renaming, remove III beta features | eray orçunus | 2020-06-22 | 1 | -1/+1 |
| | | |||||
* | | bikes in garages + bugfix | Nikolay Korolev | 2020-06-17 | 1 | -2/+9 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-06-07 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | # 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_STANDARD | Sergeanur | 2020-06-07 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-05-26 | 1 | -1/+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 | ||||
| * | fixed NE bug | Nikolay Korolev | 2020-05-25 | 1 | -1/+8 |
| | | |||||
* | | how did saving even work in original III? | Nikolay Korolev | 2020-05-24 | 1 | -18/+6 |
| | | |||||
* | | full script basic support | Nikolay Korolev | 2020-05-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-12 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | # 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 warnings | Filip Gawin | 2020-05-12 | 1 | -0/+7 |
| | | |||||
| * | garages fix | Nikolay Korolev | 2020-05-12 | 1 | -2/+2 |
| | | |||||
| * | fix garages | Nikolay Korolev | 2020-05-12 | 1 | -1/+1 |
| | | |||||
* | | fix garages | Nikolay Korolev | 2020-05-12 | 1 | -15/+17 |
| | | |||||
* | | fix garages | Nikolay Korolev | 2020-05-12 | 1 | -1/+1 |
| | | |||||
* | | garages + script | Nikolay Korolev | 2020-05-11 | 1 | -467/+338 |
| | | |||||
* | | some changes | Nikolay Korolev | 2020-05-11 | 1 | -6/+24 |
| | | |||||
* | | some updates for script | Nikolay Korolev | 2020-05-10 | 1 | -17/+8 |
| | | |||||
* | | VC vehicles just barely working now | aap | 2020-05-07 | 1 | -8/+3 |
| | | |||||
* | | getting the vice city map to work | aap | 2020-05-05 | 1 | -4/+1 |
|/ | |||||
* | Switching pad modes and cheats when player is switching between controller and kb&m | Sergeanur | 2020-05-02 | 1 | -2/+7 |
| | |||||
* | SetPosition, part 2 | Sergeanur | 2020-05-02 | 1 | -18/+18 |
| | |||||
* | SetPosition, part 1 | Sergeanur | 2020-05-02 | 1 | -2/+2 |
| | |||||
* | Adding getters and setters for type and status | Sergeanur | 2020-04-30 | 1 | -4/+4 |
| | |||||
* | Fixes | Sergeanur | 2020-04-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into MoreLanguages | Sergeanur | 2020-04-26 | 1 | -72/+70 |
|\ | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -38/+38 |
| | | |||||
| * | Remove patches | Sergeanur | 2020-04-17 | 1 | -8/+1 |
| | | |||||
| * | Some refs removed, little fixes and teleport | eray orçunus | 2020-04-16 | 1 | -22/+23 |
| | | |||||
| * | Merge pull request #440 from Fire-Head/master | Nikolay Korolev | 2020-04-15 | 1 | -1/+1 |
| |\ | | | | | | | CWeapon done, fixes | ||||
| | * | CWeapon done, ps2 cheats fix | Fire-Head | 2020-04-15 | 1 | -1/+1 |
| | | | |||||
| * | | Many fixes and cleanup | eray orçunus | 2020-04-15 | 1 | -3/+7 |
| | | | |||||
* | | | Merge branch 'master' into MoreLanguages | Sergeanur | 2020-04-14 | 1 | -20/+29 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | | fix garages | Nikolay Korolev | 2020-04-13 | 1 | -1/+1 |
| |/ | |||||
| * | bug fix | Nikolay Korolev | 2020-04-08 | 1 | -2/+2 |
| | | |||||
| * | stats fix | Nikolay Korolev | 2020-04-06 | 1 | -1/+1 |
| | | |||||
| * | Cranes done | Nikolay Korolev | 2020-04-06 | 1 | -16/+25 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into MoreLanguages | Sergeanur | 2020-04-05 | 1 | -2/+3 |
|\| | |||||
| * | shoreside garage fix | Nikolay Korolev | 2020-04-05 | 1 | -2/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into MoreLanguages | Sergeanur | 2020-04-05 | 1 | -7/+5 |
|\| | |||||
| * | vehicles missing functions + fixes | Nikolay Korolev | 2020-04-01 | 1 | -7/+5 |
| | | |||||
* | | Japanese | Sergeanur | 2020-04-05 | 1 | -1/+1 |
|/ | |||||
* | review fixes | Nikolay Korolev | 2020-03-31 | 1 | -116/+64 |
| | |||||
* | fix | Nikolay Korolev | 2020-03-31 | 1 | -1/+1 |
| | |||||
* | added forgotten function | Nikolay Korolev | 2020-03-30 | 1 | -1/+4 |
| | |||||
* | bug fixes, reorganisation | Nikolay Korolev | 2020-03-30 | 1 | -14/+14 |
| | |||||
* | finished garages | Nikolay Korolev | 2020-03-30 | 1 | -41/+543 |
| | |||||
* | more garages | Nikolay Korolev | 2020-03-29 | 1 | -115/+603 |
| | |||||
* | fixes | Nikolay Korolev | 2020-03-28 | 1 | -40/+36 |
| | |||||
* | fixes | Nikolay Korolev | 2020-03-28 | 1 | -74/+131 |
| | |||||
* | garage update part 2 | Nikolay Korolev | 2020-03-28 | 1 | -119/+624 |
| | |||||
* | garages part 1 | Nikolay Korolev | 2020-03-28 | 1 | -18/+682 |
| | |||||
* | ProcessButtonPresses and fixes | eray orçunus | 2020-03-21 | 1 | -2/+2 |
| | |||||
* | Add Load/Save functions | Wes Hampson | 2020-03-11 | 1 | -0/+2 |
| | |||||
* | script 1000-1154 | Nikolay Korolev | 2020-02-16 | 1 | -0/+1 |
| | |||||
* | sync with upstream | Nikolay Korolev | 2020-02-15 | 1 | -1/+1 |
|\ | |||||
| * | Some fixes and some cosmetic things | eray orçunus | 2020-02-02 | 1 | -2/+2 |
| | | |||||
* | | script 900-999 | Nikolay Korolev | 2020-02-15 | 1 | -2/+31 |
|/ | |||||
* | script 800-899 | Nikolay Korolev | 2020-01-03 | 1 | -1/+24 |
| | |||||
* | some not fully tested stuff | Nikolay Korolev | 2020-01-01 | 1 | -0/+1 |
| | |||||
* | script 600-699 | Nikolay Korolev | 2019-10-27 | 1 | -0/+9 |
| | |||||
* | merge | Nikolay Korolev | 2019-10-26 | 1 | -1/+4 |
|\ | |||||
| * | CGame::Process() && CGame::ReloadIPLs | nmzik | 2019-10-19 | 1 | -1/+4 |
| | | |||||
* | | script 500-599 plus bugfix | Nikolay Korolev | 2019-10-21 | 1 | -0/+3 |
|/ | |||||
* | Full CGameLogic | Sergeanur | 2019-10-08 | 1 | -0/+1 |
| | |||||
* | CGarages::PrintMessages drawing fixes | Sergeanur | 2019-10-06 | 1 | -11/+11 |
| | |||||
* | Peds, a fix and a tad of VC | eray orçunus | 2019-09-17 | 1 | -1/+2 |
| | |||||
* | More more more audio | Filip Gawin | 2019-08-27 | 1 | -3/+3 |
| | |||||
* | more CCarCtrl | Nikolay Korolev | 2019-08-11 | 1 | -0/+1 |
| | |||||
* | cargen + some script | Nikolay Korolev | 2019-07-27 | 1 | -0/+5 |
| | |||||
* | renamed some variables and added files; more CAutomobile::ProcessControl | aap | 2019-07-17 | 1 | -0/+2 |
| | |||||
* | Initial commit for Frontend. | _AG | 2019-06-25 | 1 | -7/+7 |
| | | | | | | Bug fixes: fix #40, fix #39, fix #38, fix #37, fix #21. Code organization and cleanup... | ||||
* | Code clean up. | _AG | 2019-06-20 | 1 | -3/+5 |
| | |||||
* | Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h. | _AG | 2019-06-20 | 1 | -8/+8 |
| | |||||
* | first part of CFileLoader | aap | 2019-06-17 | 1 | -0/+1 |
| | |||||
* | Update HUD stuff, bug and format fixes. | _AG | 2019-06-17 | 1 | -1/+63 |
| | | | | | Added environment variables to premake5.lua. Update README.md | ||||
* | implemented some higher level functions; added lots of stubs; switched top and bottom in CRect | aap | 2019-05-30 | 1 | -0/+44 |