Commit Graph

1012 Commits

Author SHA1 Message Date
erorcun
9e49e5c2bd
Merge pull request #356 from blingu/master
CFire and CFireManager classes nearly done
2020-03-26 19:30:34 +03:00
blingu
79822e3f7c
Update Fire.cpp 2020-03-26 17:11:04 +01:00
blingu
853b2d0c78
Update Fire.cpp 2020-03-26 17:05:01 +01:00
blingu
edc92a7bcc
Update Fire.cpp 2020-03-26 17:00:58 +01:00
eray orçunus
0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03:00
blingu
0e91015940
Update Vehicle.cpp 2020-03-26 14:19:55 +01:00
blingu
a66db9efcb
Update Fire.cpp 2020-03-25 23:01:22 +01:00
blingu
be2aca47cf
added InflictDamage() declaration 2020-03-25 22:58:20 +01:00
blingu
93a4bc31fa
added wrapper for InflictDamage() 2020-03-25 22:57:34 +01:00
blingu
09af0bcaf8
Update Fire.cpp 2020-03-25 22:54:14 +01:00
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
aap
8703758a7b
Merge pull request #353 from Sergeanur/Debug
obrstr + Debug
2020-03-25 09:08:33 +01:00
PerikiyoXD
1622973ffa Implement Init for Stats 2020-03-24 19:50:08 +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
aap
4e7c186285 change default script to story 2020-03-24 11:58:09 +01:00
aap
c7bdecdd90 fix and cleanup in AddToPopulation 2020-03-24 09:02:41 +01:00
Sergeanur
a12c01e10a obrstr + Debug 2020-03-24 09:56:37 +02:00
aap
55b62e2134 added an assert to CPed::BuildPedLists, but too many peds still crash the game 2020-03-24 08:49:55 +01:00
aap
4070cad4a7
Merge pull request #352 from Nick007J/master
CGame::Initialise
2020-03-23 00:34:41 +01:00
Filip Gawin
da2d25c020
Fix order of math operations on integers (fires) 2020-03-22 19:32:01 +01:00
Nikolay Korolev
861506d048 merge with upstream 2020-03-22 19:47:14 +03:00
Filip Gawin
0e817230af Remove all constexpr 2020-03-22 17:30:54 +01:00
Filip Gawin
b57e4febb0 fix include 2020-03-22 17:30:54 +01:00
Filip Gawin
39462a3865 Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin
a097f225bc Fixes for review 2020-03-22 17:30:54 +01:00
Filip Gawin
337924c794 Cleanup audio code + 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
3b8a177470 Implement SetupJumboEngineSound 2020-03-22 17:30:54 +01:00
Filip Gawin
67398809a3 Implement ProcessFires 2020-03-22 17:30:54 +01:00
Filip Gawin
0d1f42add1 Implement ProcessCrane 2020-03-22 17:30:54 +01:00
Filip Gawin
31382bc22c Implement ProcessCesna 2020-03-22 17:30:54 +01:00
Nikolay Korolev
d1d123dc6a missing endlines 2020-03-22 19:19:07 +03:00
Nikolay Korolev
c29a85a443 console init 2020-03-22 18:48:16 +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
Nikolay Korolev
65e8558794 Merge remote-tracking branch 'upstream/master' 2020-03-22 13:09:18 +03:00
erorcun
b17935b89e
Merge branch 'master' into erorcun 2020-03-22 04:49:24 +03:00
Nikolay Korolev
c2f5dfdb1e bullet traces 2020-03-21 20:14:29 +03:00
Nikolay Korolev
ac610b7e6e fixed erroneous assumption 2020-03-21 15:13:38 +03:00
eray orçunus
d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
Nikolay Korolev
795e07c882 purple nines glitch fix 2020-03-21 14:29:03 +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
f35758a8f1 Use WriteDataToBufferPointer 2020-03-13 21:23:03 -07:00
Wes Hampson
afeac54860 Spacing fix 2020-03-13 13:50:23 -07:00
Wes Hampson
3862cda231 Style fix, use CTimeStep 2020-03-13 13:47:53 -07:00
Wes Hampson
8280dda9cb Add CTimeStep 2020-03-13 13:46:59 -07:00
Wes Hampson
0283dbcd12 Fix merge conflict 2020-03-11 15:49:19 -07:00
erorcun
4cc0fc1696
Merge branch 'master' into erorcun 2020-03-12 00:57:35 +03: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
81c4f75c63 Bugfixes, GenericSave() works now! 2020-03-11 14:08:10 -07:00
Wes Hampson
c7f16879df GenericSave complete, still needs some testing 2020-03-11 00:12:40 -07:00
Wes Hampson
5bc51f8462 Save SimpleVars, Scripts, and a few others 2020-03-10 20:27:41 -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
Nikolay Korolev
1d8b3a216c more utils 2020-03-05 01:10:09 +03:00
Nikolay Korolev
24ad650eb3 Merge branch 'master' into script_dev 2020-03-04 23:14:54 +03:00
Nikolay Korolev
8c13eab30a fixed dummyobject bug 2020-03-04 23:13:45 +03:00
Nikolay Korolev
2058ca6bbb more utils 2020-03-04 23:12:16 +03:00
Nikolay Korolev
0a3211d0cf Merge branch 'master' into script_dev 2020-03-02 22:54:47 +03:00
Nikolay Korolev
d492390fec script utils 2020-03-02 22:54:13 +03:00
eray orçunus
a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
Nikolay Korolev
90ff2f73eb Merge branch 'master' into script_dev 2020-03-01 17:44:37 +03:00
Nikolay Korolev
5eccf44e7a review fixes 2020-03-01 17:42:47 +03:00
Nikolay Korolev
ceab73a053 merge with upstream 2020-03-01 14:19:42 +03:00
Nikolay Korolev
64b28c0730 save/load 2020-03-01 14:18:10 +03:00
eray orçunus
ae523a09a7 fixes 2020-03-01 04:44:58 +03:00
eray orçunus
750d3229a3 CPopulation 3 and fixes 2020-02-27 19:38:35 +03:00
Nikolay Korolev
4d9853b0ce removed debug leftovers 2020-02-24 21:18:11 +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
7d78879c48 more stuff 2020-02-24 12:10:21 +03:00
eray orçunus
cbf396e6e9 script fixes 2020-02-23 18:34:53 +03:00
Nikolay Korolev
0255f5d15f more cosmetic stuff 2020-02-23 14:06:12 +03:00
Nikolay Korolev
1721a74466 stuff 2020-02-23 13:30:37 +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
Nikolay Korolev
aa5266b1b3 some cosmetic stuff 2020-02-23 02:29:38 +03:00
eray orçunus
b2d062ef2d some fixes 2020-02-23 01:48:21 +03:00
Filip Gawin
c92dfb0064
Fix police radio condition
thx @Nick007J
2020-02-22 19:47:42 +01:00
Nikolay Korolev
bc139e0702 ARRAY_SIZE 2020-02-22 17:53:28 +03:00
Nikolay Korolev
1366c58d59 removed extra include 2020-02-22 17:19:56 +03:00
Nikolay Korolev
a122d558a2 merge + bug fix 2020-02-22 15:53:41 +03:00
Nikolay Korolev
a312e1ff81 merge 2020-02-22 15:36:22 +03:00
Nikolay Korolev
3481e431c9 fixes 2020-02-22 15:35:46 +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
a36da99798 review fixes 2020-02-16 12:44:33 +03:00
Nikolay Korolev
85d815cf9d bug fixes 2020-02-15 23:30:51 +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
89be27734b a fix 2020-02-13 23:34:36 +03:00
eray orçunus
f307839a2b CPlayerPed done 2020-02-13 22:02:45 +03:00
Sergeanur
d1700b3257 Fixed random sound volume 2020-02-07 21:40:10 +02: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
9896217608 few little things 2020-02-04 00:27:48 +03:00
eray orçunus
ce0687db27 A bug fix and VC ports for veh. enter/exit 2020-02-03 21:03:48 +03:00
Sergeanur
0e2f7ff689
Merge pull request #321 from Sergeanur/audio_enums
Audio, use of enums and true/false
2020-02-02 16:56:22 +02:00
eray orçunus
03b995c6ef Some fixes and some cosmetic things 2020-02-02 16:58:52 +03:00
Sergeanur
72a4abd347 Audio, use of enums and true/false 2020-02-02 15:57:27 +02:00
Nikolay Korolev
911f3360de Merge remote-tracking branch 'upstream/master' 2020-02-02 15:22:35 +03:00
Nikolay Korolev
c794b59a7c
fixed firetruck crash 2020-02-02 15:22:17 +03:00
Nikolay Korolev
2baacf0e9e Merge remote-tracking branch 'upstream/master' 2020-02-02 14:47:16 +03:00
Nikolay Korolev
dc2516896f script 900-999 init 2020-02-02 14:47:03 +03:00
Nikolay Korolev
b0e4f40f44
fixed SET_BOAT_CRUISE_SPEED 2020-02-02 14:09:39 +03:00
Nikolay Korolev
bedf19c523
fixed police ignore bug 2020-02-02 13:29:13 +03:00
Nikolay Korolev
76b8e09de5 fix ai bug (2) 2020-02-02 12:28:23 +03:00
Nikolay Korolev
c1dc66c63e fixed ai bug 2020-02-02 03:21:21 +03:00
Nikolay Korolev
e4f1ab20f1 fixed bullion run 2020-02-02 01:43:04 +02:00
Sergeanur
c8f7732832 Replay crash fix 2020-02-01 23:01:25 +02:00
Sergeanur
2ff00bd0ee Fix HAS_OBJECT_BEEN_DAMAGED 2020-02-01 21:47:04 +02:00
Sergeanur
ff831a8956 Removed dup hook 2020-02-01 20:02:04 +02:00
Sergeanur
3d69148497 Added enum to OnscreenTimer, fixed mistakes in CCarCtrl::SteerAIBoatWithPhysicsHeadingForTarget 2020-02-01 18:40:54 +02:00
Sergeanur
e2f8ad983d Fix damage bar assert crash 2020-02-01 17:22:56 +02:00
Sergeanur
6e73d9220a Fix CTheScripts::AddToInvisibilitySwapArray 2020-02-01 15:10:46 +02:00
Sergeanur
03c2489937 Fix Projectile Air Resistance 2020-02-01 00:41:03 +02:00
Sergeanur
4f33668c88 Fix SET_BOAT_CRUISE_SPEED 2020-01-31 22:28:22 +02:00
Sergeanur
0c581ce86a Fix boat component 2020-01-31 21:02:08 +02:00
Sergeanur
79d2ab7619 More fixes 2020-01-31 19:16:13 +02:00
Sergeanur
74e215458b Fixing IS_AREA_OCCUPIED command 2020-01-31 17:31:24 +02:00
Sergeanur
afd6b43ffb Fixed wrong slot indexing in Frontend 2020-01-31 17:16:32 +02:00
Sergeanur
7df91ca2f9 Fix corrupt saves 2020-01-31 14:33:46 +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
8373db1e7a RC toyz crashfix 2020-01-31 12:12:49 +02:00
Sergeanur
3c550eb679 sizeofs n stuff 2020-01-31 10:12:36 +02:00
Sergeanur
2c8cce4655 suggested fixes 2020-01-30 18:15:27 +02:00