 Sergeanur
|
db84afd263
|
Revert
|
2020-11-01 12:31:37 +02:00 |
|
|
Sergeanur
|
20ea2fde84
|
Also fix SetModelIndex in CAutomobile and CTrain ctors
|
2020-11-01 09:46:25 +02:00 |
|
|
Sergeanur
|
d370c2076d
|
Fix virtual SetModelIndex call in CBoat ctor
|
2020-11-01 09:20:37 +02:00 |
|
|
Sergeanur
|
0e1257cf17
|
Disable loading screen
|
2020-10-30 20:32:41 +02:00 |
|
|
Sergeanur
|
b8d2c4e452
|
Add VB file list
|
2020-10-30 10:34:13 +02:00 |
|
|
Sergeanur
|
86b1d9aea5
|
OpenAL channels now use their own sound buffers
# Conflicts:
# src/audio/sampman_oal.cpp
|
2020-10-28 10:09:59 +02:00 |
|
|
Sergeanur
|
9a3758bfc1
|
Fix undefined colorId for pickups
|
2020-10-26 16:39:43 +02:00 |
|
|
Sergeanur
|
6647dd043d
|
Remove redundant includes
|
2020-10-25 13:08:28 +02:00 |
|
|
Sergeanur
|
a520243563
|
cAudioManager::ProcessFrontEnd done
|
2020-10-25 12:00:57 +02:00 |
|
|
Sergeanur
|
93b318cfdf
|
DMAudio fixes
|
2020-10-25 09:42:24 +02:00 |
|
|
Sergeanur
|
d1394c6994
|
Fix WindModifiers
|
2020-10-24 22:28:44 +03:00 |
|
|
Sergeanur
|
04845a72bc
|
Model indices edits
|
2020-10-24 21:33:15 +03:00 |
|
|
Sergeanur
|
3d14097bf6
|
Fix playback of vanilla opus
|
2020-10-24 16:37:39 +03:00 |
|
|
Sergeanur
|
a0efb89aa0
|
more ScriptSounds
|
2020-10-23 18:35:37 +03:00 |
|
|
Sergeanur
|
ca497e2cbd
|
ScriptSounds
|
2020-10-23 16:56:34 +03:00 |
|
|
Sergeanur
|
1544683bdc
|
Missed nil
|
2020-10-23 13:23:42 +03:00 |
|
|
Sergeanur
|
d237bb694b
|
Small CPedModelInfo fixes
|
2020-10-23 13:11:51 +03:00 |
|
|
Sergeanur
|
89a7007c6a
|
ObjectData
|
2020-10-23 08:41:23 +03:00 |
|
|
Sergeanur
|
281e45ce01
|
Timer fix
|
2020-10-23 08:38:36 +03:00 |
|
|
Sergeanur
|
1cdc647324
|
Fix argument type
|
2020-10-22 22:05:50 +03:00 |
|
|
Sergeanur
|
ee61f19253
|
Police Radio + fixes
|
2020-10-22 12:38:09 +03:00 |
|
|
Sergeanur
|
ff2665942e
|
CTempColModels stuff
|
2020-10-21 21:24:18 +03:00 |
|
|
Sergeanur
|
2709531f09
|
Rename CObject flag
|
2020-10-21 21:14:40 +03:00 |
|
|
Sergeanur
|
e9a89236a2
|
Pickups Done
|
2020-10-21 21:00:13 +03:00 |
|
|
Sergeanur
|
8697eebbc2
|
Merge branch 'miami' into VC/Pickups
# Conflicts:
# src/control/Pickups.cpp
|
2020-10-18 17:17:11 +03:00 |
|
|
Sergeanur
|
0d20f1c364
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/control/RoadBlocks.cpp
# src/entities/Entity.h
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/render/Renderer.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/CarGen.cpp
# src/weapons/BulletInfo.cpp
# src/weapons/Weapon.cpp
|
2020-10-18 17:15:49 +03:00 |
|
|
Sergeanur
|
cc0ae51631
|
lil fix
|
2020-10-18 16:55:11 +03:00 |
|
|
Sergeanur
|
b91f6a4550
|
Setter for bIsStatic (became virtual in SA)
|
2020-10-18 16:40:06 +03:00 |
|
|
Sergeanur
|
b3385015e5
|
Merge remote-tracking branch 'origin/miami' into VC/Pickups
|
2020-10-18 04:54:01 +03:00 |
|
|
Sergeanur
|
588fb26728
|
Fix player model not changing in cutscenes
|
2020-10-17 18:26:48 +03:00 |
|
|
Sergeanur
|
e465cea07b
|
Pickup arrays done
|
2020-10-17 18:05:23 +03:00 |
|
|
Sergeanur
|
7fc70179ed
|
Pickup save/load
|
2020-10-17 17:06:38 +03:00 |
|
|
Sergeanur
|
7f3b51dd17
|
Small inner fix
|
2020-10-17 16:04:11 +03:00 |
|
|
Sergeanur
|
63666391d4
|
More Pickup stuff
|
2020-10-17 15:57:12 +03:00 |
|
|
Sergeanur
|
516a02d2da
|
Fix pickup fix :P
|
2020-10-17 15:33:22 +03:00 |
|
|
Sergeanur
|
ca64a49af1
|
fix build
|
2020-10-17 14:23:31 +03:00 |
|
|
Sergeanur
|
1f36b78c20
|
Pickup fixes
|
2020-10-17 13:48:08 +03:00 |
|
|
Sergeanur
|
ef47dad566
|
Partial Pickups
|
2020-10-17 08:23:01 +03:00 |
|
|
Sergeanur
|
a96146c87b
|
Pickup fix
|
2020-10-14 03:29:25 +03:00 |
|
|
Sergeanur
|
6450fd2692
|
Fix zone saving on 64 bit
|
2020-10-12 22:54:46 +03:00 |
|
 SergeanurandGitHub
