mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-27 16:33:45 +00:00
Code Issues Projects Releases Wiki Activity
2687 commits 3 branches 0 tags 63 MiB
Commit graph

38 commits

Author SHA1 Message Date
Sergeanur
d0f5464200 Merge branch 'master' into miami 
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
 2020-07-13 18:10:17 +03:00
eray orçunus
c483a044b5 Noskillx's PR + fix .set loading 2020-07-06 19:26:41 +03:00
Filip Gawin
bf2624692c Fix displaying stats 2020-07-03 00:04:49 +02:00
Nikolay Korolev
0b156f1d26 some stats tweaks; saves dead again 2020-06-07 15:23:52 +03:00
aap
c1e13177a1 some CAutomobile 2020-05-31 17:05:59 +02:00
Fire-Head
6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
aap
21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
aap
a53ca58e56 CPhysical 2020-05-22 14:27:16 +02:00
Nikolay Korolev
0085ed894f script revision 2020-05-20 23:47:44 +03:00
Nikolay Korolev
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
eray orçunus
84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
Nikolay Korolev
b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Nikolay Korolev
4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
Nikolay Korolev
8fae2dcc26 garages + script 2020-05-11 21:04:35 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
Sergeanur
6cfc31510d CStats finished 2020-04-09 20:15:45 +03:00
Nikolay Korolev
4f1d6123dd stats fix 2020-04-06 19:31:08 +03:00
Nikolay Korolev
b991fd9766
Merge branch 'master' into master 2020-04-06 19:26:04 +03:00
Nikolay Korolev
775bc3e666 garage update part 2 2020-03-28 20:52:25 +03:00
Nikolay Korolev
268f92bfbe garages part 1 2020-03-28 15:24:13 +03:00
PerikiyoXD
1622973ffa Implement Init for Stats 2020-03-24 19:50:08 +01:00
Nikolay Korolev
34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03:00
Wes Hampson
018fb3a929 Style fixes 2020-03-11 14:15:27 -07:00
Wes Hampson
c7f16879df GenericSave complete, still needs some testing 2020-03-11 00:12:40 -07:00
Nikolay Korolev
1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev
043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
Sergeanur
208754ac68 Finishing CDarkel 2020-01-07 17:30:29 +02:00
Nikolay Korolev
0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Nikolay Korolev
5b0cf80a76 merge with upstream 2020-01-01 02:42:00 +03:00
Nikolay Korolev
80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
eray orçunus
6cbf1db519 CPlayerInfo done 2019-12-16 07:48:44 +03:00
Sergeanur
69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
eray orçunus
39223901bf AnimViewer messages, Particle fix, Peds 2019-08-17 22:21:10 +03:00
aap
a3e3527a3b implemented CHeli 2019-08-04 00:31:00 +02:00
guard3
94fb33b60c Fluff 2019-07-17 22:44:22 +03:00
_AG
0c34fb1bb2 blah 2019-07-07 15:26:59 +02:00
_AG
d1c6a6aaa6 Merge branch 'master' of https://github.com/gtamodding/re3 2019-07-07 15:16:54 +02:00
aap
53023eb65b the great reorganization 2019-07-07 13:09:11 +02:00
Renamed from src/Stats.h (Browse further)