Sergeanur
|
7d8ffa9ebd
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
|
2020-08-07 12:34:41 +03:00 |
eray orçunus
|
e14252914e
|
Squeeze performance option, minor fixes
Fixes are already in miami
|
2020-08-03 16:00:32 +03:00 |
|
Sergeanur
|
86cc86ac12
|
Merge remote-tracking branch 'origin/master' into miami
|
2020-07-29 15:35:25 +03:00 |
|
Sergeanur
|
acdc52116e
|
Merge branch 'master' into miami
# 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
|
2020-07-29 15:34:57 +03:00 |
aap
|
e13d80a4eb
|
rename shit
|
2020-07-29 14:31:34 +02:00 |
|
Sergeanur
|
6b92e9e12b
|
Dual pass rendering for RW 3.3
|
2020-07-29 15:24:42 +03:00 |
|
eray orçunus
|
429f6b03c4
|
CCopPed, except spike traps
|
2020-07-28 17:04:34 +03:00 |
|
eray orçunus
|
199d57b16c
|
Fix/change some Windows define
|
2020-07-25 15:18:15 +03:00 |
|
eray orçunus
|
732b760829
|
64-bit on Windows
|
2020-07-24 20:26:33 +03:00 |
|
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 |
|
Sergeanur
|
7d51995640
|
Remove hacky way of injecting PS2 matfx on RW 3.3, remove static patcher
|
2020-07-22 03:32:46 +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 |
|
Sergeanur
|
841fa5155c
|
Rename LEVEL_NONE to LEVEL_GENERIC
|
2020-07-13 17:43:09 +03:00 |
|
eray orçunus
|
c483a044b5
|
Noskillx's PR + fix .set loading
|
2020-07-06 19:26:41 +03:00 |
|
aap
|
0acade08ca
|
Merge pull request #647 from Fire-Head/miami
miami CParticleObject
|
2020-07-04 21:24:17 +02:00 |
Fire-Head
|
d4004805f5
|
miami pobj
|
2020-07-03 02:18:06 +03:00 |
|
Sergeanur
|
87fa69385c
|
remove TheText.Load() from CGame::Initialise
|
2020-06-30 07:48:09 +03: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
|
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
|
d930a25d94
|
DrawStandardMenus, VC menu array and minor fixes
|
2020-06-01 18:32:34 +03:00 |
Nikolay Korolev
|
c1c163d78c
|
game logic
|
2020-05-31 20:59:01 +03:00 |
|
eray orçunus
|
329a387fdf
|
Frontend customization functions, freecam toggle, minor things
|
2020-05-28 11:34:12 +03:00 |
|
Fire-Head
|
63d0bdc863
|
VC Water
|
2020-05-27 21:50:01 +03:00 |
|
aap
|
19a0c8b462
|
Merge pull request #583 from erorcun/miami
Menu borders and weapon fixes
|
2020-05-24 10:47:17 +02:00 |
|
eray orçunus
|
4870d9a31b
|
Menu borders and weapon fixes
|
2020-05-24 03:05:48 +03:00 |
|
Nikolay Korolev
|
607175f02a
|
set pieces
|
2020-05-23 20:06:52 +03:00 |
|
erorcun
|
4b99d7127f
|
Merge pull request #579 from Xinerki/miami
InitAfterFocusLoss compile fix
|
2020-05-22 16:10:35 +03:00 |
Xin
|
a878e09f0f
|
InitAfterFocusLoss compile fix
|
2020-05-22 16:04:52 +03: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
|
1cb7b9876f
|
scuffed InitAfterFocusLoss implementation
|
2020-05-21 14:23:12 +03:00 |
|
aap
|
62db8cd9b0
|
finished CFileLoader; some COcclusion stubs
|
2020-05-19 10:23:08 +02:00 |
|
eray orçunus
|
acd1ea9909
|
Weapon layer in Peds
|
2020-05-15 21:21:25 +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 |
|
aap
|
40829b5242
|
CClouds; disabled object clipping for SA cam
|
2020-05-12 16:27:39 +02:00 |
|
Sergeanur
|
0aa7f13c32
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimBlendAssociation.h
# src/animation/AnimBlendClumpData.h
# src/animation/AnimManager.h
# src/animation/FrameUpdate.cpp
# src/control/AutoPilot.h
# src/control/PathFind.h
# src/core/PlayerInfo.h
# src/entities/Building.h
# src/entities/Dummy.h
# src/entities/Entity.h
# src/entities/Physical.h
# src/entities/Treadable.h
# src/modelinfo/BaseModelInfo.h
# src/modelinfo/ClumpModelInfo.cpp
# src/modelinfo/ClumpModelInfo.h
# src/modelinfo/PedModelInfo.h
# src/modelinfo/SimpleModelInfo.h
# src/modelinfo/TimeModelInfo.h
# src/modelinfo/VehicleModelInfo.h
# src/objects/CutsceneHead.h
# src/objects/CutsceneObject.h
# src/objects/DummyObject.h
# src/objects/Object.h
# src/peds/DummyPed.h
# src/peds/PedIK.cpp
# src/rw/VisibilityPlugins.cpp
# src/vehicles/Automobile.h
# src/vehicles/Boat.h
# src/vehicles/Heli.h
# src/vehicles/Plane.h
# src/vehicles/Train.h
# src/vehicles/Vehicle.h
|
2020-05-11 21:07:12 +03:00 |
|
eray orçunus
|
8a4fa58cd4
|
Linux build support
|
2020-05-11 21:00:55 +03:00 |
|
erorcun
|
c66c45f4c8
|
Merge pull request #509 from Fire-Head/master
OpenAL update
|
2020-05-11 03:23:36 +03:00 |
|
Sergeanur
|
35c41208f5
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimManager.cpp
# src/control/CarCtrl.cpp
# src/control/Curves.cpp
# src/core/templates.h
|
2020-05-10 01:26:12 +03:00 |
|
Sergeanur
|
28103775ba
|
Place debug menu under ifdef
|
2020-05-09 16:06:13 +03:00 |
|
aap
|
e0568a19d5
|
new zone stuff
|
2020-05-06 12:23:57 +02:00 |
|
aap
|
68d3ea9c42
|
getting the vice city map to work
|
2020-05-05 23:27:43 +02:00 |
|
aap
|
e81652c2fc
|
cleaned up MIAMI ifdefs
|
2020-05-05 18:06:38 +02:00 |
|
Sergeanur
|
1eb817de77
|
Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL
|
2020-05-05 18:32:46 +03:00 |
|
Sergeanur
|
c2b9ddc5b8
|
Revert "Remove Miami stuff"
This reverts commit 9960c41193.
|
2020-05-05 18:04:43 +03:00 |
|
Sergeanur
|
9960c41193
|
Remove Miami stuff
|
2020-05-05 18:04:18 +03:00 |
|
aap
|
b44df26d3e
|
implemented most of streamed collisions and big buildings
|
2020-05-05 13:02:42 +02:00 |
|
Fire-Head
|
8aac6060d3
|
oal upd
|
2020-05-04 20:33:48 +03:00 |