Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'miami' into lcs | Sergeanur | 2021-01-25 | 1 | -1/+11 |
|\ | | | | | | | | | | | | | | | | | # 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 | -1/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-23 | 1 | -1/+16 |
|\| | | | | | | | | | # Conflicts: # src/core/re3.cpp | ||||
| * | No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux | erorcun | 2021-01-23 | 1 | -2/+12 |
| | | |||||
| * | Store all settings in .INI | erorcun | 2021-01-23 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-23 | 1 | -11/+8 |
|\| | | | | | | | | | # Conflicts: # src/modelinfo/BaseModelInfo.cpp | ||||
| * | Includes overhaul, fix some compiler warnings | erorcun | 2021-01-23 | 1 | -11/+8 |
| | | |||||
* | | 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 |
| | | |||||
* | | loadscreens, not accurate | aap | 2021-01-22 | 1 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-21 | 1 | -0/+4 |
|\| | | | | | | | | | # Conflicts: # vendor/librw | ||||
| * | enable screenshots for librw; update librw | aap | 2021-01-21 | 1 | -0/+4 |
| | | |||||
| * | Revert extra checks before autolinking | Filip Gawin | 2021-01-14 | 1 | -2/+0 |
| | | |||||
| * | RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK | Filip Gawin | 2021-01-14 | 1 | -1/+1 |
| | | |||||
| * | More checks before autolinking | Filip Gawin | 2021-01-14 | 1 | -0/+2 |
| | | |||||
* | | PC controls and icon | Sergeanur | 2021-01-08 | 3 | -1/+1 |
|/ | |||||
* | merge attempt | Nikolay Korolev | 2020-12-19 | 1 | -0/+9 |
|\ | |||||
| * | AnimViewer fixes, commentary from miami | erorcun | 2020-12-09 | 1 | -31/+22 |
| | | |||||
| * | Merge pull request #846 from withmorten/ini | erorcun | 2020-12-01 | 1 | -8/+10 |
| |\ | | | | | | | add -console cmdline arg instead of #if 0/1 | ||||
| | * | add -console cmdline arg instead of #if 0/1 | withmorten | 2020-11-28 | 1 | -8/+10 |
| | | | |||||
| * | | GTA_VERSION define and some config.h cleanup | aap | 2020-11-29 | 1 | -2/+2 |
| | | | |||||
| * | | moved some stuff to MemoryMgr | aap | 2020-11-28 | 1 | -1/+1 |
| |/ | |||||
| * | memory heap starting to work | aap | 2020-11-25 | 1 | -1/+10 |
| | | |||||
| * | Fixes and style changes from miami | erorcun | 2020-10-18 | 1 | -3/+15 |
| | | |||||
* | | AnimViewer done, comment cleanup | erorcun | 2020-12-03 | 1 | -30/+20 |
| | | |||||
* | | add -console cmdline arg instead of #if 0/1 | withmorten | 2020-12-01 | 1 | -5/+9 |
| | | | | | | | | | | | | # Conflicts: # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp | ||||
* | | Minor things | eray orçunus | 2020-10-18 | 1 | -0/+1 |
| | | |||||
* | | Radar, WaterCannon, win/glfw skels | eray orçunus | 2020-10-17 | 2 | -17/+21 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-10-11 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # gamefiles/TEXT/american.gxt # premake5.lua # src/audio/MusicManager.cpp # src/control/Darkel.cpp # src/control/Script.cpp # src/core/FileLoader.cpp # src/core/Frontend.cpp # src/core/Game.cpp # src/core/Streaming.cpp # src/core/config.h # src/core/re3.cpp # src/extras/frontendoption.cpp # src/extras/frontendoption.h # src/render/Hud.cpp # src/skel/glfw/glfw.cpp # src/vehicles/CarGen.cpp # src/vehicles/Vehicle.cpp # src/weapons/WeaponInfo.cpp # utils/gxt/american.txt | ||||
| * | Load and write our settings in re3.ini & fixes | eray orçunus | 2020-10-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami | eray orçunus | 2020-09-30 | 1 | -1/+16 |
|\ \ | |||||
| * | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-09-30 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/audio/AudioLogic.cpp # src/audio/AudioManager.h # src/audio/MusicManager.cpp # src/audio/sampman.h # src/audio/sampman_oal.cpp # src/control/CarCtrl.cpp # src/control/Replay.cpp # src/control/Script.cpp # src/core/Camera.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/config.h # src/core/main.cpp # src/core/re3.cpp # src/math/Matrix.cpp # src/math/Matrix.h # src/math/Vector2D.h # src/peds/Ped.cpp # src/render/Credits.cpp # src/render/Hud.cpp # src/render/Skidmarks.cpp # src/weapons/Weapon.cpp | ||||
| | * | Fixes: PS2/PS2-like menu, Hud, new sliding text found | eray orçunus | 2020-09-27 | 1 | -0/+4 |
| | | | |||||
| | * | silentpatch fixes | Nikolay Korolev | 2020-09-26 | 1 | -1/+16 |
| | | | |||||
| * | | some SilentPatch fixes | shfil | 2020-09-30 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Camera.cpp # src/weapons/Weapon.cpp | ||||
* | | | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes | eray orçunus | 2020-09-30 | 1 | -1/+5 |
|/ / | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-08-19 | 1 | -1/+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 | ||||
| * | Graphics menu + MSAA | Sergeanur | 2020-08-16 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-08-15 | 1 | -0/+17 |
|\| | | | | | | | | | | | # Conflicts: # src/control/Darkel.cpp # src/core/main.cpp | ||||
| * | Original screen grabber | Sergeanur | 2020-08-14 | 1 | -0/+17 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-08-10 | 1 | -1/+8 |
|\| | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/render/Coronas.cpp # src/render/Timecycle.cpp # src/render/Timecycle.h | ||||
| * | don't CoUninitialize for NO_MOVIES | withmorten | 2020-08-08 | 1 | -5/+4 |
| | | |||||
| * | remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't check return value for CoInitialize | withmorten | 2020-08-07 | 1 | -2/+10 |
| | | |||||
* | | Fixes after merge | Sergeanur | 2020-07-29 | 1 | -28/+0 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-07-29 | 1 | -0/+28 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | Fix/change some Windows define | eray orçunus | 2020-07-25 | 2 | -31/+28 |
| | | |||||
| * | 90% fixes, 10% skel refactoring | eray orçunus | 2020-07-24 | 1 | -23/+2 |
| | | |||||
| * | 64-bit on Windows | eray orçunus | 2020-07-22 | 2 | -11/+44 |
| | | |||||
* | | Fix/change some Windows define | eray orçunus | 2020-07-25 | 2 | -31/+27 |
| | | |||||
* | | 90% fixes, 10% skel refactoring | eray orçunus | 2020-07-24 | 2 | -25/+8 |
| | | |||||
* | | 64-bit on Windows | eray orçunus | 2020-07-24 | 2 | -11/+44 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-07-22 | 1 | -2/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | # 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 patcher | Sergeanur | 2020-07-22 | 1 | -2/+0 |
| | | |||||
* | | Peds, Hud, CFO 1/2, fixes - including zone names | eray orçunus | 2020-07-22 | 2 | -5/+22 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-07-17 | 1 | -0/+5 |
|\| | | | | | | | | | # Conflicts: # src/render/Credits.cpp | ||||
| * | Add fix/workaround for black screen at startup | Sergeanur | 2020-07-17 | 1 | -0/+5 |
| | | |||||
| * | Remove console and fix sth | eray orçunus | 2020-07-04 | 1 | -1/+2 |
| | | |||||
| * | Re-enable console for debugging frontend | eray orçunus | 2020-07-03 | 1 | -2/+1 |
| | | |||||
* | | Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes | eray orçunus | 2020-07-06 | 1 | -2/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-29 | 1 | -17/+165 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | ||||
| * | update glfw.cpp | Fire-Head | 2020-06-29 | 1 | -0/+2 |
| | | |||||
| * | menu fixes | Fire-Head | 2020-06-29 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'master' into ps2menu | Fire_Head | 2020-06-29 | 1 | -4/+4 |
| |\ | |||||
| | * | skeleton typos | aap | 2020-05-23 | 1 | -4/+4 |
| | | | |||||
| * | | mips overdose | Fire-Head | 2020-06-27 | 1 | -20/+165 |
| |/ | |||||
* | | skeleton typos | aap | 2020-05-23 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #574 from Xinerki/miami | erorcun | 2020-05-22 | 1 | -0/+10 |
|\ \ | | | | | | | many additions | ||||
| * | | focus loss improvement | Xinerki | 2020-05-21 | 1 | -2/+5 |
| | | | | | | | | | | | | for u aap | ||||
| * | | scuffed InitAfterFocusLoss implementation | Xinerki | 2020-05-21 | 1 | -0/+7 |
| | | | |||||
* | | | VC CMenuManager struct, ctor etc. | eray orçunus | 2020-05-22 | 1 | -14/+14 |
|/ / | |||||
* | | remove some unneeded plane paths for the moment; also different exe icon | aap | 2020-05-16 | 3 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-05-12 | 2 | -9/+8 |
|\| | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp | ||||
| * | Fix Windows build and premake | eray orçunus | 2020-05-11 | 1 | -8/+8 |
| | | |||||
| * | Linux build support | eray orçunus | 2020-05-11 | 1 | -1/+0 |
| | | |||||
| * | reverting fuckup | aap | 2020-05-06 | 1 | -0/+2 |
| | | |||||
| * | updated librw | aap | 2020-05-06 | 1 | -2/+0 |
| | | |||||
* | | most of animation system done; little stuff here and there | aap | 2020-05-08 | 1 | -0/+4 |
| | | |||||
* | | VC vehicles just barely working now | aap | 2020-05-07 | 1 | -2/+0 |
|/ | |||||
* | Screen mode selector and persistent map target fix | eray orçunus | 2020-05-01 | 1 | -29/+39 |
| | |||||
* | implemented improved video modes for win.cpp | aap | 2020-04-29 | 1 | -5/+108 |
| | |||||
* | Merge pull request #489 from Nick007J/master | Nikolay Korolev | 2020-04-26 | 1 | -2/+7 |
|\ | | | | | 1.1 patch stuff + flying controls | ||||
| * | Merge remote-tracking branch 'upstream/master' | Nikolay Korolev | 2020-04-25 | 1 | -0/+8 |
| |\ | |||||
| * | | more 1.1 patch | Nikolay Korolev | 2020-04-24 | 1 | -2/+7 |
| | | | |||||
* | | | Remove struct workaround in CControllerConfigManager | Sergeanur | 2020-04-26 | 1 | -1/+0 |
| | | | |||||
* | | | Initial GLFW support | eray orçunus | 2020-04-26 | 2 | -34/+8 |
| |/ |/| | |||||
* | | implemented skinned peds, no cutscene hands yet | aap | 2020-04-24 | 1 | -0/+8 |
|/ | |||||
* | Crossplatform work continues | eray orçunus | 2020-04-22 | 2 | -2/+13 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -60/+3 |
| | |||||
* | rem refs | Fire-Head | 2020-04-17 | 2 | -19/+13 |
| | |||||
* | Default native resolution mode and small camera fixes | Sergeanur | 2020-04-15 | 1 | -4/+25 |
| | |||||
* | (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode | Fire-Head | 2020-04-09 | 1 | -7/+7 |
| | |||||
* | CShotInfo, CWanted done, Frontend fix | eray orçunus | 2020-03-29 | 1 | -6/+0 |
| | |||||
* | Limit frontend FPS to 100 | eray orçunus | 2020-03-28 | 1 | -1/+7 |
| | |||||
* | WaterCannon done, resource ico | Fire-Head | 2020-03-28 | 2 | -1/+12 |
| | |||||
* | Fixes for Serge's review | Filip Gawin | 2020-03-22 | 1 | -2/+2 |
| | |||||
* | cMusicManager | Sergeanur | 2020-02-07 | 1 | -1/+1 |
| | |||||
* | Implemented faststrcmp, faststricmp, strcasecmp | Sergeanur | 2019-10-30 | 1 | -0/+7 |
| | |||||
* | Small CPad fixes | Sergeanur | 2019-10-29 | 1 | -6/+6 |
| | |||||
* | Merge branch 'master' into master | Fire_Head | 2019-10-27 | 2 | -35/+44 |
|\ | |||||
| * | ControllerConfig done | Fire-Head | 2019-10-27 | 2 | -35/+44 |
| | | | | | | | | Fix Cam enum | ||||
* | | Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode | Sergeanur | 2019-10-26 | 2 | -2/+3 |
|/ | |||||
* | More more more audio | Filip Gawin | 2019-08-27 | 1 | -1/+1 |
| | |||||
* | AnimViewer! | eray orçunus | 2019-08-15 | 2 | -11/+36 |
| | |||||
* | Merge branch 'master' of github.com:Fire-Head/re3 | Fire-Head | 2019-08-02 | 1 | -30/+41 |
|\ | |||||
| * | fixed dinput | aap | 2019-07-25 | 1 | -30/+41 |
| | | |||||
* | | sampman done | Fire-Head | 2019-08-02 | 1 | -0/+0 |
|/ | |||||
* | premake and appveyor update | ThirteenAG | 2019-07-20 | 1 | -4/+4 |
| | |||||
* | and of course the last commit didnt fix everything | aap | 2019-07-10 | 1 | -1/+1 |
| | |||||
* | added wrappers around math functions | aap | 2019-07-10 | 1 | -5/+5 |
| | |||||
* | Update Frontend. | _AG | 2019-07-03 | 1 | -0/+4 |
| | |||||
* | cleaned up to be closer to original game | aap | 2019-07-03 | 2 | -29/+17 |
| | |||||
* | Revert "Implemented frontend inputs." | aap | 2019-07-02 | 2 | -12/+4 |
| | |||||
* | Implemented frontend inputs. | _AG | 2019-07-02 | 2 | -4/+12 |
| | | | | Fixed #66 and few other stuff. | ||||
* | Cleanup project a bit | Filip Gawin | 2019-06-30 | 1 | -94/+94 |
| | |||||
* | misc stuff, mostly collision | aap | 2019-06-28 | 1 | -9/+2 |
| | |||||
* | Initial commit for Frontend. | _AG | 2019-06-25 | 2 | -2/+6 |
| | | | | | | Bug fixes: fix #40, fix #39, fix #38, fix #37, fix #21. Code organization and cleanup... | ||||
* | first part of CFileLoader | aap | 2019-06-17 | 1 | -0/+1 |
| | |||||
* | got rid of upper case types | aap | 2019-06-17 | 1 | -23/+23 |
| | |||||
* | Merge branch 'master' into master | Fire_Head | 2019-06-13 | 1 | -0/+7 |
|\ | |||||
| * | fixed CFileMgr somewhat; still issues when loading saves | aap | 2019-06-13 | 1 | -0/+7 |
| | | |||||
* | | CPad done | Fire-Head | 2019-06-13 | 1 | -2/+2 |
|/ | |||||
* | tmp | Fire-Head | 2019-06-11 | 2 | -175/+173 |
| | |||||
* | VK_LEFT fix | Fire-Head | 2019-06-05 | 1 | -0/+1 |
| | |||||
* | win.cpp/skeleton.cpp done | Fire-Head | 2019-06-05 | 1 | -34/+34 |
| | |||||
* | input done, fixed cheats input | Fire-Head | 2019-06-05 | 1 | -29/+864 |
| | |||||
* | added NO_MOVIES | Fire-Head | 2019-06-03 | 1 | -0/+11 |
| | |||||
* | gamestates fixed, mpeg now working | Fire-Head | 2019-06-02 | 1 | -43/+147 |
| | |||||
* | mouse fixed | Fire-Head | 2019-06-02 | 1 | -3/+5 |
| | |||||
* | fixed merge | aap | 2019-06-02 | 1 | -2/+3 |
| | |||||
* | skeleton updated, windows specific stuff added | Fire-Head | 2019-06-02 | 4 | -0/+2255 |