Commit Graph

338 Commits

Author SHA1 Message Date
blingu
c3841fe5b4
m_snTimeInMilliseconds to GetTimeInMilliseconds() 2020-03-25 21:24:32 +01:00
blingu
96802f9b95
Update Fire.cpp 2020-03-25 21:13:06 +01:00
blingu
08e1c869a4
renamed field_24 to m_nNextTimeToAddFlames 2020-03-25 21:09:27 +01:00
blingu
e22ce9404c
Update Fire.cpp 2020-03-25 21:07:07 +01:00
blingu
0605e704ca
Update Fire.h 2020-03-25 21:01:38 +01:00
blingu
834f4f6d4c
Update Fire.h 2020-03-25 21:01:10 +01:00
blingu
ea9e45fcda
Update Fire.cpp 2020-03-25 21:00:38 +01:00
blingu
c03bae46ea
Update Fire.cpp 2020-03-24 18:12:53 +01:00
blingu
1680d11dae
Update Fire.h 2020-03-24 17:25:14 +01:00
blingu
43fb59e356
Update Fire.h 2020-03-24 17:24:47 +01:00
Sergeanur
a12c01e10a obrstr + Debug 2020-03-24 09:56:37 +02:00
Nikolay Korolev
861506d048 merge with upstream 2020-03-22 19:47:14 +03:00
Filip Gawin
a097f225bc Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin
c88c2115e2 Remove unneeded double to float casts 2020-03-22 17:30:54 +01:00
Filip Gawin
8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
Filip Gawin
7c425ac4ac Implement ProcessGarages + small cleanup 2020-03-22 17:30:54 +01:00
Filip Gawin
67398809a3 Implement ProcessFires 2020-03-22 17:30:54 +01:00
Nikolay Korolev
d1d123dc6a missing endlines 2020-03-22 19:19:07 +03:00
Nikolay Korolev
360d9cf889 merge with master 2020-03-22 17:26:18 +03:00
Nikolay Korolev
34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03:00
Sergeanur
5e37c3e805 Console 2020-03-22 16:19:10 +02:00
aap
f9342c7e83
Merge pull request #350 from Nick007J/master
bullet traces
2020-03-22 14:41:03 +01:00
aap
398cc6bbec fixed vehicle rendering bug 2020-03-22 11:40:18 +01:00
Nikolay Korolev
7d213a1f32 bullet traces fixes 2020-03-22 13:20:36 +03:00
eray orçunus
d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
erorcun
53e65a32cd
Merge branch 'master' into Radar2 2020-03-17 20:46:37 +03:00
erorcun
7aa5d16b53
Merge pull request #347 from Nick007J/master
replay fixes + script crash fix
2020-03-17 20:41:59 +03:00
erorcun
1ab6702ea6
Merge pull request #345 from whampson/save-stuff
GenericSave() done
2020-03-17 20:35:18 +03:00
Sergeanur
e57ad65d05 Finished CRadar, a bit of CExplosion 2020-03-17 00:22:43 +02:00
Nikolay Korolev
1971b3db62 Merge remote-tracking branch 'upstream/master' 2020-03-15 18:47:36 +03:00
Nikolay Korolev
152d8c2f40 replay bug fixes, script bug fix 2020-03-15 18:47:21 +03:00
Wes Hampson
afeac54860 Spacing fix 2020-03-13 13:50:23 -07:00
Wes Hampson
8280dda9cb Add CTimeStep 2020-03-13 13:46:59 -07:00
eray orçunus
934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +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
Wes Hampson
28342405d3 Add Load/Save functions 2020-03-10 20:26:07 -07:00
Wes Hampson
4fee2cbdd9 Begin work on GenericSave 2020-03-05 01:44:42 -08:00
eray orçunus
a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
Nikolay Korolev
ceab73a053 merge with upstream 2020-03-01 14:19:42 +03:00
eray orçunus
750d3229a3 CPopulation 3 and fixes 2020-02-27 19:38:35 +03:00
Nikolay Korolev
56c83dfaae more stuff + intro fix 2020-02-24 21:17:15 +03:00
Nikolay Korolev
6260d51d44 Merge branch 'master' into script_dev 2020-02-24 12:10:59 +03:00
Nikolay Korolev
1ba696f5fc some changes 2020-02-23 13:12:44 +03:00
aap
f8cd12ffb3
Merge pull request #333 from Nick007J/master
script 1000-1154
2020-02-23 11:00:15 +01:00
eray orçunus
b2d062ef2d some fixes 2020-02-23 01:48:21 +03:00
Nikolay Korolev
a312e1ff81 merge 2020-02-22 15:36:22 +03:00
eray orçunus
090aef7de7 CPopulation 2 2020-02-19 21:14:17 +03:00
erorcun
16ea0527dd
Merge pull request #328 from erorcun/erorcun
CPopulation 1
2020-02-17 23:02:58 +03:00
eray orçunus
ff92b822b6 CPopulation 1 2020-02-17 15:57:50 +03:00
Nikolay Korolev
1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev
a361fc0ff5 sync with upstream 2020-02-15 14:54:46 +03:00
Nikolay Korolev
043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
eray orçunus
f307839a2b CPlayerPed done 2020-02-13 22:02:45 +03:00
Sergeanur
a3e5ccde47 cMusicManager 2020-02-07 02:30:00 +02:00
Sergeanur
f1863676bb CullZone fix 2020-02-04 22:21:45 +02:00
eray orçunus
03b995c6ef Some fixes and some cosmetic things 2020-02-02 16:58:52 +03:00
Nikolay Korolev
dc2516896f script 900-999 init 2020-02-02 14:47:03 +03:00
Sergeanur
afd6b43ffb Fixed wrong slot indexing in Frontend 2020-01-31 17:16:32 +02:00
aap
5794732ad4
Merge pull request #299 from Sergeanur/PedIK
CPedIK finished, bit of CCamera
2020-01-31 12:57:43 +01:00
aap
8b367e8d18
Merge pull request #298 from Sergeanur/save
save
2020-01-31 12:57:25 +01:00
Sergeanur
43bd2227a8 CRemote 2020-01-31 12:23:15 +02:00
Sergeanur
2c8cce4655 suggested fixes 2020-01-30 18:15:27 +02:00
Sergeanur
81de0e0cbd acos 2020-01-29 13:00:40 +02:00
Sergeanur
633108b2d7 camera 2020-01-29 01:54:07 +02:00
Sergeanur
fa4dbcab35 save 2020-01-27 18:22:51 +02:00
Sergeanur
0525e3930b Fix invert mouse on/off 2020-01-26 21:54:20 +02:00
Sergeanur
da253837d1 audio stuff
Collision audio and police radio stuff moved to a separate cpp's like in the original code
cPoliceRadioQueue added, code refactored correspondingly
cAudioManager::ServiceCollisions reversed
PlayOneShotScriptObject reversed
cAudioScriptObject moved to AudioScriptObject.cpp
Fixed use of numbers on non-integer types (bools, pointers)
enum is now used for ped audio calculation
Added fixes for vehicle description in the police radio (missing vehicles and wrong colors)
2020-01-25 12:48:27 +02:00
erorcun
d75b9b8257
CPlayerPed continues (#294) 2020-01-23 23:21:50 +03:00
Sergeanur
b06ad84768 Fixing possible leaks in CModelInfo::ShutDown 2020-01-23 20:08:42 +02:00
Sergeanur
9eb599ff58 Plane crashfix and more 2020-01-23 17:29:36 +02:00
Sergeanur
77515f04e0 ConstructMloClumps 2020-01-21 09:47:24 +02:00
Sergeanur
06904755d9 Refactor CCullZone::CalcDistToCullZoneSquared 2020-01-20 23:27:57 +02:00
Sergeanur
7857590990 Atan2 and Sqrt 2020-01-20 23:21:51 +02:00
Sergeanur
669374ec1a disable cullzone writer 2020-01-20 23:11:12 +02:00
Sergeanur
82becdc955 CullZone.dat writer start 2020-01-20 23:08:34 +02:00
Sergeanur
a9f39d8284 MLO, XtraCompsModelInfo, MovingThing, Solid 2020-01-20 22:58:13 +02:00
aap
9d3c73156b
Merge pull request #290 from Sergeanur/ProjectileInfo
ProjectileInfo
2020-01-12 23:19:55 +01:00
Sergeanur
d409f64980 Fixes 2020-01-12 13:31:04 +02:00
erorcun
2d00d7b3e2
Merge pull request #291 from Sergeanur/AccidentManager
AccidentManager
2020-01-12 02:11:47 +03:00
eray orçunus
5d119cf985 Fixes 2 2020-01-11 20:36:46 +03:00
Sergeanur
bbc68ffb1c AccidentManager 2020-01-11 15:14:02 +02:00
Sergeanur
8fab684283 move 2020-01-11 14:49:37 +02:00
erorcun
6af77d8514
Merge pull request #289 from erorcun/erorcun
Fixes
2020-01-11 02:02:09 +03:00
eray orçunus
8a745e4d89 Fixes 2020-01-11 01:48:05 +03:00
Sergeanur
d89d5f0d9a CUserDisplay, CPlaceName, CCurrentVehicle 2020-01-07 19:10:17 +02:00
Sergeanur
208754ac68 Finishing CDarkel 2020-01-07 17:30:29 +02:00
erorcun
f9316d9cc3
CPlayerPed & CMenuManager (#286)
Make Frontend great again!
2020-01-07 17:23:09 +03:00
Nikolay Korolev
0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Nikolay Korolev
42ff0f7c58 bug fixes 2020-01-01 23:55:01 +03:00
Nikolay Korolev
c05c516ce7 Merge remote-tracking branch 'upstream/master' into script_dev 2020-01-01 16:01:06 +03:00
Nikolay Korolev
a19a6a7c0f fixed vehicle enter crash 2020-01-01 15:59:08 +03:00
Nikolay Korolev
402ecd6305 fix merge with upstream 2020-01-01 02:55:00 +03:00
Nikolay Korolev
90233baffe fix merge 2020-01-01 02:44: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
eray orçunus
dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +03:00
Fire_Head
c07272dfa0
fixed mouse binding 2019-12-01 01:02:34 +03:00
eray orçunus
680fe0f7e6 CCivilianPed done & restore peds running to phone 2019-11-26 02:35:05 +03:00