summaryrefslogtreecommitdiffstats
path: root/src/skel (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-08-191-5/+1
|\ | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/audio/AudioLogic.cpp # src/audio/sampman_miles.cpp # src/audio/sampman_oal.cpp
| * Auto-detect X11 dependencyerorcun2021-08-161-5/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-08-165-13/+271
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # src/audio/AudioLogic.cpp # src/core/config.h # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt
| * Fix .ini fix for glfwerorcun2021-08-151-4/+6
| |
| * Fix premature .ini saving leading to missing bindingserorcun2021-08-151-4/+6
| |
| * Nintendo Switch supportAdrian Graber2021-07-134-5/+259
| |
* | fixNikolay Korolev2021-07-271-1/+1
| |
* | low effort save supportNikolay Korolev2021-07-251-1/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-07-122-0/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # src/audio/AudioManager.h # src/control/Garages.cpp # src/control/Garages.h # src/control/Script5.cpp # src/core/config.h # utils/gxt/american.txt # utils/gxt/spanish.txt
| * finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVESwithmorten2021-07-102-0/+26
| |
* | Merge branch 'miami' into lcsSergeanur2021-07-081-0/+1
|\| | | | | | | | | | | # Conflicts: # README.md # premake5.lua
| * fix: add missing limits.h includes to enable bulding on musl.mssx862021-07-051-0/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-07-032-3/+3
|\| | | | | | | | | # Conflicts: # premake5.lua
| * smol fix 2withmorten2021-07-032-2/+2
| |
| * smol fixwithmorten2021-07-031-1/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-06-301-1/+1
|\| | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp
| * Fix MP3 finding stack crasherorcun2021-06-281-1/+1
| |
* | Merge branch 'miami' into lcsSergeanur2021-02-262-12/+316
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # premake5.lua # src/audio/MusicManager.cpp # src/core/main.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/render/Font.cpp
| * Fix stack corruption in HandleGraphEventHaydn Trigg2021-02-211-3/+3
| |
| * Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamierorcun2021-02-191-3/+9
| |\
| | * add NoMovies ini option, rename gDrawVersionText, always save ini after loadingwithmorten2021-02-181-3/+9
| | |
| * | Get keyboard input from X11 on Linuxerorcun2021-02-181-6/+304
| |/
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-161-1/+6
|\| | | | | | | | | | | | | | | * origin/miami: Fix FindClose->closedir Only include sys/syscall.h when __linux__ is defined Add unnamed semaphore define toggle for CdStreamPosix Fix rare stream deadlock on Windows
| * Fix FindClose->closedirerorcun2021-02-161-1/+6
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-164-13/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Revert "always console for windows Debug builds"withmorten2021-02-152-4/+0
| | | | | | | | This reverts commit a76c962aa348479ddb5a4d30472183239ddb9285.
| * always console for windows Debug buildswithmorten2021-02-152-0/+4
| |
| * glfw window iconwithmorten2021-02-131-0/+14
| |
| * new iconaap2021-02-131-0/+0
| |
| * enable screenshots with F12aap2021-02-122-0/+2
| |
| * Detect joystick menu for XInputerorcun2021-02-073-5/+9
| |
| * Fix some UBserorcun2021-01-281-4/+4
| |
| * Attempt to fix input delays on GLFWerorcun2021-01-271-2/+1
| |
| * Clean up POSIX streaming codeerorcun2021-01-271-2/+5
| |
* | Merge branch 'miami' into lcsSergeanur2021-01-253-13/+36
|\| | | | | | | | | | | | | | | | | # Conflicts: # src/control/Script.h # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/rw/VisibilityPlugins.cpp # src/rw/VisibilityPlugins.h
| * Support pads without L2-R2, add commentserorcun2021-01-251-11/+20
| |
| * make building with Codewarrior 7 possiblewithmorten2021-01-242-2/+16
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-232-1/+37
|\| | | | | | | | | # Conflicts: # src/core/re3.cpp
| * No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linuxerorcun2021-01-232-3/+29
| |
| * Store all settings in .INIerorcun2021-01-232-0/+10
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-232-38/+26
|\| | | | | | | | | # Conflicts: # src/modelinfo/BaseModelInfo.cpp
| * Includes overhaul, fix some compiler warningserorcun2021-01-232-38/+26
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-224-8/+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 commentswithmorten2021-01-224-8/+0
| |
* | loadscreens, not accurateaap2021-01-222-8/+8
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-212-0/+8
|\| | | | | | | | | # Conflicts: # vendor/librw
| * enable screenshots for librw; update librwaap2021-01-212-0/+8
| |
| * Revert extra checks before autolinkingFilip Gawin2021-01-142-3/+1
| |
| * RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINKFilip Gawin2021-01-142-2/+2
| |
| * More checks before autolinkingFilip Gawin2021-01-142-1/+3
| |
* | Change window nameSergeanur2021-01-091-1/+1
| |
* | PC controls and iconSergeanur2021-01-083-1/+1
|/
* some PS2 thingsaap2020-12-201-4/+0
|
* merge attemptNikolay Korolev2020-12-193-0/+23
|\
| * Fix language initialization call ordererorcun2020-12-141-3/+3
| |
| * AnimViewer fixes, commentary from miamierorcun2020-12-095-78/+52
| |
| * Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by defaulterorcun2020-12-091-3/+30
| |
| * Merge pull request #846 from withmorten/inierorcun2020-12-012-14/+18
| |\ | | | | | | add -console cmdline arg instead of #if 0/1
| | * add -console cmdline arg instead of #if 0/1withmorten2020-11-282-14/+18
| | |
| * | GTA_VERSION define and some config.h cleanupaap2020-11-292-4/+4
| | |
| * | Merge pull request #841 from aap/masteraap2020-11-283-2/+7
| |\ \ | | |/ | |/| start using CMemoryHeap; also some PS2 define cleanup
| | * moved some stuff to MemoryMgraap2020-11-282-2/+2
| | |
| | * start using CMemoryHeapaap2020-11-261-0/+5
| | |
| * | Add multisampling to librwSergeanur2020-11-281-1/+4
| |/
| * memory heap starting to workaap2020-11-252-1/+19
| |
| * Fix mouse lock/high-dpi 2erorcun2020-11-161-6/+0
| |
| * Fix mouse lock/high-dpierorcun2020-11-161-7/+13
| |
| * Merge pull request #723 from myfreeweb/mastererorcun2020-11-161-4/+11
| |\ | | | | | | Fixes for Wayland (HiDPI and mouse lock) support, FreeBSD
| | * Use CLOCK_MONOTONIC_FAST when available (FreeBSD)Greg V2020-09-281-1/+3
| | | | | | | | | | | | CLOCK_MONOTONIC_FAST is the equivalent of Linux's CLOCK_MONOTONIC_RAW.
| | * Use GLFW_CURSOR_DISABLED (glfw's native mouse restriction)Greg V2020-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | On Wayland, clients cannot move the mouse pointer. Mouse constraints, as required for 3D camera movement, are an explicit specific thing, and glfw supports it with GLFW_CURSOR_DISABLED. Use DISABLED, unless we're in a menu in windowed mode, where HIDDEN is still appropriate.
| | * glfw: scale cursor position by the ratio of framebuffer to screen sizeGreg V2020-09-281-2/+5
| | | | | | | | | | | | This fixes the mouse being constrained to the top left quarter of the window on Wayland HiDPI setups.
| | * Use glfwSetFramebufferSizeCallback instead of glfwSetWindowSizeCallbackGreg V2020-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Framebuffer size is scaled by the display scale. This fixes the game being shrunk to the bottom left quarter of the window on Wayland HiDPI setups. Corresponding change in librw: glfwGetWindowSize -> glfwGetFramebufferSize.
| * | mr.casepath 2erorcun2020-10-231-21/+16
| | |
| * | mr.casepatherorcun2020-10-231-6/+7
| | |
| * | Text and cross-platform fixerorcun2020-10-211-18/+23
| | |
| * | Fixes and style changes from miamierorcun2020-10-182-9/+24
| | |
| * | Fix management issueeray orçunus2020-10-171-1/+2
| | |
| * | Streaming and cross-platform fixeseray orçunus2020-10-121-5/+20
| | |
* | | Fix language initialization call ordererorcun2020-12-141-3/+3
| | |
* | | Use SDL gamepad mapping in environment by @ZLau92, implement @Sergeanur 's idea to use PPSSPP's DB if available, disable DEV() messages by defaulterorcun2020-12-091-3/+30
| | |
* | | AnimViewer done, comment cleanuperorcun2020-12-035-78/+50
| | |
* | | Add multisampling to librwSergeanur2020-12-011-1/+4
| | | | | | | | | | | | | | | | | | # Conflicts: # src/core/config.h # vendor/librw
* | | add -console cmdline arg instead of #if 0/1withmorten2020-12-012-11/+17
| | | | | | | | | | | | | | | | | | # Conflicts: # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp
* | | Fix mouse lock/high-dpierorcun2020-11-181-10/+20
| | |
* | | Use CLOCK_MONOTONIC_FAST when available (FreeBSD)Greg V2020-11-181-1/+3
| | | | | | | | | | | | CLOCK_MONOTONIC_FAST is the equivalent of Linux's CLOCK_MONOTONIC_RAW.
* | | Use GLFW_CURSOR_DISABLED (glfw's native mouse restriction)Greg V2020-11-181-0/+2
| | | | | | | | | | | | | | | | | | | | | On Wayland, clients cannot move the mouse pointer. Mouse constraints, as required for 3D camera movement, are an explicit specific thing, and glfw supports it with GLFW_CURSOR_DISABLED. Use DISABLED, unless we're in a menu in windowed mode, where HIDDEN is still appropriate.
* | | glfw: scale cursor position by the ratio of framebuffer to screen sizeGreg V2020-11-181-2/+5
| | | | | | | | | | | | This fixes the mouse being constrained to the top left quarter of the window on Wayland HiDPI setups.
* | | Use glfwSetFramebufferSizeCallback instead of glfwSetWindowSizeCallbackGreg V2020-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Framebuffer size is scaled by the display scale. This fixes the game being shrunk to the bottom left quarter of the window on Wayland HiDPI setups. Corresponding change in librw: glfwGetWindowSize -> glfwGetFramebufferSize.
* | | Frontend: Stats, Map, Audio inputs, Radio selectorerorcun2020-11-172-0/+18
| | |
* | | satisfy mr.casepatherorcun2020-10-231-19/+15
| | |
* | | Cross-platform fix and a little style changeerorcun2020-10-211-22/+27
| | |
* | | Minor thingseray orçunus2020-10-182-0/+2
| | |
* | | Merge pull request #765 from erorcun/miamierorcun2020-10-173-32/+33
|\ \ \ | | | | | | | | Radar, WaterCannon, win/glfw skels
| * | | Radar, WaterCannon, win/glfw skelseray orçunus2020-10-173-32/+33
| | | |
* | | | Fix management issueeray orçunus2020-10-171-1/+2
|/ / /
* | | Merge branch 'miami' of https://github.com/GTAmodding/re3 into neweray orçunus2020-10-121-4/+19
|\ \ \
| * | | Streaming and cross-platform fixeseray orçunus2020-10-121-5/+20
| | | |
* | | | SampleManagereray orçunus2020-10-122-3/+3
|/ / /
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-10-114-40/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | Fix POSIX streamingeray orçunus2020-10-091-1/+4
| | |
| * | Merge branch 'master' into mastererorcun2020-10-041-4/+21
| |\ \
| | * | macOS support; thanks to @MrYadroAndrew Udvare2020-09-301-4/+21
| | |/ | | | | | | | | | | | | | | | This should support ARM64 and x86-64. -target flag based on information from https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377.
| * | Load and write our settings in re3.ini & fixeseray orçunus2020-10-023-14/+25
| | |
| * | Fixes, mouse AUX buttons, joystick detect menueray orçunus2020-09-302-28/+26
| |/
* | Fix POSIX streamingeray orçunus2020-10-091-1/+4
| |
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into neweray orçunus2020-10-081-0/+2
|\ \
| * | Pad, BulletInfo, ProjectileInfo, fixeseray orçunus2020-10-071-0/+2
| | |
* | | macOS support; thanks to @MrYadroAndrew Udvare2020-10-081-4/+21
|/ / | | | | | | | | | | This should support ARM64 and x86-64. -target flag based on information from https://developer.apple.com/documentation/xcode/building_a_universal_macos_binary#3618377.
* | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miamieray orçunus2020-09-301-1/+16
|\ \
| * | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-09-301-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 founderay orçunus2020-09-272-2/+5
| | |
| | * Fixeseray orçunus2020-09-271-6/+22
| | |
| | * silentpatch fixesNikolay Korolev2020-09-261-1/+16
| | |
| | * Fix MASTER build with glfwSergeanur2020-09-261-1/+85
| | |
| * | some SilentPatch fixesshfil2020-09-301-1/+16
| | | | | | | | | | | | | | | | | | # Conflicts: # src/core/Camera.cpp # src/weapons/Weapon.cpp
* | | Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixeseray orçunus2020-09-302-4/+6
|/ /
* | Credits & fixeseray orçunus2020-09-271-6/+22
| |
* | Fix MASTER build with glfwSergeanur2020-09-261-1/+85
| |
* | Merge branch 'master' into miamiSergeanur2020-08-191-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 + MSAASergeanur2020-08-161-1/+3
| |
* | Merge branch 'master' into miamiSergeanur2020-08-155-0/+46
|\| | | | | | | | | | | # Conflicts: # src/control/Darkel.cpp # src/core/main.cpp
| * Original screen grabberSergeanur2020-08-145-0/+46
| |
* | Stats(except displaying), PlayerInfo, marker fixeray orçunus2020-08-141-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-08-102-1/+12
|\| | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/render/Coronas.cpp # src/render/Timecycle.cpp # src/render/Timecycle.h
| * Merge pull request #681 from withmorten/masteraap2020-08-081-1/+8
| |\ | | | | | | remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't …
| | * don't CoUninitialize for NO_MOVIESwithmorten2020-08-081-5/+4
| | |
| | * remove CoUninitialize calls for FIX_BUGS (fixes PIX crash) and don't check return value for CoInitializewithmorten2020-08-071-2/+10
| | |
| * | Update glfw.cppblingu2020-08-071-1/+1
| | |
| * | added FreeBSD supportblingu2020-08-051-0/+4
| |/
* | Fixes after mergeSergeanur2020-07-292-33/+0
| |
* | Merge branch 'master' into miamiSergeanur2020-07-292-0/+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
| * Fix casepath chaoseray orçunus2020-07-282-51/+84
| |
| * Fix/change some Windows defineeray orçunus2020-07-253-38/+31
| |
| * 90% fixes, 10% skel refactoringeray orçunus2020-07-244-32/+40
| |
| * 64-bit on Windowseray orçunus2020-07-224-13/+46
| |
* | Fix casepath chaoseray orçunus2020-07-282-51/+84
| |
* | Fix/change some Windows defineeray orçunus2020-07-253-38/+30
| |
* | 90% fixes, 10% skel refactoringeray orçunus2020-07-245-33/+56
| |
* | 64-bit on Windowseray orçunus2020-07-244-13/+46
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-07-222-4/+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 patcherSergeanur2020-07-222-4/+0
| |
| * Fixes from miamieray orçunus2020-07-201-4/+0
| |
* | Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-224-11/+26
| |
* | Merge branch 'master' into miamiSergeanur2020-07-171-0/+5
|\| | | | | | | | | # Conflicts: # src/render/Credits.cpp
| * Add fix/workaround for black screen at startupSergeanur2020-07-171-0/+5
| |
* | Merge branch 'master' into miamiSergeanur2020-07-131-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * Remove console and fix stheray orçunus2020-07-042-1/+5
| |
| * Re-enable console for debugging frontenderay orçunus2020-07-032-2/+7
| |
* | Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixeseray orçunus2020-07-062-4/+12
| |
* | Fix glfw.cppFilip Gawin2020-06-291-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-292-19/+359
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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.cppFire-Head2020-06-292-7/+201
| |
| * menu fixesFire-Head2020-06-291-1/+2
| |
| * Merge branch 'master' into ps2menuFire_Head2020-06-295-26/+26
| |\
| * | mips overdoseFire-Head2020-06-271-20/+165
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-281-1/+1
| | |
* | | Merge branch 'master' into miamiSergeanur2020-05-231-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-235-25/+25
| |/
* | skeleton typosaap2020-05-235-21/+21
| |
* | Merge pull request #574 from Xinerki/miamierorcun2020-05-221-0/+10
|\ \ | | | | | | many additions
| * | focus loss improvementXinerki2020-05-211-2/+5
| | | | | | | | | | | | for u aap
| * | scuffed InitAfterFocusLoss implementationXinerki2020-05-211-0/+7
| | |
* | | VC CMenuManager struct, ctor etc.eray orçunus2020-05-222-27/+27
|/ /
* | remove some unneeded plane paths for the moment; also different exe iconaap2020-05-163-1/+1
| |
* | Merge branch 'master' into miamiSergeanur2020-05-141-1/+14
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * blacklist for glfw "joysticks"aap2020-05-141-1/+14
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | # 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-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-128-99/+334
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * Fix Windows build and premakeeray orçunus2020-05-114-11/+16
| |
| * Linux build supporteray orçunus2020-05-117-91/+321
| |
| * Menu map fixes and resizable window on GLFWeray orçunus2020-05-091-3/+5
| |
| * reverting fuckupaap2020-05-061-0/+2
| |
| * updated librwaap2020-05-061-2/+0
| |
* | Menu map fixes and resizable window on GLFWeray orçunus2020-05-091-3/+5
| |
* | most of animation system done; little stuff here and thereaap2020-05-082-0/+8
| |
* | VC vehicles just barely working nowaap2020-05-071-2/+0
|/
* Screen mode selector and persistent map target fixeray orçunus2020-05-012-55/+68
|
* improved video modes for glfwaap2020-04-301-40/+146
|
* implemented improved video modes for win.cppaap2020-04-291-5/+108
|
* removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp?aap2020-04-281-79/+0
|
* Merge pull request #489 from Nick007J/masterNikolay Korolev2020-04-261-2/+7
|\ | | | | 1.1 patch stuff + flying controls
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-251-0/+8
| |\
| * | more 1.1 patchNikolay Korolev2020-04-241-2/+7
| | |
* | | fixes for glfwaap2020-04-261-15/+16
| | |
* | | Remove struct workaround in CControllerConfigManagerSergeanur2020-04-261-1/+0
| | |
* | | Initial GLFW supporteray orçunus2020-04-266-48/+1723
| |/ |/|
* | implemented skinned peds, no cutscene hands yetaap2020-04-241-0/+8
|/
* Crossplatform work continueseray orçunus2020-04-225-8/+159
|
* Remove patchesSergeanur2020-04-173-96/+5
|
* rem refsFire-Head2020-04-174-22/+15
|
* Default native resolution mode and small camera fixesSergeanur2020-04-151-4/+25
|
* (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowModeFire-Head2020-04-091-7/+7
|
* CShotInfo, CWanted done, Frontend fixeray orçunus2020-03-291-6/+0
|
* Limit frontend FPS to 100eray orçunus2020-03-281-1/+7
|
* WaterCannon done, resource icoFire-Head2020-03-282-1/+12
|
* Fixes for Serge's reviewFilip Gawin2020-03-221-2/+2
|
* cMusicManagerSergeanur2020-02-071-1/+1
|
* Implemented faststrcmp, faststricmp, strcasecmpSergeanur2019-10-301-0/+7
|
* Small CPad fixesSergeanur2019-10-291-6/+6
|
* Merge branch 'master' into masterFire_Head2019-10-273-35/+52
|\
| * ControllerConfig doneFire-Head2019-10-273-35/+52
| | | | | | | | Fix Cam enum
* | Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicModeSergeanur2019-10-262-2/+3
|/
* More more more audioFilip Gawin2019-08-271-1/+1
|
* AnimViewer!eray orçunus2019-08-154-11/+48
|
* Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-08-021-30/+41
|\
| * fixed dinputaap2019-07-251-30/+41
| |
* | sampman doneFire-Head2019-08-021-0/+0
|/
* Merge pull request #153 from ThirteenAG/masteraap2019-07-201-4/+4
|\ | | | | premake and appveyor update
| * premake and appveyor updateThirteenAG2019-07-201-4/+4
| |
* | couple of fixesaap2019-07-201-1/+1
|/
* and of course the last commit didnt fix everythingaap2019-07-101-1/+1
|
* added wrappers around math functionsaap2019-07-101-5/+5
|
* Update Frontend._AG2019-07-031-0/+4
|
* cleaned up to be closer to original gameaap2019-07-032-29/+17
|
* Revert "Implemented frontend inputs."aap2019-07-022-12/+4
|
* Implemented frontend inputs._AG2019-07-022-4/+12
| | | | Fixed #66 and few other stuff.
* Cleanup project a bitFilip Gawin2019-06-302-101/+101
|
* misc stuff, mostly collisionaap2019-06-281-9/+2
|
* Initial commit for Frontend._AG2019-06-252-2/+6
| | | | | | Bug fixes: fix #40, fix #39, fix #38, fix #37, fix #21. Code organization and cleanup...
* first part of CFileLoaderaap2019-06-171-0/+1
|
* got rid of upper case typesaap2019-06-172-32/+32
|
* Merge branch 'master' into masterFire_Head2019-06-131-0/+7
|\
| * fixed CFileMgr somewhat; still issues when loading savesaap2019-06-131-0/+7
| |
* | CPad doneFire-Head2019-06-131-2/+2
|/
* tmpFire-Head2019-06-112-175/+173
|
* VK_LEFT fixFire-Head2019-06-051-0/+1
|
* win.cpp/skeleton.cpp doneFire-Head2019-06-051-34/+34
|
* input done, fixed cheats inputFire-Head2019-06-053-31/+864
|
* added NO_MOVIESFire-Head2019-06-031-0/+11
|
* gamestates fixed, mpeg now workingFire-Head2019-06-021-43/+147
|
* mouse fixedFire-Head2019-06-021-3/+5
|
* fixed mergeaap2019-06-021-2/+3
|
* skeleton updated, windows specific stuff addedFire-Head2019-06-028-305/+2541
|
* rw skeletonFire-Head2019-05-315-0/+1618