Commit graph

781 commits

Author SHA1 Message Date
in0finite
dc25586fd0 don't try to display GXT data if data is not loaded 2020-05-31 19:09:49 +02:00
in0finite
d5edce8675 rename vars 2020-05-31 19:09:49 +02:00
in0finite
59bcc3cce6 PauseMenuWindow uses UIManager's onGUI event 2020-05-31 19:09:49 +02:00
in0finite
a36fd8c6ca add Unity callbacks to PauseMenuWindow 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
2eabea6626 skip gui layout phase when window is not drawn 2020-05-31 19:09:49 +02:00
in0finite
617185f8ea more improvements for FPS counter 2020-05-31 19:09:49 +02:00
in0finite
4e985092ff update texture in Update() 2020-05-31 19:09:49 +02:00
in0finite
e44516949d profile FPS counter 2020-05-31 19:09:49 +02:00
in0finite
0eedc21fb2 don't create new color array every frame 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
6da3108432 don't disable vehicle's rigid body 2020-05-31 19:09:48 +02:00
in0finite
2a8381d4b0 fix WhenOnClient.Matches() 2020-05-31 19:09:48 +02:00
in0finite
26130bb1ef restore default physics update rate to 50 2020-05-31 19:09:48 +02:00
in0finite
459ee23946 display info about current clip 2020-05-31 19:09:48 +02:00
in0finite
e163290126 improve gui in audio window 2020-05-31 19:09:48 +02:00
in0finite
2fd586cfe0 remove SFX timings file 2020-05-31 19:09:48 +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
c7d05fcb23 fix for displaying wrong value for physics update rate 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
2f9c78bd6f increase font size 2020-05-31 19:09:48 +02:00
in0finite
fb302bf086 camera distance is configurable 2020-05-31 19:09:48 +02:00
in0finite
d138ac9a66 better size of Utilities 2020-05-31 19:09:48 +02:00
in0finite
fc19910b3e small improvements 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
47cdbeda11 adapt Utilities to high screen density 2020-05-31 19:09:48 +02:00
in0finite
891ab1c719 improve Options 2020-05-31 19:09:48 +02:00
in0finite
920d4e00b4 apply min button width and height in main menu 2020-05-31 19:09:48 +02:00
in0finite
f28aeeb82a use box style for scroll view in options 2020-05-31 19:09:48 +02:00
in0finite
c17559b80b draw main menu entries with respect to font size 2020-05-31 19:09:48 +02:00
in0finite
5bdcf84ee0 better 'Clear' button 2020-05-31 19:09:48 +02:00
in0finite
d58482d524 StartGame and JoinGame windows better behave with different font sizes 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
b481c9dbcb make ped movement button larger 2020-05-31 19:09:48 +02:00
in0finite
45a79c4da7 change touchPointerSensitivity 2020-05-31 19:09:48 +02:00
in0finite
f0c103b81d fix error 2020-05-31 19:09:48 +02:00
in0finite
759eb3c8b8 check if int and float values are inside range when loading them 2020-05-31 19:09:48 +02:00
in0finite
e58b567b5d physics update rate is configurable 2020-05-31 19:09:48 +02:00
in0finite
1d4fea1d7b set default physics update rate 2020-05-31 19:09:48 +02:00
in0finite
c0e07ec303 apply mouse sensitivity to touch input 2020-05-31 19:09:48 +02:00
in0finite
691fd3f58a increase max value for mouse sensitivity 2020-05-31 19:09:48 +02:00
in0finite
ebc9225977 increase font size 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
f70680aeb7 better behaviour for some windows with dynamic font size 2020-05-31 19:09:48 +02:00
in0finite
12e37dc2fe comment log 2020-05-31 19:09:48 +02:00
in0finite
49ebfc6a9b some improvements for FileBrowser 2020-05-31 19:09:48 +02:00
in0finite
74ce1ddc95 remove font size from options 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
4895134fd2 save UI prefab 2020-05-31 19:09:48 +02:00
in0finite
c93313b2d1 default server IP can be changed in inspector 2020-05-31 19:09:47 +02:00
in0finite
4dca58ff2e assign mouse move input based on panel's drag events 2020-05-31 19:09:47 +02:00
in0finite
de459d92d6 change font size and scrollbar size on mobile 2020-05-31 19:09:47 +02:00
in0finite
c8f846eb61 add predefined directory for Android 2020-05-31 19:09:47 +02:00
in0finite
d74a809d95 lock cursor 2020-05-31 19:09:47 +02:00
in0finite
ee64560d4b use pointer position from last event 2020-05-31 19:09:47 +02:00
in0finite
074f7d0d98 adjust size and position of turn button 2020-05-31 19:09:47 +02:00
in0finite
cdf5b1e981 add vehicle turn multiplier 2020-05-31 19:09:47 +02:00
in0finite
aa160093c3 weapon switching done 2020-05-31 19:09:47 +02:00
in0finite
2f1d7fd2ea create weapon switching buttons 2020-05-31 19:09:47 +02:00
in0finite
9d7970b551 reenable ped input 2020-05-31 19:09:47 +02:00
in0finite
a21d835b47 handbrake, backward, forward buttons done ? 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
f85a7d813b vehicle turning input done ? 2020-05-31 19:09:47 +02:00
in0finite
56bee753ed exit vehicle button done 2020-05-31 19:09:47 +02:00
in0finite
60c733e1cc create vehicle touch input 2020-05-31 19:09:47 +02:00
in0finite
64c7e28b63 disable mouse move input while movement button is pressed 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
5ed74ff3d1 remove some unused code 2020-05-31 19:09:47 +02:00
in0finite
1117d03c63 remove spamming logs 2020-05-31 19:09:47 +02:00
in0finite
8abab27068 change SEO of HUD and FPSDisplay 2020-05-31 19:09:47 +02:00
in0finite
2135d3f979 change SEO of TouchInput 2020-05-31 19:09:47 +02:00
in0finite
956bfd3c63 change position of buttons 2020-05-31 19:09:47 +02:00
in0finite
f88e904fa8 change active button color 2020-05-31 19:09:47 +02:00
in0finite
6622ecd5a1 action buttons are working 2020-05-31 19:09:47 +02:00
in0finite
1ad26f11ed implement movement button with arrows 2020-05-31 19:09:47 +02:00
in0finite
15ddef4cfd create movement button 2020-05-31 19:09:47 +02:00
in0finite
5b33399623 add action buttons 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
551fcf7988 don't lock cursor to allow for touch input testing 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
d53a8f1c5f remove comment from json file 2020-05-31 19:09:47 +02:00
in0finite
39077b1b06 add UIManager script to prefab 2020-05-31 19:09:47 +02:00
in0finite
8c03f86241 add custom input script to prefab 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
6e35c438bb custom input: add support for button-down, key-down, axisraw 2020-05-31 19:09:47 +02:00
in0finite
6e398f4b4a if button/key with specified name is not set in custom input, use value from default 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
904dcdef93 touch input can be toggled in options 2020-05-31 19:09:47 +02:00
in0finite
2f8d697935 working on touch input 2020-05-31 19:09:47 +02:00
in0finite
4539dfdfa2 custom input logic done ? 2020-05-31 19:09:47 +02:00
in0finite
dd544fef9a add 1 more predefined path for android 2020-05-31 19:09:47 +02:00
in0finite
e88487c8fd load gta3.img before loading game folder, because game path could be invalid 2020-05-31 19:09:47 +02:00
in0finite
85a370c043 rename anim group file, because Unity can't load text resources with .dat extension 2020-05-31 19:09:47 +02:00
in0finite
38e3a15e52 add some predefined paths in file browser, when on android 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
17db595e4c delete postprocessing script 2020-05-31 19:09:47 +02:00
in0finite
ebaee83e71 moved config.json to resources, and generated some meta files 2020-05-31 19:09:46 +02:00
in0finite
827aec1c9e config file is loaded from resources 2020-05-31 19:09:46 +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
814cb38cc9 anim group can be loaded from stream reader 2020-05-31 19:09:46 +02:00
in0finite
54f976de22 remove Update() 2020-05-31 19:09:46 +02:00
in0finite
31ba43228c move Data folder to resources 2020-05-31 19:09:46 +02:00
in0finite
5e0f3d747c move file to appropriate folder 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
5fe0a8fe46 destroy player's vehicles when he disconnects 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
9b73165fa4 game can work without loading textures 2020-05-31 19:09:46 +02:00
in0finite
1fab8740c5 add script to prefab 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
e0921d27d6 show info about collections 2020-05-31 19:09:45 +02:00
in0finite
af642a3c07 dequeue all elements at once 2020-05-31 19:09:45 +02:00
in0finite
4b06481527 change button dimensions 2020-05-31 19:09:45 +02:00
in0finite
bc4e862bb4 ... 2020-05-31 19:09:45 +02:00
in0finite
d6ca3a5331 ... 2020-05-31 19:09:45 +02:00
in0finite
cec406fc0a rename more vars 2020-05-31 19:09:45 +02:00
in0finite
f92115510f rename var 2020-05-31 19:09:45 +02:00
in0finite
c37482a436 add key shortcut for teleport 2020-05-31 19:09:44 +02:00
in0finite
f82245f10f increase buttons' height 2020-05-31 19:09:44 +02:00
in0finite
c58421be3c map window works when there is no local ped 2020-05-31 19:09:44 +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
3a6146d12c revert 2020-05-31 19:09:44 +02:00
in0finite
e5f704e524 change button text color for opened windows 2020-05-31 19:09:44 +02:00
in0finite
f7b2bdb933 fps display is time-scale independant 2020-05-31 19:09:44 +02:00
in0finite
8cd3265ba5 optimization 2020-05-31 19:09:44 +02:00
in0finite
5d197cd9cf update controls text 2020-05-31 19:09:44 +02:00
in0finite
8a0bbb1319 change size and position of controls window 2020-05-31 19:09:44 +02:00
in0finite
841f620fa9 set button height to 25 in file browser 2020-05-31 19:09:44 +02:00
in0finite
cefcf20510 limit number of messages in console to 200 2020-05-31 19:09:44 +02:00
in0finite
aba562a3f8 add weapon column to player stats 2020-05-31 19:09:44 +02:00
in0finite
68507d06f3 add weapon to spawnable prefabs list 2020-05-31 19:09:44 +02:00
in0finite
72b0554001 assign weapon prefab 2020-05-31 19:09:44 +02:00
in0finite
b2d5b9b4b7 add networkevents2messagebox script to prefab 2020-05-31 19:09:44 +02:00
in0finite
c84cdd1134 assign sort priorities 2020-05-31 19:09:44 +02:00
in0finite
fc49001762 main menu buttons have different text color when window is opened 2020-05-31 19:09:44 +02:00
in0finite
3b1dae27b3 rename method 2020-05-31 19:09:44 +02:00
in0finite
5b472d673b windows can be sorted in main menu 2020-05-31 19:09:44 +02:00
in0finite
f400009bcf implement MenuEntry 2020-05-31 19:09:44 +02:00
in0finite
aeab96e4b5 display msgbox when client disconnects 2020-05-31 19:09:44 +02:00