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
|
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 |
aap
|
56b80cb0ab
|
fixes to zones and vehicle comp rules
|
2020-08-24 17:21:45 +02:00 |
|
aap
|
0a19925e99
|
finished sprites
|
2020-08-24 14:26:17 +02:00 |
|
aap
|
6c63dfd86d
|
accidentally enabled extended stuff....
|
2020-08-23 13:30:54 +02:00 |
|
aap
|
771235d213
|
weather fixes
|
2020-08-23 13:30:21 +02:00 |
|
aap
|
38a01a59fa
|
CWeather done
|
2020-08-23 13:27:56 +02:00 |
Nikolay Korolev
|
0fd6fb1ff4
|
fixed a few embarassing mistakes
|
2020-08-23 12:27:24 +03:00 |
|
aap
|
4545ddee6d
|
...
|
2020-08-21 23:35:47 +02:00 |
|
aap
|
13c34b0863
|
finished cullzones
|
2020-08-21 13:28:33 +02:00 |
|
aap
|
cc2f13710d
|
fix streaming bug
|
2020-08-21 12:09:45 +02:00 |
|
aap
|
23c52c1c86
|
fixed CRenderer::ScanSectorPoly again
|
2020-08-21 09:40:31 +02:00 |
|
aap
|
ac5af18891
|
fixed CRenderer::ScanSectorPoly again
|
2020-08-21 09:40:10 +02:00 |
|
aap
|
537b63acb5
|
call streaming funcs
|
2020-08-21 00:05:05 +02:00 |
|
aap
|
dace79c7c3
|
small streaming fixes
|
2020-08-20 23:45:45 +02:00 |
|
aap
|
a6fe606ce6
|
CStreaming done, hopefully
|
2020-08-20 23:44:40 +02:00 |
|
aap
|
857cef776d
|
Merge pull request #693 from majesticCoding/miami
stable CScriptPaths
|
2020-08-20 23:01:21 +02:00 |
|
Sergeanur
|
73dd29ea3a
|
Cleanup CControllerConfigManager deletion a bit
|
2020-08-20 19:56:02 +03:00 |
majestic
|
03c90b7c40
|
stable CScriptPaths
|
2020-08-20 09:44:26 -07: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 |
|
aap
|
a9a1bf5056
|
changed a sound enum
|
2020-08-20 13:21:08 +02:00 |
|
aap
|
7da4f7fc35
|
fixed sound enum
|
2020-08-20 13:20:48 +02:00 |
|
aap
|
517e2ee9a5
|
small fixes
|
2020-08-20 12:55:41 +02:00 |
|
aap
|
764af8735c
|
rw stuff done & other small things
|
2020-08-20 12:53:17 +02:00 |
|
aap
|
30dadcfb22
|
transmission done
|
2020-08-20 10:24:12 +02: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 |
|
aap
|
bb948904b6
|
small stuff
|
2020-08-19 21:58:00 +02:00 |
|
aap
|
c1367ebdca
|
update librw
|
2020-08-19 20:50:26 +02:00 |
|
aap
|
bd30d0a796
|
update librw
|
2020-08-19 20:49:43 +02:00 |
|
aap
|
c2e20070ab
|
txd.img bug
|
2020-08-19 16:54:09 +02:00 |
|
aap
|
895055a3d1
|
update librw; fix txd.img bug
|
2020-08-19 16:53:11 +02:00 |
|
aap
|
827ba62671
|
neo pipelines; postfx fix
|
2020-08-19 16:10:22 +02:00 |
|
aap
|
5ac83e4b4c
|
changing silly streaming memory limit
|
2020-08-19 14:58:43 +02:00 |
|
aap
|
76fe1247c8
|
Merge pull request #688 from aap/master
Neo pipelines
|
2020-08-19 14:36:38 +02:00 |
|
aap
|
dba992f388
|
Merge pull request #687 from Nick007J/miami
CarCtrl done, Script update
|
2020-08-19 10:08:10 +02:00 |
|
Sergeanur
|
4d1cfb7214
|
Island loading cleanup and fix
|
2020-08-19 03:31:42 +03:00 |
|
Nikolay Korolev
|
c559b71bc9
|
little fix
|
2020-08-18 20:08:27 +03:00 |
|
Nikolay Korolev
|
4ffa585cce
|
Merge pull request #692 from jack9267/master
Added bug fix to fix mission related crashes
|
2020-08-18 19:29:08 +03:00 |
Jack Powell
|
f09abe9ec1
|
Added bug fix to fix mission related crashes
|
2020-08-18 17:14:27 +01:00 |
|
Nikolay Korolev
|
2c2b722f21
|
Merge pull request #691 from jack9267/master
CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLE
|
2020-08-18 19:02:47 +03:00 |
|
Jack Powell
|
809c09938a
|
CREATE_RANDOM_CAR_FOR_CAR_PARK is supposed to be RANDOM_VEHICLE
|
2020-08-18 16:59:19 +01:00 |
|
Nikolay Korolev
|
4504b1593e
|
Merge pull request #690 from jack9267/master
Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside
|
2020-08-18 18:50:37 +03:00 |
|
Jack Powell
|
db1e5a6ec4
|
Fix small logic mistake in CGarage::RemoveCarsBlockingDoorNotInside
|
2020-08-18 16:47:15 +01:00 |
|
Nikolay Korolev
|
48c5a2abed
|
Merge pull request #689 from jack9267/master
Call CWorld::Remove before the delete
|
2020-08-18 18:06:04 +03:00 |