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 |
|
Filip Gawin
|
c2ac6b3759
|
Fix linux warnings
|
2020-05-12 23:18:54 +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 |
|
bigbossbro08
|
c798e1bacd
|
Fixed typos and made all assert functions optional
|
2020-05-10 21:49:33 +06:00 |
|
aap
|
e81652c2fc
|
cleaned up MIAMI ifdefs
|
2020-05-05 18:06:38 +02: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 |
|
eray orçunus
|
97b288c1e4
|
Screen mode selector and persistent map target fix
|
2020-05-01 21:16:02 +03:00 |
|
aap
|
804b022e67
|
implemented improved video modes for win.cpp
|
2020-04-29 18:24:25 +02:00 |
|
aap
|
4e630a1a38
|
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
|
2020-04-29 10:26:36 +02:00 |
|
Sergeanur
|
f0890b1112
|
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/core/MenuScreens.h
# src/render/Font.cpp
# src/render/Font.h
# src/text/Messages.cpp
# src/text/Text.cpp
|
2020-04-26 22:03:15 +03:00 |
|
Nikolay Korolev
|
7cc3410846
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-21 11:55:39 +03:00 |
|
shfil
|
7794cca429
|
Merge pull request #477 from ShFil119/mingw
Try to make code working on more platforms
|
2020-04-20 19:50:12 +02:00 |
|
Filip Gawin
|
370c4e48cd
|
Try to build with mingw
|
2020-04-20 18:18:46 +02:00 |
|
Nikolay Korolev
|
b8c34f6654
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-20 01:05:20 +03:00 |
|
Nikolay Korolev
|
7e4c683824
|
fixes
|
2020-04-20 01:04:57 +03:00 |
|
Fire-Head
|
2308321805
|
Add polish lang support
|
2020-04-19 22:32:59 +03:00 |
|
Nikolay Korolev
|
9e65eb34ec
|
1.1 patch stuff
|
2020-04-19 17:38:10 +03:00 |
|
gennariarmando
|
e41c32df43
|
Fixed menu radio icons.
|
2020-04-18 05:52:33 +02:00 |
|
eray orçunus
|
4da1879975
|
Many fixes and cleanup
|
2020-04-15 19:19:45 +03:00 |
|
Sergeanur
|
e373d0526e
|
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/render/Font.cpp
# src/render/Hud.cpp
# src/render/Hud.h
# src/text/Messages.cpp
# src/text/Text.cpp
|
2020-04-15 00:10:50 +03:00 |
|
erorcun
|
313f547860
|
Some cleanup
|
2020-04-14 03:21:16 +03:00 |
|
eray orçunus
|
60c412149d
|
CFileLoader last funcs and Frontend cleanup
|
2020-04-13 05:42:02 +03:00 |
|
eray orçunus
|
8b2138f7bd
|
Frontend fixes + triangle for back as default
|
2020-04-12 20:22:28 +03:00 |
|
eray orçunus
|
f2995640bd
|
CMenuManager done and CHud fixes
|
2020-04-12 00:56:27 +03:00 |
|
aap
|
34349c4df2
|
normalized line endings to LF
|
2020-04-09 20:50:24 +02:00 |
|
Fire-Head
|
3769170113
|
(PS2) TheGame/main/GameInit/SystemInit, ProcessSlowMode
|
2020-04-09 02:52:38 +03:00 |
|
eray orçunus
|
1f8e073c0a
|
Menu map
|
2020-04-07 20:18:24 +03:00 |
|
aap
|
f2b3be5da2
|
Merge pull request #379 from erorcun/erorcun
Frontend (last-3)
|
2020-04-06 18:37:17 +02:00 |
|
Sergeanur
|
4fc2f9c359
|
Merge remote-tracking branch 'origin/master' into MoreLanguages
|
2020-04-05 17:03:59 +03:00 |
|
Sergeanur
|
c0c09f2720
|
Japanese
|
2020-04-05 12:02:51 +03:00 |
|
eray orçunus
|
bd7a59e58e
|
Frontend (last-3)
|
2020-04-04 14:49:19 +03:00 |
|
aap
|
7ff5a3a65c
|
CCamera fixes
|
2020-04-03 09:26:10 +02:00 |
|
Sergeanur
|
409663adb8
|
timebars
|
2020-03-31 16:11:45 +03:00 |
|
aap
|
a57d9b6797
|
Merge pull request #373 from erorcun/erorcun
Mouse free cam for peds&cars (under FREE_CAM)
|
2020-03-31 10:29:35 +02:00 |
|
eray orçunus
|
5e2fe749bd
|
Mouse free cam for peds&cars (under FREE_CAM)
|
2020-03-31 06:05:49 +03:00 |
|
Sergeanur
|
bb8868eba7
|
Add russian lang support
|
2020-03-30 14:50:14 +03:00 |
|
eray orçunus
|
0fe55eb543
|
CCopPed 2 and fixes
|
2020-03-26 18:54:03 +03:00 |
|
eray orçunus
|
d5a6e17079
|
ProcessButtonPresses and fixes
|
2020-03-21 14:58:54 +03:00 |
|
eray orçunus
|
750d3229a3
|
CPopulation 3 and fixes
|
2020-02-27 19:38:35 +03:00 |
|
eray orçunus
|
8a745e4d89
|
Fixes
|
2020-01-11 01:48:05 +03:00 |
|
erorcun
|
f9316d9cc3
|
CPlayerPed & CMenuManager (#286)
Make Frontend great again!
|
2020-01-07 17:23:09 +03:00 |
|
eray orçunus
|
be7d1d1a63
|
Frontend, Peds & logic and overflow fixes
|
2019-11-12 23:34:28 +01:00 |
|
Fire-Head
|
537aaca5c2
|
ControllerConfig done
Fix Cam enum
|
2019-10-27 06:17:30 +03:00 |
|
aap
|
424487854b
|
started making frontend accurate to game
|
2019-07-14 12:46:36 +02:00 |
|
_AG
|
7ba5f6a13a
|
Frontend fixes.
Fix #125 #119 #105 #98 #54.
|
2019-07-11 23:43:37 +02:00 |
|
aap
|
d360229b5b
|
fixed some stuff in frontend, badly broke others; disabled reversed frontend for the moment
|
2019-07-10 13:42:48 +02:00 |
|