Commit graph

999 commits

Author SHA1 Message Date
in0finite
5143587b01 improve button container in pause menu 2020-05-31 19:09:55 +02:00
in0finite
709f2e8ede some UI adjustments 2020-05-31 19:09:55 +02:00
in0finite
5c9b83d240 remove unneeded code 2020-05-31 19:09:55 +02:00
in0finite
101069ce0a convert speedometer 2020-05-31 19:09:55 +02:00
in0finite
d7db52c142 don't show label when ped is in flying state 2020-05-31 19:09:55 +02:00
in0finite
7243560fe0 convert ped state label 2020-05-31 19:09:54 +02:00
in0finite
c7111469fb re-save prefabs 2020-05-31 19:09:54 +02:00
in0finite
ef83e9aed5 fix errors 2020-05-31 19:09:54 +02:00
in0finite
c77f6c471d removed imGUI code 2020-05-31 19:09:54 +02:00
in0finite
91d98f9741 make texture no longer readable 2020-05-31 19:09:54 +02:00
in0finite
587354248d correctly construct crosshair texture 2020-05-31 19:09:54 +02:00
in0finite
cac960800f working on crosshair 2020-05-31 19:09:54 +02:00
in0finite
93398fb2fb weapon image, weapon ammo, and healthbar are working 2020-05-31 19:09:54 +02:00
in0finite
4dd463919d remove no longer used script 2020-05-31 19:09:54 +02:00
in0finite
9993959810 adapt main menu to MenuBar 2020-05-31 19:09:54 +02:00
in0finite
0aaa8b7769 remove unused code 2020-05-31 19:09:54 +02:00
in0finite
33b57668dd restore canvas statuses 2020-05-31 19:09:54 +02:00
in0finite
c3d7447a7e delete PedestrianModelViewerUI script 2020-05-31 19:09:54 +02:00
in0finite
d59672aa34 don't read input on some places when not allowed 2020-05-31 19:09:54 +02:00
in0finite
6786ab5e76 convert chat input 2020-05-31 19:09:54 +02:00
in0finite
2f26d16183 rename variable 2020-05-31 19:09:54 +02:00
in0finite
147abe2af6 convert pause menu label 2020-05-31 19:09:54 +02:00
in0finite
089cf387fb remove commented code 2020-05-31 19:09:54 +02:00
in0finite
9009db198d remove some imGUI code 2020-05-31 19:09:54 +02:00
in0finite
e6b3a9f300 menu entries are now components ; fix sorting of menu entries ; 2020-05-31 19:09:54 +02:00
in0finite
29920c8bfa adjust size and position of menu bar 2020-05-31 19:09:54 +02:00
in0finite
0b62ec3c0a remove test button from prefab 2020-05-31 19:09:54 +02:00
in0finite
f54a8fe60d enable/disable canvas on Start() 2020-05-31 19:09:54 +02:00
in0finite
23cbd6163d register Resume and Exit entries 2020-05-31 19:09:54 +02:00
in0finite
1185732b28 first working version of new pause menu 2020-05-31 19:09:54 +02:00
in0finite
541f4c333a create canvas for pause menu 2020-05-31 19:09:54 +02:00
in0finite
3b9b41794a delete pausemenu prefab ; group all windows at one game object ; 2020-05-31 19:09:54 +02:00
in0finite
13d3418fef extract "Settings" game object to a prefab 2020-05-31 19:09:54 +02:00
in0finite
439353e588 reduce font size again 2020-05-31 19:09:54 +02:00
in0finite
87313b1b7b reduce font size for main menu button 2020-05-31 19:09:54 +02:00
in0finite
92d7088784 remove unused code 2020-05-31 19:09:54 +02:00
in0finite
9d76c56ac0 re-enable canvas for touch input 2020-05-31 19:09:54 +02:00
in0finite
477bab3d31 create custom event system which makes it possible to use imGUI and new UI at the same time 2020-05-31 19:09:54 +02:00
in0finite
b4d48ac4c7 change button color 2020-05-31 19:09:54 +02:00
in0finite
19abce4017 change button text color when window is opened 2020-05-31 19:09:54 +02:00
in0finite
bea171a7e6 dynamically adjust font size of button text 2020-05-31 19:09:53 +02:00
in0finite
76aad79d40 only enable main menu canvas in startup scene 2020-05-31 19:09:53 +02:00
in0finite
8cf1c143df remove unused code 2020-05-31 19:09:53 +02:00
in0finite
6597c53735 don't draw menu items from OnGUI() 2020-05-31 19:09:53 +02:00
in0finite
540e6a83f5 some adjustments 2020-05-31 19:09:53 +02:00
in0finite
dbbcdb4e80 convert Exit button 2020-05-31 19:09:53 +02:00
in0finite
d0138fcca7 convert logo 2020-05-31 19:09:53 +02:00
in0finite
b2ee510576 convert background 2020-05-31 19:09:53 +02:00
in0finite
6b58fdf964 main menu buttons almost done 2020-05-31 19:09:53 +02:00
in0finite
552e4453e0 remove GXT window because GXT is not loaded currently 2020-05-31 19:09:53 +02:00
in0finite
a217af283a re-save ped prefab 2020-05-31 19:09:53 +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
e3d81d0c03 don't log warnings for bones with id -1 2020-05-31 19:09:53 +02:00
in0finite
e8581c0fee support loading anims which have invalid bone ids 2020-05-31 19:09:53 +02:00
in0finite
ee2922b241 add vehicle offset to misc stats 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
792eb923e9 improve UI 2020-05-31 19:09:52 +02:00
in0finite
1cf178f274 fix IndexOutOfRange ex 2020-05-31 19:09:52 +02:00
in0finite
3c9cf45144 add search box for IFP file names 2020-05-31 19:09:52 +02:00
in0finite
59ac34ac3f display IFP names in scroll view 2020-05-31 19:09:52 +02:00
in0finite
21c8de6b1c fix loading anims when bone id is -1 2020-05-31 19:09:52 +02:00
in0finite
162d07f254 remove extension from IFP file names 2020-05-31 19:09:52 +02:00
in0finite
0414727c46 don't try to display IFP clips if IFP is not loaded 2020-05-31 19:09:52 +02:00
in0finite
c5c6e44c3e fix obtaining all IFP files 2020-05-31 19:09:52 +02:00
in0finite
194c1ceb6d add ability to display all IFP packages in anim window 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
99b015406a update submodule 2020-05-31 19:09:51 +02:00
in0finite
da9b52eeda ... 2020-05-31 19:09:51 +02:00
in0finite
aec5a46ccd add scripts to prefab 2020-05-31 19:09:51 +02:00
in0finite
5ed306d137 send chat on Enter 2020-05-31 19:09:51 +02:00
in0finite
030726add0 remove chat messages periodically 2020-05-31 19:09:51 +02:00
in0finite
5a4b6ebbe9 make some vars available in Inspector 2020-05-31 19:09:51 +02:00
in0finite
ad2b733e2a extract ChatInputDisplay class 2020-05-31 19:09:51 +02:00
in0finite
3c9168e295 make some vars available in Inspector 2020-05-31 19:09:51 +02:00
in0finite
d703a8cae9 extract ChatDisplay class 2020-05-31 19:09:51 +02:00
in0finite
36c96062aa assign SEO 2020-05-31 19:09:51 +02:00
in0finite
9c2da03e99 display chat even when pause menu is opened 2020-05-31 19:09:51 +02:00
in0finite
d6b810f606 chat message can be sent 2020-05-31 19:09:51 +02:00
in0finite
e7272ef710 draw chat 2020-05-31 19:09:51 +02:00
in0finite
f41fa4b591 change SEO of chat scripts 2020-05-31 19:09:51 +02:00
in0finite
ace5f0d444 attach scripts to prefabs 2020-05-31 19:09:51 +02:00
in0finite
d7e9db901b add scripts 2020-05-31 19:09:51 +02:00
in0finite
c3382928c2 implement network discovery 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
in0finite
c512aaad1d only reset settings if they changed 2020-05-31 19:09:51 +02:00
in0finite
9da08b7dba settings are properly resetted 2020-05-31 19:09:51 +02:00
in0finite
d164ce3d2b working on resetting settings to default values 2020-05-31 19:09:51 +02:00
in0finite
d8480a2522 ignore culture when saving int and float settings 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
76de9c1230 don't draw enexes by default 2020-05-31 19:09:50 +02:00
in0finite
0c447546ec draw all exterior enexes 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
b9d409a31c improve enex look ; enex can be animated 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
3367c59b45 fix for not displaying first enex location 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
cb46cf795e remove quotes from enex name 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
9f7861673a move enex spawn position up by a little, because some enexes are placed below objects 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
31a1903b94 TeleportWindow uses enexes as teleport locations, if exterior is not loaded 2020-05-31 19:09:50 +02:00
in0finite
dee7833ab7 use TransformDataStruct in TeleportWindow 2020-05-31 19:09:50 +02:00
in0finite
267c5d00a1 create TransformDataStruct struct 2020-05-31 19:09:50 +02:00
in0finite
a3f73edef8 read ENEX section of IPL files 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
29bffc2c11 don't duplicate uv array 2020-05-31 19:09:50 +02:00
in0finite
cd6210d2cc don't duplicate colors array 2020-05-31 19:09:50 +02:00
in0finite
cd972e2dd3 don't duplicate normals array 2020-05-31 19:09:50 +02:00
in0finite
b14268f646 don't duplicate vertices array 2020-05-31 19:09:50 +02:00
in0finite
75d08f874e don't obtain vertices from Mesh, use the already created array 2020-05-31 19:09:50 +02:00
in0finite
8ea6795084 remove some usages of ToArray() when loading geometry 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
41b801b7a7 "makeNoLongerReadable" can be specified when loading texture 2020-05-31 19:09:50 +02:00
in0finite
595bf531ff change access modifiers from internal to public 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
0627b1c45a create asmdef file for SanAndreasUnity.Importing 2020-05-31 19:09:50 +02:00
in0finite
2f1e2eeb4b SanAndreasUnity.Utilities is a separate assembly 2020-05-31 19:09:50 +02:00
in0finite
078ac0ee7a try to load from "sfx" folder if "SFX" folder does not exist 2020-05-31 19:09:50 +02:00
in0finite
7acadc016d delete audio library 2020-05-31 19:09:49 +02:00
in0finite
a08850d45a add classes from audio library 2020-05-31 19:09:49 +02:00
in0finite
3b7433ceb3 create folder and asmdef file for audio importing 2020-05-31 19:09:49 +02:00
in0finite
22c0f06d12 change default IP address in JoinGame window 2020-05-31 19:09:49 +02:00
in0finite
b529073da5 load water using case-sensitive paths 2020-05-31 19:09:49 +02:00