 Sergeanur
|
655eaa36ce
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/Script.cpp
# src/core/Cam.cpp
# src/core/Camera.cpp
# src/core/Camera.h
# src/render/Fluff.cpp
# src/render/Hud.cpp
|
2020-06-15 17:44:47 +03:00 |
|
|
Sergeanur
|
beb6f3bf80
|
small fixes
|
2020-06-13 13:57:25 +03:00 |
|
|
Sergeanur
|
0321f3b55f
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/audio_enums.h
# src/core/AnimViewer.cpp
|
2020-06-08 18:03:00 +03:00 |
|
 SergeanurandGitHub
|
85d845c5ce
|
Merge pull request #623 from Sergeanur/VC/MissionAudio
Mission audio
|
2020-06-08 17:32:57 +03:00 |
|
|
Sergeanur
|
95e9fe7693
|
fixes
|
2020-06-08 16:22:49 +03:00 |
|
|
Sergeanur
|
03f3b4fc5a
|
remove numbers from enum
|
2020-06-08 14:33:10 +03:00 |
|
|
Sergeanur
|
8cd87236c9
|
miamification of some audio structs
|
2020-06-08 14:29:55 +03:00 |
|
|
Sergeanur
|
65032389a4
|
Merge branch 'miami' into VC/MissionAudio
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.h
# src/audio/DMAudio.cpp
# src/audio/DMAudio.h
# src/audio/MusicManager.cpp
|
2020-06-08 10:38:09 +03:00 |
|
|
Sergeanur
|
5942f1a8f9
|
Merge branch 'master' into miami
# Conflicts:
# src/control/CarCtrl.cpp
# src/control/Script.cpp
# src/render/Font.cpp
|
2020-06-08 10:36:37 +03:00 |
|
|
Sergeanur
|
36a6d124aa
|
Mission audio slots
|
2020-06-08 10:34:31 +03:00 |
|
|
Sergeanur
|
be9954ecc6
|
IsMissionAudioSamplePlaying (from VC)
|
2020-06-08 10:33:32 +03:00 |
|
|
Sergeanur
|
0afb1d9e24
|
Scale font shadow
|
2020-06-08 10:30:09 +03:00 |
|
|
Sergeanur
|
fe3a3ad8b5
|
cleanup
|
2020-06-07 15:19:29 +03:00 |
|
|
Sergeanur
|
a44510d1df
|
more font
|
2020-06-07 10:36:37 +03:00 |
|
|
Sergeanur
|
31569d512c
|
font fix
|
2020-06-07 09:10:09 +03:00 |
|
|
Sergeanur
|
0d0e519e68
|
Merge branch 'miami' into Font
|
2020-06-07 05:13:44 +03:00 |
|
|
Sergeanur
|
950cb9a717
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/core/Frontend.cpp
# src/render/Hud.cpp
|
2020-06-07 05:13:01 +03:00 |
|
|
Sergeanur
|
91e2b427ef
|
more font stuff
|
2020-06-07 05:12:01 +03:00 |
|
|
Sergeanur
|
fc7e35e1cd
|
fixes
|
2020-06-07 04:20:02 +03:00 |
|
|
Sergeanur
|
24bf4c2cba
|
Merge branch 'miami' into Font
# Conflicts:
# src/render/Font.cpp
# src/render/Font.h
|
2020-06-07 04:16:10 +03:00 |
|
|
Sergeanur
|
1c01899799
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/Frontend.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Train.cpp
|
2020-06-07 04:15:10 +03:00 |
|
|
Sergeanur
|
678a19ce3b
|
a bit of fonts
|
2020-06-07 04:11:10 +03:00 |
|
|
Sergeanur
|
552205dfba
|
FONT_BANK renamed to FONT_STANDARD
|
2020-06-07 04:10:06 +03:00 |
|
|
Sergeanur
|
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 |
|
|
Sergeanur
|
2016cd54b0
|
ps2 audio banks
|
2020-06-06 03:45:24 +03:00 |
|
|
Sergeanur
|
147dca44fa
|
ProcessTrainAnnouncements
|
2020-06-05 11:27:33 +03:00 |
|
|
Sergeanur
|
07c6752cf7
|
Merge branch 'master' into miami
# Conflicts:
# src/peds/Ped.cpp
|
2020-06-04 05:10:50 +03:00 |
|
|
Sergeanur
|
2578880e1c
|
PedChat & PedDebug
|
2020-06-04 05:04:00 +03:00 |
|
|
Sergeanur
|
a6e4619378
|
Revert "fix accident~"
This reverts commit 04de93796b.
|
2020-06-04 04:42:42 +03:00 |
|
|
Sergeanur
|
07d336ddf0
|
Merge branch 'master' into miami
# Conflicts:
# src/peds/Ped.cpp
# src/peds/Ped.h
|
2020-06-04 04:32:49 +03:00 |
|
|
Sergeanur
|
12717917cc
|
Restore original logic of CPed::WanderRange
|
2020-06-04 04:31:04 +03:00 |
|
|
Sergeanur
|
2df44208dd
|
Range2D and Range3D
|
2020-06-03 04:45:25 +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 |
|
|
Sergeanur
|
53ac163a3e
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/vehicles/Automobile.h
|
2020-05-27 20:50:40 +03:00 |
|
|
Sergeanur
|
3a5a122887
|
Fix city sound playing on restarting a new game
|
2020-05-27 20:48:47 +03:00 |
|
|
Sergeanur
|
591c35d51b
|
OpenAL support
|
2020-05-27 07:52:45 +03:00 |
|
|
Sergeanur
|
7a79b74778
|
Restore original logic
|
2020-05-27 03:33:27 +03:00 |
|
|
Sergeanur
|
408faf8a66
|
Support of original mp3/wav/adf
|
2020-05-27 03:29:54 +03:00 |
|
|
Sergeanur
|
1991aa388b
|
Very basic compatibility with original sfx.raw/sdt
|
2020-05-26 18:25:34 +03:00 |
|
|
Sergeanur
|
0ce2af7a0d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/Garages.cpp
# src/core/SurfaceTable.cpp
# src/core/SurfaceTable.h
# src/core/World.cpp
# src/core/main.cpp
# src/modelinfo/PedModelInfo.cpp
# src/peds/Ped.cpp
# src/render/Timecycle.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Automobile.h
# src/vehicles/Heli.cpp
# src/vehicles/Vehicle.cpp
# src/weapons/Weapon.cpp
# src/weapons/WeaponInfo.h
|
2020-05-26 17:24:47 +03:00 |
|
|
Sergeanur
|
52644192e3
|
Even more audio cleanups
|
2020-05-25 19:36:09 +03:00 |
|
|
Sergeanur
|
ad896d5f81
|
Ped comments cleanup
|
2020-05-25 19:10:15 +03:00 |
|
|
Sergeanur
|
cebc3bbd48
|
More audio cleanup and bugfixes
|
2020-05-25 18:39:16 +03:00 |
|
|
Sergeanur
|
fd06ab4db8
|
Fix names of static variables
|
2020-05-25 03:56:17 +03:00 |
|
|
Sergeanur
|
80c2018b51
|
cAudioManager::ProcessPlayersVehicleEngine cleanup and fixes
|
2020-05-25 03:40:47 +03:00 |
|
|
Sergeanur
|
56683dbed3
|
Clean cAudioManager::ProcessGarages up a bit
|
2020-05-24 20:33:30 +03:00 |
|
|
Sergeanur
|
f92770f74a
|
Optimize ALDeviceList
|
2020-05-24 01:44:10 +03:00 |
|
|
Sergeanur
|
7d30878418
|
Fix OAL crash
|
2020-05-24 01:06:19 +03:00 |
|
|
Sergeanur
|
ac208ce02c
|
Even more small audio cleanup
|
2020-05-23 23:25:14 +03:00 |
|
|
Sergeanur
|
f2790f610b
|
More audio cleanup
|
2020-05-23 22:48:50 +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 |
|
|
Sergeanur
|
a9f332f2d9
|
Possibly fix travis
|
2020-05-22 21:26:31 +03:00 |
|
|
Sergeanur
|
efe52dbbbc
|
I am an idiot
|
2020-05-22 21:14:38 +03:00 |
|
|
Sergeanur
|
38a09c6e9b
|
Fix linux build
|
2020-05-22 21:00:59 +03:00 |
|
|
Sergeanur
|
e858314a9f
|
OpenAL configs
|
2020-05-22 18:01:09 +03:00 |
|
|
Sergeanur
|
c53b23cff0
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/core/Radar.h
# src/core/World.cpp
# src/core/config.h
# src/entities/Entity.cpp
# src/modelinfo/ModelIndices.h
# src/modelinfo/PedModelInfo.cpp
# src/peds/Population.cpp
# src/render/Clouds.cpp
# src/render/Hud.cpp
# src/vehicles/HandlingMgr.h
|
2020-05-20 14:39:36 +03:00 |
|
|
Sergeanur
|
e891cf858f
|
Remove MAX_VOLUME dups
|
2020-05-18 20:17:24 +03:00 |
|
|
Sergeanur
|
af22bb1495
|
CText
|
2020-05-18 01:28:40 +03:00 |
|
|
Sergeanur
|
37480fb617
|
Fix compilation errors
|
2020-05-17 00:33:52 +03:00 |
|
|
Sergeanur
|
77f97ad2ad
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimManager.cpp
# src/audio/AudioManager.cpp
|
2020-05-16 23:58:44 +03:00 |
|
|
Sergeanur
|
ad0b99231e
|
Remove magic consts from ms_aAnimAssocDefinitions
|
2020-05-16 23:54:44 +03:00 |
|
|
Sergeanur
|
4ff0697b4d
|
More small audio fixes
|
2020-05-16 21:00:27 +03:00 |
|
|
Sergeanur
|
13a0bf1c43
|
Move sound processors to AudioLogic.cpp, plus small fixes
|
2020-05-16 20:29:13 +03:00 |
|
|
Sergeanur
|
1a42d62d3a
|
Merge branch 'master' into miami
# Conflicts:
# premake5.lua
# src/peds/Ped.cpp
# src/peds/PedIK.cpp
# src/peds/PedIK.h
|
2020-05-16 17:09:13 +03:00 |
|
|
Sergeanur
|
dc5ece8327
|
Fix audio use of number instead of enum for CAR_ACCEL
|
2020-05-16 16:55:37 +03:00 |
|
|
Sergeanur
|
76dd769085
|
Merge branch 'master' into miami
|
2020-05-16 05:07:39 +03:00 |
|
|
Sergeanur
|
ec1b91e527
|
Remove unused audio enum
|
2020-05-16 05:06:51 +03:00 |
|
|
Sergeanur
|
ede6b7db6a
|
Fix compilation
|
2020-05-14 17:15:26 +03:00 |
|
|
Sergeanur
|
24875f34d0
|
Merge branch 'master' into miami
# Conflicts:
# src/modelinfo/ClumpModelInfo.cpp
|
2020-05-14 17:05:42 +03:00 |
|
|
Sergeanur
|
3f1001b86b
|
More save/load alignment fixes
|
2020-05-13 16:24:00 +03:00 |
|
|
Sergeanur
|
7aeac06fdb
|
Redoing some pool reading for better alignment
|
2020-05-13 05:31:14 +03:00 |
|
|
Sergeanur
|
4ac53960f5
|
Changing save/load for CPlayerInfo because of alignment crap
|
2020-05-13 03:43:20 +03: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 |
|
|
Sergeanur
|
d5676be83e
|
Fix premake copy
|
2020-05-12 04:41:17 +03:00 |
|
|
Sergeanur
|
12b1eedcbf
|
Include oal files
|
2020-05-12 04:36:10 +03:00 |
|
|
Sergeanur
|
8f1a2825d4
|
Remove odd calculations for bullet hit smoke
|
2020-05-12 04:31:11 +03:00 |
|
|
Sergeanur
|
d9db03d606
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/render/Renderer.cpp
|
2020-05-11 21:08:29 +03:00 |
|
|
Sergeanur
|
5f1c3fa208
|
Merge remote-tracking branch 'origin/miami' into miami
|
2020-05-11 21:07:36 +03: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 |
|
|
Sergeanur
|
85c44715ea
|
remove aps from premake
|
2020-05-11 15:08:19 +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
|
d9a3533438
|
Small unification
|
2020-05-10 01:14:00 +03:00 |
|
|
SergeanurandGitHub
|
0b64436f5f
|
Merge pull request #529 from Nick007J/master
car control fixes
|
2020-05-10 01:08:38 +03:00 |
|
|
Sergeanur
|
28103775ba
|
Place debug menu under ifdef
|
2020-05-09 16:06:13 +03:00 |
|
|
Sergeanur
|
1b599b2d35
|
Fix compilation error
|
2020-05-09 15:41:00 +03:00 |
|
|
Sergeanur
|
4b8d6a3223
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/AnimBlendAssocGroup.cpp
# src/animation/AnimBlendAssociation.cpp
# src/animation/AnimManager.cpp
# src/core/Streaming.cpp
|
2020-05-09 02:56:53 +03:00 |
|
|
Sergeanur
|
d686f587cc
|
Merge remote-tracking branch 'origin/master'
|
2020-05-09 02:51:40 +03:00 |
|
|
Sergeanur
|
e917cd1f46
|
Fix corona scaling
|
2020-05-09 02:50:48 +03:00 |
|
|
Sergeanur
|
1ef8d61f36
|
Merge branch 'master' into miami
|
2020-05-08 17:49:19 +03:00 |
|
|
Sergeanur
|
e0b3418e65
|
Fix water UV on high FPS and inverted free camera
|
2020-05-08 14:34:21 +03:00 |
|
|
Sergeanur
|
a483243c52
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/core/FileLoader.cpp
|
2020-05-08 00:58:39 +03:00 |
|
|
Sergeanur
|
f13c4e6aca
|
Merge branch 'master' into miami
|
2020-05-07 14:49:29 +03:00 |
|
|
Sergeanur
|
0b848bc147
|
Fix looping collision sound
|
2020-05-07 14:48:53 +03:00 |
|
|
Sergeanur
|
7dc649ede6
|
Merge branch 'master' into miami
|
2020-05-07 14:32:41 +03:00 |
|
|
Sergeanur
|
1ac6bea590
|
Fix GetDistanceSquared
|
2020-05-07 14:32:00 +03:00 |
|
|
Sergeanur
|
ed1bb7236f
|
Fixed arguments for sound collisions
|
2020-05-07 14:10:56 +03:00 |
|
|
Sergeanur
|
bef436400d
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/modelinfo/ModelIndices.h
|
2020-05-07 13:42:50 +03:00 |
|
|
Sergeanur
|
6ad66fb2d7
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/render/Renderer.cpp
|
2020-05-06 19:32:57 +03:00 |
|
|
Sergeanur
|
fc8c28722f
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/objects/Object.h
|
2020-05-06 18:24:31 +03:00 |
|