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 |
eray orçunus
|
3231c6c3dd
|
ProcessTrainAnnouncements fix
|
2020-06-13 17:33:30 +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 |
Nikolay Korolev
|
3f26250d73
|
fixing some uninitialized stuff
|
2020-06-06 13:31:09 +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
|
147dca44fa
|
ProcessTrainAnnouncements
|
2020-06-05 11:27:33 +03:00 |
|
eray orçunus
|
016ebc0b00
|
fixes, mostly from miami
|
2020-06-04 06:03:12 +03:00 |
|
eray orçunus
|
5dc410a999
|
Peds, eSound and PedState enum, fixes
|
2020-06-03 17:01:11 +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 |
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +02:00 |
|
Sergeanur
|
1eb817de77
|
Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL
|
2020-05-05 18:32:46 +03:00 |
aap
|
67467f15d1
|
GTA_BRIDGE and GTA_TRAIN defines
|
2020-05-03 17:28:54 +02:00 |
|
Sergeanur
|
d23b2c423e
|
SetPosition, part 1
|
2020-05-02 15:13:09 +03:00 |
|
Sergeanur
|
7d758f3a9f
|
Adding getters and setters for type and status
|
2020-04-30 16:45:45 +03:00 |
|
Sergeanur
|
599164006a
|
Remove patches
|
2020-04-17 16:31:11 +03:00 |
|
Sergeanur
|
83cbe4e39e
|
More refs removed
|
2020-04-16 15:30:47 +03:00 |
|
eray orçunus
|
112685ebac
|
CCopPed done and #include cleanup
|
2020-03-28 18:52:25 +03:00 |
|
aap
|
739e80614d
|
remove include <new> from common.h
|
2020-03-28 09:37:04 +01:00 |
|
eray orçunus
|
934e9db4fc
|
CPopulation done, CCopPed and fixes
|
2020-03-12 00:48:33 +03:00 |
|
Sergeanur
|
fd1edbc0c8
|
Single-wagon train fix
|
2019-10-10 20:55:12 +03:00 |
|
aap
|
a3e3527a3b
|
implemented CHeli
|
2019-08-04 00:31:00 +02:00 |
|
aap
|
78c15c4828
|
implemented CPlane
|
2019-07-31 23:57:18 +02:00 |
|
aap
|
5f6b235301
|
implemented CTrain
|
2019-07-31 14:33:27 +02:00 |
|
aap
|
12af85ca3d
|
cleaned up patching of virtual functions; started CAutomobile
|
2019-07-08 08:46:42 +02:00 |
|
aap
|
53023eb65b
|
the great reorganization
|
2019-07-07 13:09:11 +02:00 |