|
239e09ad07
|
Merge pull request #759 from Sergeanur/VC/ZoneSaveLoad
Zones saving and loading
|
2020-10-12 04:16:30 +03:00 |
|
|
SergeanurandGitHub
|
a5ea709edc
|
Merge pull request #760 from Sergeanur/VC/TextFinish
Finish Text stuff
|
2020-10-11 10:42:19 +03:00 |
|
|
Sergeanur
|
b0becb5a2d
|
UnicodeMakeUpperCase move + arg fix
|
2020-10-11 10:39:04 +03:00 |
|
|
Sergeanur
|
9dba2386bb
|
Merge branch 'master' into VC/TextFinish
# Conflicts:
# src/text/Text.cpp
|
2020-10-11 10:34:47 +03:00 |
|
|
Sergeanur
|
43af5d9c1f
|
Merge branch 'miami' into VC/TextFinish
|
2020-10-11 10:33:56 +03:00 |
|
|
Sergeanur
|
e26e85deb8
|
Some unicode funcs belong to Font.cpp + small fix
|
2020-10-11 10:33:02 +03:00 |
|
|
Sergeanur
|
f1bb09826d
|
Merge remote-tracking branch 'origin/master' into miami
# 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
|
2020-10-11 01:18:08 +03:00 |
|
|
Sergeanur
|
6fe6d0cb9a
|
Finish Text stuff
|
2020-10-11 00:56:16 +03:00 |
|
|
Sergeanur
|
dd039677a0
|
Zones saving and loading
|
2020-10-10 23:50:00 +03:00 |
|
|
Sergeanur
|
db8e7dbaff
|
New gxt lines
|
2020-10-01 15:10:16 +03:00 |
|
|
Sergeanur
|
fae4c73ad3
|
Merge remote-tracking branch 'origin/master' into miami
# 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
|
2020-09-30 02:25:30 +03:00 |
|
|
Sergeanur
|
2129cc2906
|
Fix arg types
|
2020-09-30 02:18:11 +03:00 |
|
|
Sergeanur
|
5144b5051c
|
Fix arg types
|
2020-09-28 21:37:59 +03:00 |
|
|
Sergeanur
|
4cfc61da14
|
Use enums in aVehicleSettings
|
2020-09-27 02:26:35 +03:00 |
|
|
Sergeanur
|
4d1182bdb1
|
Fix coronas reflections
|
2020-09-26 14:24:21 +03:00 |
|
|
Sergeanur
|
05e65baabe
|
Fix coronas reflections
|
2020-09-26 14:23:34 +03:00 |
|
|
Sergeanur
|
dd93a90ab2
|
Fix MASTER build with glfw
|
2020-09-26 05:14:24 +03:00 |
|
|
Sergeanur
|
3f0a80f7c7
|
Fix MASTER build with glfw
|
2020-09-26 05:10:22 +03:00 |
|
|
Sergeanur
|
c3d7a73c0b
|
Fix OpenGL Z-write
# Conflicts:
# src/core/main.cpp
|
2020-09-26 00:26:43 +03:00 |
|
|
Sergeanur
|
0ce8082bda
|
Fix OpenGL Z-write
|
2020-09-26 00:25:39 +03:00 |
|
|
Sergeanur
|
288f99d507
|
Add .gitattributes for better language stats
|
2020-09-23 16:09:46 +03:00 |
|
|
Sergeanur
|
c6cf16447b
|
Add .gitattributes for better language stats
|
2020-09-23 16:08:35 +03:00 |
|
|
SergeanurandGitHub
|
a043902d9a
|
Merge pull request #703 from Nick007J/miami
script fixes + LCS cheat
|
2020-09-22 15:38:50 +03:00 |
|
|
SergeanurandGitHub
|
bde17bb395
|
Merge pull request #706 from theR4K/miami
Miami
|
2020-09-21 19:55:51 +03:00 |
|
|
Sergeanur
|
ec2f4fde93
|
Fixes to MusicManager
|
2020-09-19 16:40:30 +03:00 |
|
|
Sergeanur
|
db2c34923d
|
Fixes to MusicManager
|
2020-09-19 16:39:31 +03:00 |
|
|
Sergeanur
|
7efc153dc9
|
Renaming audio enum entries to something more like original
|
2020-09-19 15:55:27 +03:00 |
|
|
Sergeanur
|
9c2e9fcf88
|
Fix RotateY
|
2020-09-15 00:31:57 +03:00 |
|
|
Sergeanur
|
dff49e9c23
|
Fix RotateY
|
2020-09-15 00:31:32 +03:00 |
|
|
Sergeanur
|
a8a28c1512
|
Move a bunch of math to cpp files + small fixes
# Conflicts:
# src/control/CarCtrl.cpp
# src/math/Matrix.h
# src/math/Vector2D.h
# src/math/math.cpp
# src/render/Skidmarks.cpp
|
2020-09-14 21:10:23 +03:00 |
|
|
Sergeanur
|
38ec1bd50d
|
Move a bunch of math to cpp files + small fixes
|
2020-09-14 21:07:31 +03:00 |
|
|
SergeanurandGitHub
|
25a22cc6f2
|
Merge pull request #702 from Sergeanur/VC/MusicManager
cMusicManager, cDMAudio, radio position save/load, a few commands imp…
|
2020-09-13 03:10:14 +03:00 |
|
|
Sergeanur
|
bc0a97af04
|
Add missing file
|
2020-09-10 01:08:44 +03:00 |
|
|
Sergeanur
|
f6c0bcf201
|
Fix getter types
|
2020-09-10 00:57:14 +03:00 |
|
|
Sergeanur
|
7aca08a954
|
player mood enum
|
2020-09-10 00:32:51 +03:00 |
|
|
Sergeanur
|
c5b411c1ed
|
Fix crash on assert
|
2020-09-09 22:36:53 +03:00 |
|
|
Sergeanur
|
f0ccbcb281
|
CStats::PopulateFavoriteRadioStationList
|
2020-09-09 20:37:36 +03:00 |
|
|
Sergeanur
|
4f4b1f9145
|
cMusicManager, cDMAudio, radio position save/load, a few commands implemented
|
2020-09-09 19:37:44 +03:00 |
|
|
Sergeanur
|
9b47625115
|
More stinger fix
|
2020-09-02 21:03:02 +03:00 |
|
|
Sergeanur
|
fa7334c74f
|
Stinger fixes
|
2020-09-02 20:55:28 +03:00 |
|
|
Sergeanur
|
3bb0e78e1c
|
Rename vars
|
2020-09-01 12:35:59 +03:00 |
|
|
Sergeanur
|
6778640b52
|
Rename states
|
2020-08-31 21:35:26 +03:00 |
|
|
Sergeanur
|
df67c73d81
|
vars rename
|
2020-08-31 21:21:50 +03:00 |
|
|
Sergeanur
|
024f0a5027
|
use SetOrientation
|
2020-08-31 21:15:04 +03:00 |
|
|
Sergeanur
|
8a0a29c64e
|
Stinger done
|
2020-08-31 21:09:48 +03:00 |
|
|
Sergeanur
|
963e85f047
|
Fix
|
2020-08-24 23:01:51 +03:00 |
|
|
Sergeanur
|
14ed50a559
|
Remote done
|
2020-08-24 22:52:07 +03:00 |
|
|
Sergeanur
|
041d342faf
|
PlayerSkin done
|
2020-08-24 22:37:38 +03:00 |
|
|
Sergeanur
|
85cf043e4a
|
Compilation fix
|
2020-08-24 22:14:05 +03:00 |
|
|
Sergeanur
|
a3322f17d5
|
Merge branch 'master' into miami
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/audio/AudioLogic.cpp
# src/audio/soundlist.h
# src/core/ControllerConfig.cpp
# src/core/ControllerConfig.h
# src/core/Streaming.cpp
# src/peds/PedChat.cpp
# src/render/Weather.cpp
# src/rw/TexRead.cpp
# src/vehicles/Automobile.cpp
# src/vehicles/Boat.cpp
|
2020-08-24 21:59:32 +03:00 |
|
|
Sergeanur
|
1d907ac91f
|
small fix
|
2020-08-24 21:56:34 +03:00 |
|
|
Sergeanur
|
bbcf3fd7d2
|
CutsceneMgr done
|
2020-08-24 21:52:16 +03:00 |
|
|
Sergeanur
|
73dd29ea3a
|
Cleanup CControllerConfigManager deletion a bit
|
2020-08-20 19:56:02 +03:00 |
|
|
Sergeanur
|
b5ccc721ae
|
Add VEHICLE_FIREWEAPON (disabled by default)
|
2020-08-20 19:40:35 +03:00 |
|
|
Sergeanur
|
0f5a771292
|
Fix cAudioScriptObject
|
2020-08-20 14:47:53 +03:00 |
|
|
Sergeanur
|
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 |
|
|
Sergeanur
|
dab6d6dd6d
|
Merge remote-tracking branch 'origin/miami' into miami
# Conflicts:
# src/core/config.h
|
2020-08-19 23:35:10 +03:00 |
|
|
Sergeanur
|
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 |
|
|
Sergeanur
|
4d1cfb7214
|
Island loading cleanup and fix
|
2020-08-19 03:31:42 +03:00 |
|
|
Sergeanur
|
732681db08
|
Island loading and PS2 alpha test added to options
|
2020-08-16 17:26:44 +03:00 |
|