aap
|
e7c18fc17f
|
removed windows.h for most .cpps
|
2020-03-27 20:53:47 +01:00 |
|
aap
|
29f69f6216
|
Merge pull request #357 from aap/master
Finished CCam; various smaller things
|
2020-03-27 18:41:22 +01:00 |
|
aap
|
22e022cc9f
|
implemented some unused PS2 cams
|
2020-03-27 18:21:46 +01:00 |
|
aap
|
f0dfaac838
|
Finished CCam; various smaller things
|
2020-03-27 10:04:45 +01:00 |
|
eray orçunus
|
0fe55eb543
|
CCopPed 2 and fixes
|
2020-03-26 18:54:03 +03:00 |
|
aap
|
4e7c186285
|
change default script to story
|
2020-03-24 11:58:09 +01:00 |
|
Nikolay Korolev
|
861506d048
|
merge with upstream
|
2020-03-22 19:47:14 +03: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
|
0d1f42add1
|
Implement ProcessCrane
|
2020-03-22 17:30:54 +01:00 |
|
Nikolay Korolev
|
34b1881528
|
CGame::Initialise
|
2020-03-22 17:23:40 +03: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
|
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 |
|
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
|
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
|
28342405d3
|
Add Load/Save functions
|
2020-03-10 20:26:07 -07:00 |
|
Nikolay Korolev
|
1d8b3a216c
|
more utils
|
2020-03-05 01:10:09 +03:00 |
|
Nikolay Korolev
|
2058ca6bbb
|
more utils
|
2020-03-04 23:12:16 +03:00 |
|
Nikolay Korolev
|
d492390fec
|
script utils
|
2020-03-02 22:54:13 +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 |
|
Nikolay Korolev
|
aa5266b1b3
|
some cosmetic stuff
|
2020-02-23 02:29:38 +03:00 |
|
Nikolay Korolev
|
bc139e0702
|
ARRAY_SIZE
|
2020-02-22 17:53:28 +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
|
03b995c6ef
|
Some fixes and some cosmetic things
|
2020-02-02 16:58:52 +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
|
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
|
4f33668c88
|
Fix SET_BOAT_CRUISE_SPEED
|
2020-01-31 22:28:22 +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
|
43bd2227a8
|
CRemote
|
2020-01-31 12:23:15 +02:00 |
|
Sergeanur
|
8373db1e7a
|
RC toyz crashfix
|
2020-01-31 12:12:49 +02:00 |
|
Sergeanur
|
d52452e69f
|
PowerPoints
|
2020-01-20 18:59:28 +02:00 |
|
Sergeanur
|
bbc68ffb1c
|
AccidentManager
|
2020-01-11 15:14:02 +02:00 |
|
Sergeanur
|
8fab684283
|
move
|
2020-01-11 14:49:37 +02: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 |
|
Nikolay Korolev
|
c5e7de02fe
|
fixes
|
2020-01-04 01:10:35 +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
|
b307893c9d
|
bug fix
|
2020-01-01 15:16:38 +03:00 |
|
Nikolay Korolev
|
402ecd6305
|
fix merge with upstream
|
2020-01-01 02:55:00 +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
|
bb5e31470d
|
CPlayerPed & fixes
|
2019-12-28 23:05:49 +03:00 |
|
eray orçunus
|
04499bfbb6
|
CEmergencyPed done
|
2019-12-22 18:28:16 +03:00 |
|
eray orçunus
|
dad7782ff0
|
CPhone, CPlayerInfo, CFire, CWorld
|
2019-12-06 00:55:23 +03:00 |
|
eray orçunus
|
680fe0f7e6
|
CCivilianPed done & restore peds running to phone
|
2019-11-26 02:35:05 +03:00 |
|
eray orçunus
|
bd68b56b5d
|
CPed completed!
And a few fixes
|
2019-11-21 00:05:10 +03:00 |
|
eray orçunus
|
030f64daf1
|
Frontend, Peds & logic and overflow fixes
|
2019-11-13 01:16:23 +03:00 |
|
Nikolay Korolev
|
5ef291ddf2
|
Merge remote-tracking branch 'upstream/master' into script_dev
|
2019-11-09 16:44:36 +03:00 |
|
Nikolay Korolev
|
cc9a49d061
|
script stubs
|
2019-11-09 16:44:17 +03:00 |
|
eray orçunus
|
5bb217fcb6
|
Script fix
|
2019-11-01 12:32:31 +03:00 |
|
erorcun
|
34090ab4d6
|
Merge pull request #255 from Nick007J/master
script 500-599
|
2019-10-30 03:20:15 +03:00 |
|
Sergeanur
|
cce3aac4c3
|
Audio fixes
|
2019-10-27 19:04:13 +02:00 |
|
Nikolay Korolev
|
6224060627
|
Merge remote-tracking branch 'upstream/master' into script_dev
|
2019-10-27 12:51:24 +03:00 |
|
Nikolay Korolev
|
5e77e9d0ea
|
script 600-699
|
2019-10-27 12:51:09 +03:00 |
|
Sergeanur
|
998adfab90
|
Fixed use of boolean type for in CGameLogic
|
2019-10-26 21:24:26 +03:00 |
|
Nikolay Korolev
|
dcd2a94367
|
fix pager build
|
2019-10-26 17:27:48 +03:00 |
|
Nikolay Korolev
|
3dee880c29
|
merge
|
2019-10-26 17:20:31 +03:00 |
|
Nikolay Korolev
|
542e746f66
|
script 500-599
|
2019-10-26 17:16:39 +03:00 |
|
Sergeanur
|
d5a72fa597
|
Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode
|
2019-10-26 15:20:12 +03:00 |
|
Sergeanur
|
b6cb716452
|
Fixed CGameLogic::PassTime types
|
2019-10-26 14:35:45 +03:00 |
|
Filip Gawin
|
8808e6fdfe
|
Fixes for aap review (audio8)
|
2019-10-26 13:05:00 +02:00 |
|
Filip Gawin
|
d822417cfc
|
Fixes for nitpicks
|
2019-10-26 13:05:00 +02:00 |
|
Filip Gawin
|
43866a4f70
|
Fix rebasing
|
2019-10-26 13:05:00 +02:00 |
|
Filip Gawin
|
12ee71e4f7
|
audio7
|
2019-10-26 13:05:00 +02:00 |
|
erorcun
|
1ef0f8fdd9
|
Merge pull request #252 from Sergeanur/MessagesPagerText
Full CMessages, full CPager, CText fixes
|
2019-10-24 00:45:05 +03:00 |
|
Nikolay Korolev
|
d579ee1b64
|
script 500-599 plus bugfix
|
2019-10-22 00:39:59 +03:00 |
|
Sergeanur
|
4844b3a3f8
|
Merge pull request #246 from Sergeanur/Pools
Some CPool and CPools funcs, restoring original logic of pool lookup loops
|
2019-10-21 16:09:44 +03:00 |
|
Sergeanur
|
e35780df43
|
Full Messages
|
2019-10-21 01:11:47 +03:00 |
|
aap
|
0759dbc1e1
|
Merge pull request #248 from Nmzik/master
CPopulation::Initialise() && CGame::Process() && CGame::ReloadIPLs()
|
2019-10-20 14:33:43 +02:00 |
|
Sergeanur
|
9d4140734f
|
Moved CCutsceneMgr::ms_cutsceneProcessing to private
|
2019-10-19 16:47:30 +03:00 |
|
nmzik
|
f56684d04e
|
CGame::Process() && CGame::ReloadIPLs
|
2019-10-19 01:23:40 +03:00 |
|
nmzik
|
32f2f3511c
|
CPopulation::Initialise()
|
2019-10-18 15:36:40 +03:00 |
|
Sergeanur
|
3ba57c5f6a
|
Gangs save and missed sound enums
|
2019-10-17 13:21:31 +03:00 |
|
Sergeanur
|
5b1ffb0912
|
Some CPool and CPools funcs, restoring original logic of pool lookup loops
|
2019-10-17 00:53:25 +03:00 |
|
erorcun
|
38565a47a1
|
Merge branch 'master' into master
|
2019-10-16 23:42:04 +03:00 |
|
Sergeanur
|
5c36eae89f
|
More PathFind fixes
|
2019-10-14 22:58:22 +03:00 |
|
Sergeanur
|
9d2b7a99b3
|
Some PathFind fixes (not all)
|
2019-10-14 21:13:23 +03:00 |
|
Nikolay Korolev
|
f93285df79
|
Merge remote-tracking branch 'upstream/master' into script_dev
|
2019-10-14 00:44:48 +03:00 |
|
eray orçunus
|
37f0bbc05e
|
PathFind fix and some Peds
|
2019-10-14 00:33:18 +03:00 |
|
Sergeanur
|
26c8c56623
|
Fixed unsigned time check in CDarkel
|
2019-10-13 22:44:39 +03:00 |
|
Nikolay Korolev
|
545bd3322c
|
quick fix
|
2019-10-13 20:13:39 +03:00 |
|
Nikolay Korolev
|
2411558bab
|
copypaste error
|
2019-10-13 20:12:15 +03:00 |
|
Nikolay Korolev
|
8eda735918
|
400-499
|
2019-10-13 14:46:09 +03:00 |
|
Nikolay Korolev
|
a1700eeaa4
|
Merge branch 'master' into script_dev
|
2019-10-12 22:24:58 +03:00 |
|
Nikolay Korolev
|
225ad5d78e
|
Merge pull request #237 from Nick007J/master
fixes
|
2019-10-12 22:23:37 +03:00 |
|
Nikolay Korolev
|
bd6ded198b
|
fixes
|
2019-10-12 22:19:54 +03:00 |
|
Sergeanur
|
1fed8e9482
|
Fixed floating package pickups
|
2019-10-12 22:03:44 +03:00 |
|
Nikolay Korolev
|
c78fff8d54
|
script 400-499 start
|
2019-10-12 22:00:31 +03:00 |
|
Sergeanur
|
47e98306c7
|
Merge pull request #231 from Sergeanur/Restart
Full CRestart
|
2019-10-12 17:32:10 +03:00 |
|
Sergeanur
|
03833f9e11
|
Fixed iteration typo
|
2019-10-12 17:28:38 +03:00 |
|
Nikolay Korolev
|
a34870645a
|
blunder
|
2019-10-12 13:42:34 +03:00 |
|
Sergeanur
|
7c6c649823
|
Fix typo in CCarAI::GetCarToGoToCoors
|
2019-10-12 12:16:39 +03:00 |
|
Sergeanur
|
2977164918
|
Typo fix
|
2019-10-12 12:05:38 +03:00 |
|
erorcun
|
f70c2ad54f
|
Merge pull request #230 from Nick007J/master
CCarAI, CCurves, CAutoPilot
|
2019-10-11 02:39:16 +03:00 |
|
Sergeanur
|
3768473cd6
|
Full CRestart
|
2019-10-11 01:54:08 +03:00 |
|
Sergeanur
|
0408b30a9f
|
Merge pull request #229 from Sergeanur/SaveLoadTemplates
Added read/write template functions for save data
|
2019-10-11 01:51:25 +03:00 |
|
Nikolay Korolev
|
803412f33b
|
CCarAI + bugfixes
|
2019-10-11 00:02:55 +03:00 |
|
Sergeanur
|
ffed52b94f
|
CMoneyMessages moved to SpecialFX.cpp
|
2019-10-10 19:17:35 +03:00 |
|
Sergeanur
|
aa173a454c
|
Fix CCarGenerator Load/Save
|
2019-10-10 17:18:19 +03:00 |
|
Nikolay Korolev
|
80a74d2e77
|
fixed stupid bug
|
2019-10-09 01:00:51 +03:00 |
|
Nikolay Korolev
|
9e5a5f2ab6
|
Merge remote-tracking branch 'upstream/master' into carctrl_dev
|
2019-10-08 23:57:58 +03:00 |
|
Nikolay Korolev
|
4b4e5abffd
|
fixed bugs
|
2019-10-08 23:57:21 +03:00 |
|
Sergeanur
|
101192dd32
|
Added read/write template functions for save data, small Load/Save arguments unification
|
2019-10-08 23:07:11 +03:00 |
|
Sergeanur
|
69963cea68
|
Full CGameLogic
|
2019-10-08 17:13:23 +03:00 |
|
eray orçunus
|
d5d1c7ec5f
|
Peds
|
2019-10-07 00:39:25 +03:00 |
|