Sergeanur
|
f882586eb8
|
Merge remote-tracking branch 'origin/master' into miami
# 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
|
2020-07-22 18:29:17 +03:00 |
|
eray orçunus
|
f40f44b14e
|
Peds, Hud, CFO 1/2, fixes - including zone names
|
2020-07-22 15:19:22 +03:00 |
|
Sergeanur
|
7d51995640
|
Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher
|
2020-07-22 03:32:46 +03:00 |
|
eray orçunus
|
70df13f9d3
|
Fixes from miami
|
2020-07-20 22:47:41 +03:00 |
|
Sergeanur
|
30384bb4ef
|
Merge branch 'master' into miami
# Conflicts:
# src/render/Credits.cpp
|
2020-07-17 21:15:47 +03:00 |
|
Sergeanur
|
e8ded77e27
|
Add fix/workaround for black screen at startup
|
2020-07-17 21:14:48 +03:00 |
|
Sergeanur
|
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 |
|
eray orçunus
|
70fa4ab79c
|
Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixes
|
2020-07-06 16:38:00 +03:00 |
|
eray orçunus
|
1cea84d2b1
|
Remove console and fix sth
|
2020-07-04 16:01:07 +03:00 |
|
eray orçunus
|
ed036df3ce
|
Re-enable console for debugging frontend
|
2020-07-03 05:40:22 +03:00 |
|
Filip Gawin
|
6cf698badd
|
Fix glfw.cpp
|
2020-06-29 16:24:40 +02:00 |
|
Sergeanur
|
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 |
|
Fire-Head
|
d9cb9583bf
|
update glfw.cpp
|
2020-06-29 11:04:30 +03:00 |
|
Fire-Head
|
63fdcf7e64
|
menu fixes
|
2020-06-29 10:29:02 +03:00 |
|
Fire_Head
|
860f75d66c
|
Merge branch 'master' into ps2menu
|
2020-06-29 09:37:53 +03:00 |
|
Fire-Head
|
1c11a8081f
|
mips overdose
|
2020-06-28 00:01:51 +03:00 |
|
Sergeanur
|
509ca11d76
|
Merge remote-tracking branch 'origin/master' into miami
# 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
|
2020-06-03 01:24:08 +03:00 |
|
eray orçunus
|
329a387fdf
|
Frontend customization functions, freecam toggle, minor things
|
2020-05-28 11:34:12 +03:00 |
|
Sergeanur
|
88b6168f1c
|
Merge branch 'master' into miami
# 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
|
2020-05-23 21:14:16 +03:00 |
|
aap
|
9313bfa155
|
skeleton typos
|
2020-05-23 11:34:48 +02:00 |
|
aap
|
e2d3ef449c
|
skeleton typos
|
2020-05-23 11:34:40 +02:00 |
|
erorcun
|
8b82e9c40f
|
Merge pull request #574 from Xinerki/miami
many additions
|
2020-05-22 15:49:37 +03:00 |
|
eray orçunus
|
a5f23a0342
|
VC CMenuManager struct, ctor etc.
|
2020-05-22 03:48:12 +03:00 |
|
Xinerki
|
900d5a4ce0
|
focus loss improvement
for u aap
|
2020-05-21 21:48:39 +03:00 |
|
Xinerki
|
1cb7b9876f
|
scuffed InitAfterFocusLoss implementation
|
2020-05-21 14:23:12 +03:00 |
|
aap
|
9dc5dca209
|
remove some unneeded plane paths for the moment; also different exe icon
|
2020-05-16 11:34:51 +02:00 |
|
Sergeanur
|
24875f34d0
|
Merge branch 'master' into miami
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
|
2020-05-14 17:05:42 +03:00 |
|
aap
|
f5345f59ea
|
blacklist for glfw "joysticks"
|
2020-05-14 00:09:45 +02:00 |
|
Sergeanur
|
7c2b9478d5
|
Merge branch 'master' into miami
# 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
|
2020-05-13 00:55:52 +03:00 |
|
Sergeanur
|
33dfaf7da1
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
|
2020-05-13 00:27:15 +03:00 |
|
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
eray orçunus
|
36e2bc95d3
|
Fix Windows build and premake
|
2020-05-11 20:10:01 +03:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
eray orçunus
|
b80c4bae6b
|
Menu map fixes and resizable window on GLFW
|
2020-05-09 13:58:31 +03:00 |
|
eray orçunus
|
f754da272f
|
Menu map fixes and resizable window on GLFW
|
2020-05-09 13:43:08 +03:00 |
|
aap
|
2eee4c5176
|
most of animation system done; little stuff here and there
|
2020-05-08 15:59:57 +02:00 |
|
aap
|
05a1d64fbb
|
VC vehicles just barely working now
|
2020-05-07 11:33:20 +02:00 |
|
aap
|
edd9301d7f
|
reverting fuckup
|
2020-05-06 09:59:04 +02:00 |
|
aap
|
bb0541404d
|
updated librw
|
2020-05-06 09:24:12 +02:00 |
|
eray orçunus
|
97b288c1e4
|
Screen mode selector and persistent map target fix
|
2020-05-01 21:16:02 +03:00 |
|
aap
|
1b40693f80
|
improved video modes for glfw
|
2020-04-30 15:38:25 +02:00 |
|
aap
|
804b022e67
|
implemented improved video modes for win.cpp
|
2020-04-29 18:24:25 +02:00 |
|
aap
|
c7e2845602
|
removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp?
|
2020-04-28 10:56:30 +02:00 |
|
Nikolay Korolev
|
68bf239868
|
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
|
2020-04-27 00:53:54 +03:00 |
|
aap
|
41586c7cda
|
fixes for glfw
|
2020-04-26 20:16:31 +02:00 |
|
Sergeanur
|
b7ee3792df
|
Remove struct workaround in CControllerConfigManager
|
2020-04-26 20:11:19 +03:00 |
|
eray orçunus
|
6c1a1f7cd2
|
Initial GLFW support
|
2020-04-26 13:29:50 +03:00 |
|
Nikolay Korolev
|
34ef766c67
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-25 12:15:29 +03:00 |
|
aap
|
f03b4eec4c
|
implemented skinned peds, no cutscene hands yet
|
2020-04-24 11:42:38 +02:00 |
|
Nikolay Korolev
|
0b12cacf15
|
more 1.1 patch
|
2020-04-24 01:01:41 +03:00 |
|