Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-23 12:33:02 +00:00
Code Issues Projects Releases Packages Wiki Activity
1160 commits 16 branches 10 tags 181 MiB
Commit graph

1110 commits

Author SHA1 Message Date
in0finite
d37d601082 peds can not damage other peds in the same vehicle 2020-06-03 02:12:40 +02:00
in0finite
21644998cb rename variable 2020-06-03 01:10:38 +02:00
in0finite
e740307084 change projectile raycast mask 2020-06-03 00:41:39 +02:00
in0finite
cb495440cd fix camera being blocked by vehicle's high detail meshes 2020-06-03 00:27:18 +02:00
in0finite
d9a728b244 destroy high detail mesh objects when vehicle is destroyed 2020-06-02 23:56:36 +02:00
in0finite
23e75f180c change camera aim offset 2020-06-02 23:50:30 +02:00
in0finite
8880d6030a update all relevant children 2020-06-02 23:48:40 +02:00
in0finite
92feb469fb create separate game object with mesh colliders 2020-06-02 22:40:46 +02:00
in0finite
c5b8d7df6d add new layer for vehicle high detail mesh 2020-06-02 20:44:08 +02:00
in0finite
71d18bbe6d change way of specifying which object should be ignored when raycasting - peds can not damage other peds in the same vehicle 2020-06-01 14:58:51 +02:00
in0finite
e9ef2f709d better specify which object should be ignored when raycasting 2020-05-31 19:09:58 +02:00
in0finite
199a008b12 correctly identify Transform that was hit by a bullet - this fixes a bug when ped could not be damaged while in vehicle 2020-05-31 19:09:58 +02:00
in0finite
2fec510ce3 display inflicted damage as on-screen message 2020-05-31 19:09:58 +02:00
in0finite
2cb2ddf099 implement on-screen messages 2020-05-31 19:09:58 +02:00
in0finite
83659395e1 run exception-safe 2020-05-31 19:09:58 +02:00
in0finite
756f7e8563 move Damageable class to Utilities assembly 2020-05-31 19:09:57 +02:00
in0finite
f2c9e5ff75 inflict damage based on part of body that was hit 2020-05-31 19:09:57 +02:00
in0finite
b203a0b667 weapon's projectile raycasts are made against ped bones 2020-05-31 19:09:57 +02:00
in0finite
8f56469b28 camera can move through "PedBone" layer 2020-05-31 19:09:57 +02:00
in0finite
d675a8b4a4 provide layer as property 2020-05-31 19:09:57 +02:00
in0finite
f607d50483 run exception-safe 2020-05-31 19:09:57 +02:00
in0finite
483c7b8564 add box collider for area around neck 2020-05-31 19:09:57 +02:00
in0finite
adc03cc3aa add sphere collider around jaw 2020-05-31 19:09:57 +02:00
in0finite
e945f9f54e ragdoll bones are set up 2020-05-31 19:09:57 +02:00
in0finite
89dab83847 fix errors 2020-05-31 19:09:57 +02:00
in0finite
ad7b8e50fe add script 2020-05-31 19:09:57 +02:00
in0finite
ec7417c510 ... 2020-05-31 19:09:57 +02:00
in0finite
3d3b697076 don't destroy the clip with delayed Destroy() 2020-05-31 19:09:57 +02:00
in0finite
1b19e38bc6 when stopping radio sound, save radio station's time only if audio source is playing 2020-05-31 19:09:57 +02:00
in0finite
8e8e495633 destroy radio clip when stopping radio sound ; destroy radio clip when vehicle gets destroyed ; 2020-05-31 19:09:57 +02:00
in0finite
ce6cc33d97 re-save prefab 2020-05-31 19:09:57 +02:00
in0finite
f3490beb80 change access modifiers 2020-05-31 19:09:57 +02:00
in0finite
fe4ae08ca6 display radio station label for limited amount of time - 3 seconds after ped enters vehicle or radio station is changed 2020-05-31 19:09:57 +02:00
in0finite
6bbdcecd7d remember time when radio station changed 2020-05-31 19:09:57 +02:00
in0finite
a68efa0b7d remember time when seat's ped changed 2020-05-31 19:09:57 +02:00
in0finite
cff2be9531 rename method 2020-05-31 19:09:57 +02:00
in0finite
cdb561c4a7 assign random radio station in Awake(), not Start() 2020-05-31 19:09:57 +02:00
in0finite
15711064c4 change width of radio station label 2020-05-31 19:09:57 +02:00
in0finite
5237c849ba display radio station name 2020-05-31 19:09:57 +02:00
in0finite
ea840f8b5e add stats about current vehicle's radio 2020-05-31 19:09:57 +02:00
in0finite
d29a1e1a4e refactor 2020-05-31 19:09:57 +02:00
in0finite
8134b8a1d9 properly detecting when ped is assigned to vehicle and removed from vehicle ; fix radio playing ; wait some time before loading sound of radio station ; 2020-05-31 19:09:57 +02:00
in0finite
5d20cac976 move all radio related stuff to appropriate partial class 2020-05-31 19:09:57 +02:00
in0finite
9dd132532b don't send navigation events because it's buggy and can send events to invisible UI objects 2020-05-31 19:09:57 +02:00
in0finite
8a8f2ab423 only toggle map window if it is opened or if reading input is allowed 2020-05-31 19:09:57 +02:00
in0finite
4d646c853d small optimization for finding closest vehicle/seat 2020-05-31 19:09:57 +02:00
in0finite
0e130999f4 fix bug when peds were not able to enter any vehicle when there was a vehicle with no seats spawned 2020-05-31 19:09:57 +02:00
in0finite
19b6c25432 correctly position the minimap 2020-05-31 19:09:56 +02:00
in0finite
3d81bd25ca use RawImage for minimap texture 2020-05-31 19:09:56 +02:00
in0finite
96dd3fe706 set Z position of some minimap elements to 0 2020-05-31 19:09:56 +02:00
in0finite
190178fac5 disable FPS text and texture by default 2020-05-31 19:09:56 +02:00
in0finite
1ebf03dcb6 change default camera distance from ped and vehicle 2020-05-31 19:09:56 +02:00
in0finite
3b7d466ba6 move speedometer a little to the right 2020-05-31 19:09:56 +02:00
in0finite
e1a6fd9201 change transparency and highlighted/pressed color for main menu buttons, pause menu buttons, chat input 2020-05-31 19:09:56 +02:00
in0finite
ae273868d3 change highlighted and pressed color for main menu button 2020-05-31 19:09:56 +02:00
in0finite
f8ac93380b update controls window text 2020-05-31 19:09:56 +02:00
in0finite
f0949c0233 change SEO of some scripts 2020-05-31 19:09:56 +02:00
in0finite
f90732229d change SEO of some scripts 2020-05-31 19:09:56 +02:00
in0finite
5188399ff8 change object names 2020-05-31 19:09:56 +02:00
in0finite
54b4763f9a uncheck raycasttarget 2020-05-31 19:09:56 +02:00
in0finite
674662635e re-save prefab 2020-05-31 19:09:56 +02:00
in0finite
5fb94bf22d crosshair looks a little better 2020-05-31 19:09:56 +02:00
in0finite
c661e13b88 remove unneeded variables 2020-05-31 19:09:56 +02:00
in0finite
9c0bcd747b refactor 2020-05-31 19:09:56 +02:00
in0finite
88cd91d0bd use auto property 2020-05-31 19:09:56 +02:00
in0finite
aec6481050 refactor 2020-05-31 19:09:56 +02:00
in0finite
91f9c55540 remove some unneeded variables 2020-05-31 19:09:56 +02:00
in0finite
1eb6dbadda remove 'toggleInfo' variable 2020-05-31 19:09:56 +02:00
in0finite
1cfe3b80b1 ReadInput() is slightly faster 2020-05-31 19:09:56 +02:00
in0finite
bdbec0bdeb remove OnGUI() function 2020-05-31 19:09:56 +02:00
in0finite
496333b26d remove commented code 2020-05-31 19:09:56 +02:00
in0finite
602f3beb4d refactor 2020-05-31 19:09:56 +02:00
in0finite
03c451d0a9 move input reading to LateUpdate() ; remove Update() because it's no longer needed ; 2020-05-31 19:09:56 +02:00
in0finite
eb7123be57 refactor 2020-05-31 19:09:56 +02:00
in0finite
525ca5a287 read input only when minimap is visible 2020-05-31 19:09:56 +02:00
in0finite
dc37e76e6b extract input reading into a method 2020-05-31 19:09:56 +02:00
in0finite
9d4ca5aae6 don't update stuff when minimap is not visible 2020-05-31 19:09:56 +02:00
in0finite
0668cf62f1 move zoom updating from FixedUpdate() to LateUpdate() 
FixedUpdate() is now removed
 2020-05-31 19:09:56 +02:00
