5999ddc76d
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-03 21:44:18 +03:00
192190769d
Add ped and car density slider to menu, remove dumb collision "optimization"
2021-08-01 13:56:09 +03:00
70080f1fdb
mission replay
2021-08-01 12:54:05 +03:00
14c71f39ff
High FPS Fixes
2021-06-25 00:39:47 +03:00
3c7a7bc8a7
Fixes
2021-02-10 13:42:59 +02:00
b6af7393e8
Merge remote-tracking branch 'origin/miami' into VC/ControllerMenu
...
* origin/miami:
fix clouds
Use our synonyms for attack anims again
Detect joystick menu for XInput
reorganize shaders; use modulate flag; update librw
fix generic.txd crash
Use original animation names from VCS
# Conflicts:
# src/core/MenuScreensCustom.cpp
2021-02-10 09:01:53 +02:00
12330e38cb
Controller menu
2021-02-10 08:57:51 +02:00
675aef29cf
Detect joystick menu for XInput
2021-02-07 19:50:17 +03:00
73f1340afb
Store all settings in .INI
2021-01-23 15:59:38 +03:00
68e8c1ce04
Add multisampling
2021-01-08 20:22:08 +02:00
5b081398b5
Frontend: disable windowed mode selector while in game
2021-01-03 22:00:25 +03:00
7959b7fd1f
NO_ISLAND_LOADING ported from re3
2020-12-27 18:26:30 +02:00
57098a77ec
Backface cull. in INI, mouse sensitivity fix, aspect ratio auto as default
2020-12-26 12:10:04 +03:00
b473adcf80
Frontend cleanup, .INI, CFO, scrollable pages
2020-12-09 06:32:33 +03:00
bd8b907d13
PlayerPed and "Redefine controls" menu done, fixes
2020-12-02 14:21:46 +03:00
b7783b19d2
Xbox message screen, disabled by default
2020-11-24 01:45:54 +03:00
c6f53d25b0
Frontend: Stats, Map, Audio inputs, Radio selector
2020-11-18 00:33:45 +03:00
fe5d0c9cdf
Font: Hud: Use orig. text dimensions, fix right-align calculations
2020-11-08 20:49:47 +03:00
0a36629502
Finalize frontend sounds, player setup screen
2020-10-25 18:01:09 +03:00
da39624f1c
Pad, BulletInfo, ProjectileInfo, fixes
2020-10-08 00:26:24 +03:00
f71953077d
Population and many small classes done, mouse AUX buttons, Frontend, Hud, fixes
2020-09-30 02:41:42 +03:00
a5d6c952a7
Credits & fixes
2020-09-27 02:36:49 +03:00
9fd91e6250
Merge remote-tracking branch 'origin/master' into miami
...
# 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
2020-08-19 23:44:08 +03:00
827b240078
Merge branch 'master' into miami
...
# 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
2020-08-19 23:34:33 +03:00
4d1cfb7214
Island loading cleanup and fix
2020-08-19 03:31:42 +03:00
0418ba597b
remove CFO
2020-08-16 17:58:40 +03:00
732681db08
Island loading and PS2 alpha test added to options
2020-08-16 17:26:44 +03:00
a728a542be
Graphics menu + MSAA
2020-08-16 01:37:09 +03:00
8b3ca9564b
Continue to Frontend, fix savegame list bug
2020-08-14 22:44:12 +03:00
f40f44b14e
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 15:19:22 +03:00
70df13f9d3
Fixes from miami
2020-07-20 22:47:41 +03:00
d0f5464200
Merge branch 'master' into miami
...
# 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
2020-07-13 18:10:17 +03:00
6eb8f6ae5a
Add cutscene borders switch to the menu
2020-07-11 12:04:26 +03:00
70fa4ab79c
Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes
2020-07-06 16:38:00 +03:00
ceb1defc4e
fixes from master, menu helper text
2020-07-04 23:50:43 +03:00
b26eec5daf
Merge remote-tracking branch 'origin/master' into miami
...
# 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
2020-06-29 12:56:50 +03:00
860f75d66c
Merge branch 'master' into ps2menu
2020-06-29 09:37:53 +03:00
1c11a8081f
mips overdose
2020-06-28 00:01:51 +03:00
4e4a3489ef
Use KnockOffRider
2020-06-06 17:19:36 +03:00
afa4fa6510
Merge branch 'master' into miami
...
# 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
2020-06-06 08:42:58 +03:00
016ebc0b00
fixes, mostly from miami
2020-06-04 06:03:12 +03:00
5dc410a999
Peds, eSound and PedState enum, fixes
2020-06-03 17:01:11 +03:00
d930a25d94
DrawStandardMenus, VC menu array and minor fixes
2020-06-01 18:32:34 +03:00
9acf27fc53
remove inlining attempts + reload frontend options for real
2020-05-28 17:42:40 +03:00
a61736c51b
theoretically fix linux build
2020-05-28 13:08:21 +03:00
98fec63ca7
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
2020-05-28 11:40:56 +03:00
329a387fdf
Frontend customization functions, freecam toggle, minor things
2020-05-28 11:34:12 +03:00
ec1d14971c
mission replay
2020-05-27 00:25:12 +03:00
4870d9a31b
Menu borders and weapon fixes
2020-05-24 03:05:48 +03:00
5357957fe1
Compatibility with VC weapon.dat + new shotguns
2020-05-23 16:53:20 +03:00
Nikolay Korolev
erorcun
Sergeanur
eray orçunus
Fire_Head