Commit graph

604 commits

Author SHA1 Message Date
in0finite
d59672aa34 don't read input on some places when not allowed 2020-05-31 19:09:54 +02:00
in0finite
2eb36c245f fix lower shooting rate 2020-05-31 19:09:53 +02:00
in0finite
9db8019d9a extract GetFirePosition() and GetFireDirection() into IAimState interface/classes - states now control fire position and direction ; drive-by aiming now works for AWA weapons (they no longer aim up in the sky) ; 2020-05-31 19:09:53 +02:00
in0finite
d0badd78cf don't clear raycast buffer - I think that there is no need for that 2020-05-31 19:09:53 +02:00
in0finite
c5aa931715 use larger buffer for storing raycasts - this is needed because vehicle is consisted of many colliders which can be on a path of a ray 2020-05-31 19:09:53 +02:00
in0finite
5ede80b85e check also if ignored object is parent of hit object 2020-05-31 19:09:53 +02:00
in0finite
a7ad315260 when drawing line from gun, use the last used WeaponAttackParams - this will properly visualize aim direction when in drive-by state 2020-05-31 19:09:53 +02:00
in0finite
6e3cf54a02 trying to ignore object when raycasting 2020-05-31 19:09:53 +02:00
in0finite
0c620cc228 refactor firing system to use additional parameters - this will make it possible to ignore current vehicle when firing in drive-by state 2020-05-31 19:09:53 +02:00
in0finite
ca40df585d cleanup 2020-05-31 19:09:53 +02:00
in0finite
886edc3084 adjust camera focus position and camera distance 2020-05-31 19:09:53 +02:00
in0finite
a2e9d3f971 camera offset is configurable 2020-05-31 19:09:53 +02:00
in0finite
a9f665bc33 camera handling works, but needs improvements 2020-05-31 19:09:53 +02:00
in0finite
42946f3a02 convert CheckCameraCollision() to static method 2020-05-31 19:09:53 +02:00
in0finite
0dffb495c6 aim anim max time is equal to half of the anim length 2020-05-31 19:09:53 +02:00
in0finite
bc05cb0b4c manually update aim anim ; don't play anim while firing, but pause it ; stop firing when weapon is ready to fire, not when anim reaches certain time ; 2020-05-31 19:09:53 +02:00
in0finite
212d1187ff drive-by firing WIP 2020-05-31 19:09:53 +02:00
in0finite
18136f279f convert other TryFire() to static function 2020-05-31 19:09:53 +02:00
in0finite
3a9b07cf7b convert TryFire() to static function 2020-05-31 19:09:53 +02:00
in0finite
84b2d4209c update anims from the right place 2020-05-31 19:09:53 +02:00
in0finite
cbf874da6c anims are finally playing correctly 2020-05-31 19:09:53 +02:00
in0finite
c7db8963ff attempt to play driveby anims 2020-05-31 19:09:53 +02:00
in0finite
7f384860b5 small cleanup 2020-05-31 19:09:52 +02:00
in0finite
e2d1702e6b change anim wrap mode 2020-05-31 19:09:52 +02:00
in0finite
531e787515 play correct anim 2020-05-31 19:09:52 +02:00
in0finite
e50a1e70e2 drive-by WIP 2020-05-31 19:09:52 +02:00
in0finite
33b8d217aa small fix 2020-05-31 19:09:52 +02:00
in0finite
c5c8f2c75b any NPC ped can be recruited 2020-05-31 19:09:52 +02:00
in0finite
193577d9b5 stalker peds can be recruited 2020-05-31 19:09:52 +02:00
in0finite
c4d9fcc924 read G and H button events 2020-05-31 19:09:52 +02:00
in0finite
ecc17aef6d add button pressed event which uses button name 2020-05-31 19:09:52 +02:00
in0finite
688b2c0015 proper switching to/from sprint state 2020-05-31 19:09:52 +02:00
in0finite
b38a2faf49 "CellIds" is no longer available in Inspector 2020-05-31 19:09:51 +02:00
in0finite
4acc23dacd ignore next collision with first enex too 2020-05-31 19:09:51 +02:00
in0finite
8d93a7f2c5 use small raycast distance when teleporting through enexes 2020-05-31 19:09:51 +02:00
in0finite
5fb330cbb0 raycast distance for finding ground is configurable 2020-05-31 19:09:51 +02:00
in0finite
a1751c7ba4 refactor FindGroundParams 2020-05-31 19:09:51 +02:00
in0finite
85cd5867a6 load all interiors 2020-05-31 19:09:51 +02:00
in0finite
a12f8aebc1 ignore next collision with second enex 2020-05-31 19:09:51 +02:00
in0finite
66d1709492 teleport only to different interiors 2020-05-31 19:09:51 +02:00
in0finite
14f9e0bd34 remember first and second enex ; teleport from second enex back to first enex 2020-05-31 19:09:51 +02:00
in0finite
c2c84b4c91 rename var 2020-05-31 19:09:51 +02:00
in0finite
9dd1dad363 log matching enexes 2020-05-31 19:09:51 +02:00
in0finite
7920363002 add loading step for enexes 2020-05-31 19:09:51 +02:00
in0finite
d32ee2dc72 ... 2020-05-31 19:09:51 +02:00
in0finite
028d74331f only teleport to enex's counterpart on server 2020-05-31 19:09:51 +02:00
in0finite
a34e9e27d1 don't ignore collision with enex if current enex is disabled 2020-05-31 19:09:51 +02:00
in0finite
d82c42a906 teleport ped to enex's counterpart when collided 2020-05-31 19:09:51 +02:00
in0finite
c78d25f269 report enex collisions to ped 2020-05-31 19:09:51 +02:00
in0finite
39f7e1b6b3 destroy current clip before loading new one 2020-05-31 19:09:51 +02:00
in0finite
424880aa78 ... 2020-05-31 19:09:51 +02:00
in0finite
fb4dd66724 play radio only if ped is in vehicle seat 2020-05-31 19:09:51 +02:00
in0finite
7e3865491d rename var 2020-05-31 19:09:51 +02:00
in0finite
34b92f9980 start radio only for local ped ; and start it from the right place 2020-05-31 19:09:51 +02:00
in0finite
36c96062aa assign SEO 2020-05-31 19:09:51 +02:00
jaan242
92bbc4bd53 radio (#69)
* radio

* radio 2

* radio 3

* radio 4
2020-05-31 19:09:51 +02:00
jaan242
c99cf04494 moved speedometer label to the right (#67) 2020-05-31 19:09:51 +02:00
in0finite
8ca984d91c fix bug 2020-05-31 19:09:51 +02:00
in0finite
8ddd78367d skip creating enexes for now 2020-05-31 19:09:51 +02:00
in0finite
f42900d56c don't override cell ids in Awake() 2020-05-31 19:09:50 +02:00
in0finite
1c0609b83a enexes are not re-activated when in range 2020-05-31 19:09:50 +02:00
in0finite
ebf9e10eac ... 2020-05-31 19:09:50 +02:00
in0finite
1efa38ff84 map window draws enexes 2020-05-31 19:09:50 +02:00
in0finite
1bdc7226e5 animate enex 2020-05-31 19:09:50 +02:00
in0finite
47c43384ed adjust y position of enex 2020-05-31 19:09:50 +02:00
in0finite
4b6c42ef61 create enex objects from prefab 2020-05-31 19:09:50 +02:00
in0finite
c78200c80f create enex objects in the world 2020-05-31 19:09:50 +02:00
in0finite
7d35fb4971 load all interiors 2020-05-31 19:09:50 +02:00
in0finite
362241aace don't call OnSpawn() from PedModel, but instead find ground from Start()
this will make sure that ped's starting position does not change before call to FindGround()
2020-05-31 19:09:50 +02:00
in0finite
24af9dfa4a use enex exit positions as spawn positions for players, if exterior is not loaded 2020-05-31 19:09:50 +02:00
in0finite
6bcf1b4c91 refactor 2020-05-31 19:09:50 +02:00
in0finite
eedd411520 obtain spawn positions at the moment when they are needed ; don't create game objects that act as spawn positions 2020-05-31 19:09:50 +02:00
in0finite
deda364ec8 SpawnManager uses TransformDataStruct for storing spawn positions 2020-05-31 19:09:50 +02:00
in0finite
615f8d33cd more precise positioning after ground is found 2020-05-31 19:09:50 +02:00
in0finite
a06fd323db when teleporting ped, assign his heading too 2020-05-31 19:09:50 +02:00
in0finite
b2f427b67c assign starting position at the start of coroutine 2020-05-31 19:09:50 +02:00
in0finite
86fa29c345 better log messages 2020-05-31 19:09:50 +02:00
in0finite
a84e5f38dc apply "tryFromAbove" parameter when finding ground 2020-05-31 19:09:50 +02:00
in0finite
60f685dd70 don't assign initial Y position when finding ground 2020-05-31 19:09:50 +02:00
in0finite
25d1e30efa add ability to pass parameters to FindGround() 2020-05-31 19:09:50 +02:00
in0finite
b3d082dbe2 improve division gizmos 2020-05-31 19:09:50 +02:00
in0finite
0698429c25 changed the way how distance is calculated from division to point 2020-05-31 19:09:50 +02:00
in0finite
98bd42cf97 fix for situation when LOD child is located in different render level 2020-05-31 19:09:50 +02:00
in0finite
d872f163ac draw better gizmos for Division 2020-05-31 19:09:50 +02:00
in0finite
17128d22a4 add comment 2020-05-31 19:09:50 +02:00
in0finite
5169f5155e remove logs 2020-05-31 19:09:50 +02:00
in0finite
6a92422a2c remove unreachable code 2020-05-31 19:09:50 +02:00
in0finite
1050ec790d fix for mouse texture 2020-05-31 19:09:50 +02:00
in0finite
b87a273f77 don't keep the big minimap texture in memory 2020-05-31 19:09:50 +02:00
in0finite
ab07ff11a6 leave minimap textures in memory 2020-05-31 19:09:50 +02:00
in0finite
167f5b92d6 move LoadingThread to SanAndreasUnity.Utilities assembly 2020-05-31 19:09:50 +02:00
in0finite
cb7497baa6 move Frame and FrameContainer to SanAndreasUnity.Importing assembly 2020-05-31 19:09:50 +02:00
in0finite
b529073da5 load water using case-sensitive paths 2020-05-31 19:09:49 +02:00
in0finite
5067d02f32 load weapons data using case-sensitive paths 2020-05-31 19:09:49 +02:00
in0finite
f4362ce41b load car colors using case-sensitive paths 2020-05-31 19:09:49 +02:00
in0finite
cbcba8a221 load anim groups using case-sensitive paths 2020-05-31 19:09:49 +02:00
in0finite
be2df19fb5 load handling use case-sensitive paths 2020-05-31 19:09:49 +02:00
in0finite
43f44a6f00 load items using case-sensitive paths 2020-05-31 19:09:49 +02:00
in0finite
51bc383830 archives are loaded case-insensitively 2020-05-31 19:09:49 +02:00
in0finite
e0f296bfd2 remove default SEO 2020-05-31 19:09:49 +02:00
in0finite
2adea110ab change SEO of scripts which had it configured in code 2020-05-31 19:09:49 +02:00
in0finite
4fd93a4465 adjust SEO of some scripts which had it assigned 2020-05-31 19:09:49 +02:00
in0finite
186ba140ed change script execution order for all (?) scripts 2020-05-31 19:09:49 +02:00
in0finite
9970b7917d skip loading GXT - temporary fix for #32 2020-05-31 19:09:49 +02:00
in0finite
5a947badfa PlayerController uses UIManagers' onGUI event 2020-05-31 19:09:49 +02:00
in0finite
76340b481b UIManager provides onGUI event 2020-05-31 19:09:49 +02:00
in0finite
a384877191 sync aim direction for host's ped 2020-05-31 19:09:49 +02:00
in0finite
fca5096eba some GXT fixes 2020-05-31 19:09:49 +02:00
AlexWei
e236f7d032 Import gxt (#23)
* import GTX code

import GTX code
add some empty function before integrate

* set gtx path

* refactor code

* fix typo and ui prefab

change gtx to gxt

remove window from start scene and add it in prefab

* add language interface

add language interface;
add some todo comments;
change file tab; make it consistent with project.

* fix game path and typo

add test ui

* add ui part

* fix set gui style pos

it will cause bug in ctor

* add pages to gxt ui

* revert changes to startup scene
2020-05-31 19:09:49 +02:00
in0finite
8f89386e05 remove code for loading SFX bank timings 2020-05-31 19:09:48 +02:00
in0finite
2d46334c54 update audio library 2020-05-31 19:09:48 +02:00
in0finite
c03e940847 font size changes with screen resolution 2020-05-31 19:09:48 +02:00
in0finite
fb302bf086 camera distance is configurable 2020-05-31 19:09:48 +02:00
in0finite
c1840327d0 Loader: display error in text area ; display exit button below error 2020-05-31 19:09:48 +02:00
in0finite
5c845e244e file browser has better size 2020-05-31 19:09:48 +02:00
in0finite
46d9529277 add ability to adjust UI in editor too 2020-05-31 19:09:48 +02:00
in0finite
78718a3a16 make sliders wider 2020-05-31 19:09:48 +02:00
in0finite
1d4fea1d7b set default physics update rate 2020-05-31 19:09:48 +02:00
in0finite
eb124927e5 fix cursor locking while touch input is enabled 2020-05-31 19:09:48 +02:00
in0finite
12e37dc2fe comment log 2020-05-31 19:09:48 +02:00
in0finite
049a339f97 change SEO of UIManager 2020-05-31 19:09:48 +02:00
in0finite
d42489b7e6 font size can be configured in options 2020-05-31 19:09:48 +02:00
in0finite
de459d92d6 change font size and scrollbar size on mobile 2020-05-31 19:09:47 +02:00
in0finite
64b0ab230c VehicleController reads input from custom input 2020-05-31 19:09:47 +02:00
in0finite
b1fc9c8d8c using appropriate input buttons based on whether the ped is driving vehicle or not 2020-05-31 19:09:47 +02:00
in0finite
e6ecbc01e4 remove HUD related code from state class 2020-05-31 19:09:47 +02:00
in0finite
1ad26f11ed implement movement button with arrows 2020-05-31 19:09:47 +02:00
in0finite
0afbaa9d4e aim button works 2020-05-31 19:09:47 +02:00
in0finite
4045311d59 preserve input for some buttons 2020-05-31 19:09:47 +02:00
in0finite
da20c52e05 load arrow textures 2020-05-31 19:09:47 +02:00
in0finite
cb7c1418d2 move all HUD drawing functions to BaseScriptState 2020-05-31 19:09:47 +02:00
in0finite
f2b4059c49 add fire button 2020-05-31 19:09:47 +02:00
in0finite
3db52f9849 add action buttons for touch input 2020-05-31 19:09:47 +02:00
in0finite
563f526003 improve movement buttons 2020-05-31 19:09:47 +02:00
in0finite
13f94bf27d don't draw hud when input should not be read 2020-05-31 19:09:47 +02:00
in0finite
2596a88be6 draw touch input for movement 2020-05-31 19:09:47 +02:00
in0finite
8ff92619ff working on touch input 2020-05-31 19:09:47 +02:00
in0finite
986a6a3c74 use custom input in PlayerController 2020-05-31 19:09:47 +02:00
in0finite
2f8d697935 working on touch input 2020-05-31 19:09:47 +02:00
in0finite
1d8677654a use different value for default max fps on mobile 2020-05-31 19:09:47 +02:00
in0finite
e97e36a9a4 sfx bank timings are loaded from resources 2020-05-31 19:09:46 +02:00
in0finite
42892654df custom anim groups are loaded from resources 2020-05-31 19:09:46 +02:00
in0finite
de0cb01239 state can draw it's own hud 2020-05-31 19:09:46 +02:00
in0finite
a6713c24da send only the current wheel state, and prevent memory leak bug in Mirror 2020-05-31 19:09:46 +02:00
in0finite
626567e289 some improvements for roll state 2020-05-31 19:09:46 +02:00
in0finite
95120b46d3 client detects when roll direction changes, and plays anim again 2020-05-31 19:09:46 +02:00
in0finite
2e7289d1b4 use base64 encoding for converting between string and byte array 2020-05-31 19:09:46 +02:00
in0finite
d18a226925 fix only the broken anim 2020-05-31 19:09:46 +02:00
in0finite
8cde278b13 try to fix skeleton while running with weapon 2020-05-31 19:09:46 +02:00
in0finite
d380eaeb55 trying to fix passenger anim 2020-05-31 19:09:46 +02:00
in0finite
8cae6c9206 fix memory leak related to anim clips 2020-05-31 19:09:46 +02:00
in0finite
6ffaf6a552 rename methods 2020-05-31 19:09:46 +02:00
in0finite
257645ba7f cache weapon audio clips 2020-05-31 19:09:46 +02:00
in0finite
bec4139a68 try to fix position of passenger 2020-05-31 19:09:46 +02:00
in0finite
2a56f7f336 'DontLoadTextures' can be configured 2020-05-31 19:09:46 +02:00
in0finite
b1fdbf4256 don't draw vehicles on minimap 2020-05-31 19:09:46 +02:00
in0finite
09daa45721 display vehicles on minimap 2020-05-31 19:09:46 +02:00
in0finite
853a264750 ... 2020-05-31 19:09:46 +02:00
in0finite
75ab5d5d9b sync offset 2020-05-31 19:09:46 +02:00
in0finite
eade6fc3d8 extract method 2020-05-31 19:09:46 +02:00
in0finite
a5cda1b996 assign offset every frame 2020-05-31 19:09:46 +02:00
in0finite
62d6925020 store vehicle parent offset 2020-05-31 19:09:46 +02:00
in0finite
c6143c3647 prevent possible NRE 2020-05-31 19:09:45 +02:00
in0finite
1a7a4d5471 prevent possible NRE 2020-05-31 19:09:45 +02:00
in0finite
59ca8f3d77 adjust root frame position in crouch state 2020-05-31 19:09:45 +02:00
in0finite
aba5c41ffd extract method 2020-05-31 19:09:45 +02:00
in0finite
7f6ca3f4aa fix possible NRE 2020-05-31 19:09:45 +02:00
in0finite
0127b0d392 send fire position to server 2020-05-31 19:09:45 +02:00
in0finite
3ff374aefa weapon can't damage owner ped 2020-05-31 19:09:45 +02:00
in0finite
0db8b63c1a draw line from weapon only if that is the current weapon 2020-05-31 19:09:45 +02:00
in0finite
bae6676196 using fire direction from client when trying to fire 2020-05-31 19:09:45 +02:00
in0finite
7983812074 send fire direction to server 2020-05-31 19:09:45 +02:00
in0finite
a1601341e6 fixing fire direction on clients 2020-05-31 19:09:45 +02:00
in0finite
b38bf70f8b preserve movement input 2020-05-31 19:09:45 +02:00
in0finite
dc16ede651 roll direction is synced 2020-05-31 19:09:45 +02:00
in0finite
1a66200d70 client uses 'loop' wrap mode for roll anim 2020-05-31 19:09:45 +02:00
in0finite
c67acba8b2 vehicle states now wait for vehicle to be assigned before starting their stuff 2020-05-31 19:09:45 +02:00
in0finite
d34ab7d4fe move method to other class 2020-05-31 19:09:45 +02:00
in0finite
7de0dd7cdb removed unneeded methods 2020-05-31 19:09:45 +02:00
in0finite
94b7404e4f client checks if vehicle is spawned every frame 2020-05-31 19:09:45 +02:00
in0finite
30b1176ee7 play passenger anim every frame 2020-05-31 19:09:45 +02:00
in0finite
b467859ce5 extract method 2020-05-31 19:09:45 +02:00
in0finite
63ce71bec6 check if anim state is null 2020-05-31 19:09:45 +02:00
in0finite
854b0c1856 check if state is still active 2020-05-31 19:09:45 +02:00
in0finite
e3bdea9647 small optimization 2020-05-31 19:09:45 +02:00
in0finite
269ffca20f fix NRE in IsDrivingVehicle 2020-05-31 19:09:45 +02:00
in0finite
e9b944cad5 fix NRE in GetCameraFocusPos() 2020-05-31 19:09:45 +02:00
in0finite
57bb127345 now sending net id of current vehicle 2020-05-31 19:09:45 +02:00
in0finite
b7a09ee1eb add date to log 2020-05-31 19:09:44 +02:00
in0finite
7e55789ef6 add date to log 2020-05-31 19:09:44 +02:00
in0finite
e835786257 fix NRE in EnableOrDisableGunFlash() 2020-05-31 19:09:44 +02:00
in0finite
fe257c58ec remove some spamming logs 2020-05-31 19:09:44 +02:00
in0finite
df12bf2b65 create weapon from prefab 2020-05-31 19:09:44 +02:00
in0finite
a645e5e8dc improve vehicle spawning API, and add ability to request specific vehicle 2020-05-31 19:09:44 +02:00
in0finite
85fe74bacc ped stalker's target is assigned 2020-05-31 19:09:44 +02:00
in0finite
f513eff625 PedStalker can follow any ped, not just local ped 2020-05-31 19:09:44 +02:00
in0finite
204aeb5d42 add ability to spawn ped around any transform 2020-05-31 19:09:44 +02:00
in0finite
bfa6e330f3 implement weapon related requests 2020-05-31 19:09:44 +02:00
in0finite
eb7c90f0ab sync health 2020-05-31 19:09:44 +02:00
in0finite
e5ef9e03c7 sync weapon fire event 2020-05-31 19:09:44 +02:00