in0finite
7a57f6b266 retrieve zone name on every 2 seconds 2020-05-31 19:09:56 +02:00
in0finite
d44757a739 ... 2020-05-31 19:09:56 +02:00
in0finite
df6bfa45ba minimap now has focus position 2020-05-31 19:09:56 +02:00
in0finite
355a3276a5 ... 2020-05-31 19:09:56 +02:00
in0finite
804d8108c0 remove unneeded class with extension method 2020-05-31 19:09:56 +02:00
in0finite
72e090419a rename class 2020-05-31 19:09:56 +02:00
in0finite
dd335e439f put zone classes into namespace 2020-05-31 19:09:56 +02:00
in0finite
ccd0a9f1b1 optimize functions for getting zone - they don't allocate memory anymore and are faster 2020-05-31 19:09:55 +02:00
in0finite
b1f6c2b8fa convert zone name 2020-05-31 19:09:55 +02:00
in0finite
e415d019fc use RawImage for player icon 2020-05-31 19:09:55 +02:00
in0finite
5d4367fa3e zooming of minimap works 2020-05-31 19:09:55 +02:00
in0finite
d404419d5f minimap seems to be converted 2020-05-31 19:09:55 +02:00
in0finite
811c28aa98 enable minimap canvases 2020-05-31 19:09:55 +02:00
in0finite
8ebbac83dc remove some unneeded code 2020-05-31 19:09:55 +02:00
in0finite
241f97a501 ... 2020-05-31 19:09:55 +02:00
in0finite
99624f1598 remove private variable because it's not needed 2020-05-31 19:09:55 +02:00
in0finite
55fc88b5b4 use correct delta time value 2020-05-31 19:09:55 +02:00
in0finite
592de8bc7d use 1 bool to control if FPS should be updated 2020-05-31 19:09:55 +02:00
in0finite
dc283954e5 don't display FPS by default 2020-05-31 19:09:55 +02:00
in0finite
d5ca8ac00d change color of labels to white 2020-05-31 19:09:55 +02:00
in0finite
b4b524f9c2 fix chat display 2020-05-31 19:09:55 +02:00
in0finite
761fb9383c chat display almost finished 2020-05-31 19:09:55 +02:00
in0finite
c370702d49 don't toggle FPS display with F10 2020-05-31 19:09:55 +02:00
in0finite
5c675e2def add "Display FPS" setting 2020-05-31 19:09:55 +02:00
in0finite
d293d0783f remove unused code 2020-05-31 19:09:55 +02:00
in0finite
6100b013df rename variables 2020-05-31 19:09:55 +02:00
in0finite
efd9f7b4f7 remove milliseconds from FPS display 2020-05-31 19:09:55 +02:00
in0finite
40e8f6386d change color of FPS text 2020-05-31 19:09:55 +02:00
in0finite
6fbb632eb6 change sort order of canvases 2020-05-31 19:09:55 +02:00
in0finite
fcbf323219 convert FPS display 2020-05-31 19:09:55 +02:00
in0finite
f9b7034c85 add search box to vehicle spawner window 2020-05-31 19:09:55 +02:00
in0finite
1ff5e44e79 fix touch input - enable canvas when touch input is enabled 2020-05-31 19:09:55 +02:00
in0finite
bd2d9489db improve chat input field 2020-05-31 19:09:55 +02:00
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