Commit graph

1171 commits

Author SHA1 Message Date
in0finite
e6c33e14ad some adjustments for StartGame window 2021-01-31 22:44:15 +01:00
in0finite
8659ae57b7 disable Start button while server is active 2021-01-31 21:18:30 +01:00
in0finite
1ba51c20c2 fix warnings 2021-01-31 21:03:51 +01:00
in0finite
0c20894a31 add namespace 2021-01-31 20:58:44 +01:00
in0finite
e6a48d4bf6 load all IMG archives that are found in loose archive 2021-01-31 20:08:48 +01:00
in0finite
442a0dab1a add more debug info 2021-01-31 16:45:55 +01:00
in0finite
a4ddd0fc0c continue if failed to load arrow textures 2021-01-31 03:45:14 +01:00
in0finite
336db81e51 continue if failed to load cursor texture 2021-01-31 03:29:51 +01:00
in0finite
c6dea949cf add possibility to skip minimap load 2021-01-31 03:21:02 +01:00
in0finite
6692eaec18 allow some lines to fail from weapon data file 2021-01-31 03:13:09 +01:00
in0finite
fed4e987f9 extract function 2021-01-31 03:12:22 +01:00
in0finite
715ec36f2f support car colors with duplicate car names 2021-01-31 02:52:04 +01:00
in0finite
5786cf7868 add method ArchiveManager.GetAllEntries() 2021-01-31 02:10:08 +01:00
in0finite
63c27c28a9 load anim groups using ArchiveManager 2021-01-31 02:07:57 +01:00
in0finite
02f08a6c03 support extended PedestrianType 2021-01-31 01:37:23 +01:00
in0finite
b065f68b51 handle situation when definition already exists 2021-01-31 01:36:17 +01:00
in0finite
fdc42b1946 read item file from ArchiveManager, not using File API ; don't throw exception if item file was not found, but log error 2021-01-31 01:35:10 +01:00
in0finite
20461c854b provide some statistics from loaded archives 2021-01-31 01:29:36 +01:00
in0finite
119dbb2db7 remove commented code 2021-01-31 00:16:09 +01:00
in0finite
3e764a7b59 more error-prone archive loading 2021-01-31 00:14:40 +01:00
in0finite
cf322da937 set invariant culture for all threads 2021-01-30 18:49:46 +01:00
in0finite
8780e3a0d6 adjust window size 2021-01-28 15:47:56 +01:00
in0finite
c59099dcf0 use only 1 message box for displaying errors 2021-01-28 15:01:22 +01:00
in0finite
2848638d8c re-enable gui - fix bug when window could not be dragged 2021-01-28 13:13:01 +01:00
in0finite
2c2a82ff7c disable IP button while client is connecting 2021-01-28 13:07:28 +01:00
in0finite
93fbe15ab1 use centered label style 2021-01-28 13:01:39 +01:00
in0finite
d821dc35f0 set timeout to 7 2021-01-27 02:08:16 +01:00
in0finite
ee89445e6f show message box when failed to refresh master server 2021-01-27 01:51:12 +01:00
in0finite
b4c0df123c extract function 2021-01-27 01:34:53 +01:00
in0finite
0d7ac7b6b4 don't refresh servers from Start() 2021-01-27 01:29:00 +01:00
in0finite
e3dc420d93 set register interval to 20 2021-01-27 01:25:43 +01:00
in0finite
6a6326fd45 set timeout 2021-01-27 01:20:36 +01:00
in0finite
a9a6bac1f8 add master server url 2021-01-27 01:19:28 +01:00
in0finite
1a5e433e28 ... 2021-01-26 23:30:36 +01:00
in0finite
29b14442b4 ... 2021-01-26 23:29:34 +01:00
in0finite
0bf16747b6 assign SEO 2021-01-26 23:29:17 +01:00
in0finite
df730095f3 use ConfigManager to load config 2021-01-26 23:29:01 +01:00
in0finite
3a662c34c8 adjust width 2021-01-26 23:01:20 +01:00
in0finite
d22e89bdf0 improve JoinGameWindow 2021-01-26 22:46:14 +01:00
in0finite
406af30d90 move script to another folder 2021-01-12 23:17:27 +01:00
in0finite
9f83eadabb add namespace 2021-01-12 23:12:23 +01:00
in0finite
cfab2fec73 improve master server's client 2021-01-12 23:11:10 +01:00
in0finite
c0167903eb Merge remote-tracking branch 'origin/dev' into feature/ragdoll 2021-01-12 22:12:37 +01:00
Spider134
9ef83a1ab5
Implement master server (#102)
* Added font importing

* Revert "Added font importing"

This reverts commit 31f3463097.

* Fix Loader.cs formatting

* Fix texture issue

* Revert "Fix texture issue"

This reverts commit 79c44f8069.

* Update FontsImporter.cs

* Add master server client

* Remove curly bracket

* Add missing tab and fix a issue

* Update MasterServerClient.cs

* Remove IP and fix an issue

* Added feedback for when a user refreshes the internet tab and added an error message when server registration fails.
2021-01-12 22:06:38 +01:00
in0finite
a713853140 Merge remote-tracking branch 'origin/dev' into feature/ragdoll 2021-01-12 21:58:27 +01:00
in0finite
206c67bc8d "request suicide" button will kill ped 2021-01-08 04:44:56 +01:00
in0finite
b7ab28fedf add "num rigid bodies in dead bodies" to misc stats 2021-01-08 03:00:03 +01:00
in0finite
ebaa36fb1a add "num bones in dead bodies" to misc stats 2021-01-08 02:57:39 +01:00
in0finite
be97e40457 cleanup 2021-01-08 02:52:10 +01:00
in0finite
2451514db1 use custom serialization 2021-01-08 02:40:45 +01:00
in0finite
4b20f5de34 ... 2021-01-08 00:18:46 +01:00
in0finite
38e205efc4 found almost perfect solution 2021-01-07 23:21:28 +01:00
in0finite
c8b44837af fix comments 2021-01-07 22:16:51 +01:00
in0finite
dcc65fa8c5 tried to use MovePosition()/MoveRotation(), but it doesn't work 2021-01-07 21:43:03 +01:00
in0finite
34b9613782 don't set rigid body to kinematic - it behaves a little better with high velocity 2021-01-07 21:35:14 +01:00
in0finite
9267660a97 configure interpolation in Inspector 2021-01-07 21:02:12 +01:00
in0finite
de8439ad31 add extension method 2021-01-07 21:00:02 +01:00
in0finite
2051451095 fix commented code 2021-01-07 20:59:36 +01:00
in0finite
7990d25ed5 extract SetPosition() and SetRotation() 2021-01-07 18:48:02 +01:00
in0finite
38d3035044 use struct for storing info about bones 2021-01-07 18:32:59 +01:00
in0finite
31d7d3c5dd apply initial velocities 2021-01-07 17:50:58 +01:00
in0finite
6b3e656ed7 extract SetVelocity() method 2021-01-07 17:47:45 +01:00
in0finite
2d5d67fc55 cleanup 2021-01-07 17:44:47 +01:00
in0finite
a9e70bf7cc cleanup 2021-01-07 16:51:30 +01:00
in0finite
506bca3faf cleanup 2021-01-07 15:43:56 +01:00
in0finite
34175971ae syncing is finally decent enough 2021-01-07 15:26:11 +01:00
Spider134
52533f836b
Add font loading (#101)
* Added font importing

* Revert "Added font importing"

This reverts commit 31f3463097.

* Fix Loader.cs formatting

* Fix texture issue

* Revert "Fix texture issue"

This reverts commit 79c44f8069.

* Update FontsImporter.cs
2021-01-06 20:46:56 +01:00
in0finite
68413a5c37 sync velocity 2021-01-05 22:58:47 +01:00
in0finite
20100a34aa add "dead body sync rate" setting 2021-01-05 21:32:20 +01:00
in0finite
8d400bfceb syncing works 2021-01-05 21:09:25 +01:00
in0finite
f9e320ce23 move creation of dead body to it's own class 2021-01-05 19:30:14 +01:00
in0finite
8469f18862 use prefab to spawn dead body 2021-01-05 18:21:57 +01:00
in0finite
75d9ca5f35 when vehicle explodes, all peds inside are killed - this also fixes Unity crash 2021-01-05 05:56:39 +01:00
in0finite
17f6aaeeda peds are killed with a separate function ; ragdoll is detached only when peds are killed, not destroyed 2021-01-05 05:18:47 +01:00
in0finite
acae61657d cleanup 2021-01-05 04:26:17 +01:00
in0finite
59097a00f2 apply force on dead body when it is hit by weapon 2021-01-05 04:20:46 +01:00
in0finite
c50bff84cd add setting for dead body lifetime 2021-01-05 03:28:14 +01:00
in0finite
003442d5b7 add num dead bodies to Misc stats 2021-01-05 03:10:00 +01:00
in0finite
3a5e237e06 add button to remove all dead bodies 2021-01-05 03:09:45 +01:00
in0finite
988e250981 ... 2021-01-04 23:32:28 +01:00
in0finite
aa95d082d9 use continuous dynamic CollisionDetectionMode for ragdoll 2021-01-04 22:11:55 +01:00
in0finite
9a224c0eca remove additionally added colliders from ragdoll (jaw, neck box) 2021-01-04 22:08:51 +01:00
in0finite
d6d5d660cf wip on ragdoll 2021-01-04 01:28:58 +01:00
in0finite
64680f7280 initial ragdoll stuff 2021-01-03 14:23:18 +01:00
in0finite
93809fd9d3 change order of tabs in Options window 2021-01-02 23:58:00 +01:00
in0finite
85ed0480e6 add setting for radio volume 2021-01-02 23:22:52 +01:00
in0finite
7431d4f010 remove commented code 2021-01-02 20:46:38 +01:00
in0finite
e18d335798 reorganize setting tabs 2021-01-02 20:46:19 +01:00
in0finite
56d28883cc add SoundSettings 2021-01-02 19:37:11 +01:00
in0finite
b411c1a3de change button name 2021-01-02 19:02:42 +01:00
in0finite
dfc039e94a send chat on Enter 2021-01-02 18:56:46 +01:00
in0finite
74a1d8f158 use InvokeEventExceptionSafe() for chat event 2021-01-02 17:35:46 +01:00
in0finite
b3188b6c11 assign SEO to scripts 2020-12-29 21:28:41 +01:00
in0finite
350f70ac9b don't create hinge joints for vehicle doors 2020-12-29 20:58:51 +01:00
in0finite
edceca030f extract function 2020-12-29 20:43:33 +01:00
in0finite
74bc44561f remove commented code 2020-12-29 20:36:35 +01:00
in0finite
95d6297d8a add setting for vehicle's detached part lifetime 2020-12-28 01:41:11 +01:00
in0finite
309c00b72d add event for when server changes status 2020-12-28 01:05:54 +01:00
in0finite
9d9b9743c5 spawn projectile on network 2020-12-26 23:57:51 +01:00
in0finite
e825ecb6d4 projectile should be visible on clients 2020-12-26 23:01:32 +01:00
in0finite
4eed0a4bbe implement acceleration 2020-12-26 20:07:05 +01:00
in0finite
7cba029b92 sync projectile 2020-12-26 18:45:42 +01:00
in0finite
0c751b0208 add setting for projectile reload time 2020-12-26 17:40:30 +01:00
in0finite
f04728934e ignore collision between projectiles 2020-12-22 02:24:00 +01:00
in0finite
80a5e0c538 rotate projectile while moving 2020-12-21 23:27:00 +01:00
in0finite
26ed669de8 use separate prefab for rocket explosion 2020-12-21 22:56:41 +01:00
in0finite
d32688155c remove commented code 2020-12-21 20:55:30 +01:00
in0finite
4acfe0e401 play projectile sound 2020-12-21 03:01:20 +01:00
in0finite
f61a4c829f fix warning 2020-12-21 02:10:26 +01:00
in0finite
1ca4b2d0ad ignore collision between shooter ped and projectile 2020-12-21 02:10:17 +01:00
in0finite
ec89abedd8 attach rocket model 2020-12-21 01:50:31 +01:00
in0finite
536c275a5e display rocket crosshair 2020-12-21 01:00:05 +01:00
in0finite
9ee8f0dfac implement reloading time - all weapons have it set to 0, except rockets 2020-12-20 22:27:29 +01:00
in0finite
00a95beb66 add namespace 2020-12-20 21:53:55 +01:00
in0finite
86e1187b5c implement base projectile system 2020-12-20 21:51:59 +01:00
Antonio Alexandru Ganea
c3aebc3826
RCON Support (#96)
* Added RCON dotnet submodule

* RCON Manager

* RCON works

* Switched inter-thread passing from tasks callbacks to BlockingCollection

* Cleanup

* Config based rcon port and password

* RCON is disabled by default in config

* Added SanAndreasUnity.RCON namespace to CommandInterpreter

* Pass command to main thread first and report progress afterwards

* Minor cleanup

* Removed InvalidOperationException as it was never possible

* Moved OnLoaderFinished code in RCONManager

* Added RCONManager script to prefab

* Added meta files
2020-11-01 23:51:03 +01:00
in0finite
29d5a04db9 assign SEO for on-screen message scripts 2020-07-11 15:37:17 +02:00
in0finite
8eea97c33d assign SEO to new scripts 2020-07-11 15:08:12 +02:00
in0finite
615491aab6 use InvariantCulture when (de)serializing colors 2020-07-05 22:35:21 +02:00
in0finite
5816570fd2 sync color of detached parts 2020-07-05 22:33:34 +02:00
in0finite
f926bb7c24 send color of detached part 2020-07-05 21:39:59 +02:00
in0finite
d5a51d595e newly connected clients can see already existing detached parts 2020-07-05 18:37:56 +02:00
in0finite
d31a39b6b4 display num of spawned network objects in Net stats 2020-07-05 13:50:22 +02:00
in0finite
e959d1c483 don't log error if frame is not child of vehicle, because some vehicles have multiple frames with the same name, and this causes error only on client, but not on server 2020-07-05 13:42:50 +02:00
in0finite
e649d483d2 safety check 2020-07-04 20:34:17 +02:00
in0finite
942453a2a4 check if frame is already detached before detaching it - this also fixes a bug on client when he was trying to detach already detached frame 2020-07-04 20:12:01 +02:00
in0finite
9c63b25d38 log error if frame is not child of vehicle 2020-07-04 19:11:39 +02:00
in0finite
96b0ac1f33 disable cooking options on MeshCollider 2020-07-04 19:11:09 +02:00
in0finite
e47d8d0adf explosion is synced 2020-07-04 18:52:23 +02:00
in0finite
24e1e7c27b remove unused code 2020-07-02 01:02:43 +02:00
in0finite
f82315f3ad rigid body sync works 2020-07-02 00:59:17 +02:00
in0finite
798dfd55ed ... 2020-07-01 23:36:49 +02:00
in0finite
a7fe0c7ef6 add safety check 2020-07-01 23:36:34 +02:00
in0finite
41e5223fc7 detached vehicle parts should be synced 2020-07-01 23:36:01 +02:00
in0finite
fbd23c0cce create NetworkRigidBody script 2020-07-01 23:32:40 +02:00
in0finite
6725e3ce57 do some logic only on server 2020-07-01 19:36:39 +02:00
in0finite
96829ef506 sync vehicle's health 2020-07-01 19:31:06 +02:00
in0finite
2e0108d662 cleanup code 2020-07-01 19:25:59 +02:00
in0finite
395bcdcf4b add some commented code related to petrolcap 2020-07-01 18:53:15 +02:00
in0finite
115821f2da add hit point and hit normal to DamageInfo class 2020-07-01 18:52:35 +02:00
in0finite
d6c79434a4 cache petrolcap transform 2020-06-29 21:57:44 +02:00
in0finite
ec43361325 play explosion sound 2020-06-29 19:08:04 +02:00
in0finite
99c1cf8ecc ped can not be damaged by explosion while he is in vehicle 2020-06-29 17:50:33 +02:00
in0finite
e5c6144706 ped damage handling is done by State classes 2020-06-29 17:12:48 +02:00
in0finite
9734b6f515 damage type can be specified when damaging object 2020-06-29 17:11:29 +02:00
in0finite
363ec0dd0e remove unused variable 2020-06-28 23:57:09 +02:00
in0finite
b8051fe2d9 don't use collider's transform position when checking for distance 2020-06-28 23:56:20 +02:00
in0finite
7da990e105 use bounds center if ClosestPoint() function does not work 2020-06-28 20:38:23 +02:00
in0finite
47c44355ba replace ExplosionPhysicsForce script from Standard Assets with custom script 2020-06-28 20:32:30 +02:00
in0finite
f865dd0051 vehicle's max health is calculated as power function of mass 2020-06-28 16:44:32 +02:00
in0finite
bfdb8a5ba0 use curve for adjusting damage over distance 2020-06-28 16:35:35 +02:00
in0finite
ba4e10bb3a explosion damage amount is a power function 2020-06-27 22:50:50 +02:00
in0finite
bc605534e6 draw gizmos sphere indicating explosion damage radius 2020-06-27 22:40:51 +02:00
in0finite
ba1ebf4213 don't try to damage ped if his health is <= 0 2020-06-27 22:12:22 +02:00
in0finite
16bd731403 ped can be damaged by explosion 2020-06-27 22:00:10 +02:00
in0finite
9d18c2ec55 inflict damage based on distance to closest point on all colliders 2020-06-27 21:55:04 +02:00
in0finite
b6b2037e97 explosion strength and upward modifier are proportional to squared root of vehicle's mass 2020-06-22 03:05:42 +02:00
in0finite
8871702e5b make some parameters configurable 2020-06-21 23:35:39 +02:00
in0finite
9678faa18a inflict damage to nearby objects 2020-06-21 18:21:15 +02:00
in0finite
b2af2ade90 add stats about vehicle's damage 2020-06-21 16:35:39 +02:00
in0finite
4b6223a025 change some params 2020-06-21 16:20:16 +02:00
in0finite
2e02d0dab2 modify strength of explosion based on vehicle mass 2020-06-21 15:43:19 +02:00
in0finite
44fe30d8df don't apply explosion force 2 times 2020-06-21 15:33:19 +02:00
in0finite
aaf9af8c3f destroy explosion when particle systems finish 2020-06-21 14:56:21 +02:00
in0finite
07d802ce8f add explosion VFX and explosion physics force 2020-06-21 14:15:20 +02:00
in0finite
c56dad1950 flame VFX done 2020-06-21 01:24:19 +02:00
in0finite
ea6e45b593 smoke VFX done 2020-06-21 00:33:55 +02:00
in0finite
d98643e70c explode exception-safe 2020-06-20 20:17:22 +02:00
in0finite
d4078d250e cleanup 2020-06-20 20:15:29 +02:00
in0finite
775af9f9cb apply different force amount on chassis 2020-06-20 19:56:55 +02:00
in0finite
b0cde397be randomize lifetime of detached parts 2020-06-20 18:06:24 +02:00
in0finite
bfb15e4c9c chassis have realistic mass 2020-06-20 18:05:12 +02:00
in0finite
075bfc3d2d detach chassis during explosion 2020-06-20 17:56:17 +02:00
in0finite
d4c8d83fcc add DescriptionForLogging property 2020-06-20 17:55:27 +02:00
in0finite
552043bcd7 cache "engine" transform 2020-06-20 16:23:53 +02:00
in0finite
7581f4ac0a unsubscribe from VehiclePhysicsConstants.Changed event when vehicle is destroyed 2020-06-20 16:21:29 +02:00
in0finite
b9852975af CmdRequestToDestroyMyVehicles() now explodes vehicles 2020-06-20 16:19:46 +02:00
in0finite
bd37b9f577 "Destroy all vehicles" button now explodes the vehicles, instead of destroying them 2020-06-20 16:18:09 +02:00
in0finite
41856f3def vehicle explosion logic done - vehicle parts are detached, have rigid bodies, and explosion force is applied to them 2020-06-20 16:16:11 +02:00
in0finite
5ba7751ef6 damaging vehicles works 2020-06-09 19:45:25 +02:00
in0finite
faf96838b9 implement basic vehicle damage logic 2020-06-09 18:34:15 +02:00
in0finite
29b7ae65f0 remove commented code 2020-06-06 20:45:44 +02:00
in0finite
19fc36d718 display info about messages in Misc stats 2020-06-06 20:04:10 +02:00
in0finite
81df1bb651 pool messages 2020-06-06 20:03:26 +02:00
in0finite
7623b3ce29 optimization 2020-06-06 19:02:43 +02:00
in0finite
cf0437e80a properly destroy messages 2020-06-06 18:41:50 +02:00
in0finite
394348745e converting on-screen messages to uGUI 2020-06-06 18:09:26 +02:00
in0finite
29ab0556c6 specify ignored layer mask for finding ground in Inspector 2020-06-06 15:54:04 +02:00
in0finite
fda86887f7 use random rotation when spawning players' peds 2020-06-06 00:53:26 +02:00
in0finite
9dc4f03c9f run exception safe 2020-06-06 00:45:53 +02:00
in0finite
dab056d48e fix for spawning peds at the same position 2020-06-06 00:40:47 +02:00
in0finite
fe557282eb fix for recruiting peds 2020-06-05 23:49:50 +02:00
in0finite
03a0f5c35e extract method 2020-06-05 23:22:30 +02:00
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
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
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