697f4132f2
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-14 02:02:19 +03:00
307b4ba079
Implement inventory syncing, fixes #10
2017-05-14 01:59:30 +03:00
excitedneon
5fafaad691
Add newlines to text rendering and display item info
2017-05-14 01:40:06 +03:00
43eb01e9de
Fixed DriveInterface and added a new exciting item!
2017-05-14 00:07:42 +03:00
excitedneon
9acd9f638f
Integrate inventory interface with inventory backend
2017-05-13 23:40:22 +03:00
a43b53112d
Fixed a bug in DriveInterface causing an exception
2017-05-13 23:21:29 +03:00
excitedneon
9503c3f716
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-13 23:01:26 +03:00
excitedneon
fc1c61e9df
Remake about a half of the inventory UI
2017-05-13 22:57:07 +03:00
966b3e1826
Add items and itemsystems, possibly a broken build
2017-05-13 22:55:07 +03:00
excitedneon
c338cd85e5
Resize hologram scanlines to be more visible
2017-05-12 21:30:17 +03:00
excitedneon
f43c3f837a
Add a text that explains the icons in the inventory
2017-05-12 21:27:01 +03:00
excitedneon
d266155e08
Fix text texture rendering resolution
2017-05-12 20:34:34 +03:00
excitedneon
b460793d87
Fix main scene, broke it last commit
2017-05-12 19:11:49 +03:00
excitedneon
1753a43f6d
Add scanlines to holograms and make inv icons two-sided
2017-05-12 19:11:19 +03:00
excitedneon
27c1e7a0c4
Fix docs and a mouse bug
2017-05-12 11:57:44 +03:00
excitedneon
e37b4af9fb
Make inventory interface partly usable
2017-05-12 11:53:57 +03:00
excitedneon
101e1eeb8e
Fix docs
2017-05-12 06:07:16 +03:00
excitedneon
1f473b16ee
Fix server's shutdown, add offsets to texttexes, inv-fe dev
2017-05-12 04:59:58 +03:00
767e8f811f
Add icons for inventory
2017-05-12 04:15:32 +03:00
excitedneon
1231201390
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-12 02:03:41 +03:00
excitedneon
a021e621b9
Implement InteractionTypes
2017-05-12 02:03:27 +03:00
7d72c625fd
Fix #8
2017-05-12 01:50:11 +03:00
542a8cc360
Create InteractionType and network it and fix some docs
2017-05-12 01:41:57 +03:00
excitedneon
127d7b1565
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-12 01:25:22 +03:00
excitedneon
60a83fa5b3
Add a Hologram prefab and update buttons to support >1 targets
2017-05-12 01:24:47 +03:00
7b7e1552ea
Fix syncing when hashes are not required
2017-05-12 01:24:34 +03:00
excitedneon
59fb38ff1b
Clean up a ghost directory's meta file
2017-05-12 00:54:15 +03:00
0a8cd2e3af
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-12 00:37:04 +03:00
7676602154
Fix #6 and add disconnect/unhost commands for convinience
2017-05-12 00:35:53 +03:00
excitedneon
1f36f3e1a4
Add a hologram model and make the screen a hologram
2017-05-12 00:34:56 +03:00
excitedneon
498fa4ff85
Fix the scrolling bug
2017-05-11 23:15:05 +03:00
excitedneon
7abde0d4cf
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-11 22:31:13 +03:00
excitedneon
4bb0e1c30c
Remove debug print
2017-05-11 22:31:07 +03:00
74cda9ff18
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-11 22:20:39 +03:00
d0b986116c
Fix missing documentation
2017-05-11 22:20:10 +03:00
excitedneon
fa6109e9ac
Sync and lerp rotation from server on the client side
2017-05-11 22:19:37 +03:00
excitedneon
710ef8d6b4
Remove debug print
2017-05-11 22:17:24 +03:00
5f3c56cf42
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-11 22:01:38 +03:00
1f87d83492
Fix #1
2017-05-11 22:00:52 +03:00
excitedneon
fa5129d147
Fix docs in Computer.cs
2017-05-11 21:05:43 +03:00
excitedneon
c5c9f662f1
Fix #2
2017-05-11 20:55:38 +03:00
excitedneon
9f307d7632
Fix text prop caching and an exception in Server.cs
2017-05-11 20:30:15 +03:00
excitedneon
d634e862ea
Add some computer functionality and fix a bug when setting static ids
2017-05-11 19:58:33 +03:00
excitedneon
189314ff60
Remove a debugging print
2017-05-11 06:25:57 +03:00
excitedneon
217a11c1a9
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-11 06:19:30 +03:00
excitedneon
6e5c2e1f63
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-11 06:19:20 +03:00
excitedneon
ec84bb38ad
Add a texture renderer for text textures
2017-05-11 06:13:52 +03:00
c6b2c6f8f4
Add missing docs
2017-05-11 06:13:02 +03:00
810f6a428f
Fix client receiving their own interaction messages
2017-05-11 05:03:07 +03:00
8f8aec70e3
Network and potentially sync interactions
2017-05-11 04:01:33 +03:00
excitedneon
af75616e2c
Rename BlinkyBox to Button, add doors, make them pink
2017-05-11 03:40:00 +03:00
f92a1d6f8c
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-11 01:52:59 +03:00
bcaf1e3e12
Add a subsystem for interaction syncing. Possibly borkd
2017-05-11 01:52:05 +03:00
excitedneon
674c43f2df
Fix a bug when console cleans up
2017-05-11 01:48:28 +03:00
excitedneon
2854a093fc
Move BlinkyBox, remove unused test cube, increase bloom
2017-05-11 00:48:21 +03:00
excitedneon
4d2ac2ce35
Make blinky box brighter and fix some BlinkyBox docs
2017-05-11 00:02:40 +03:00
excitedneon
9bb323ad07
Tweak post processing and debug console
...
- Tweak SSAO settings
- Add history browsing functionality to the console
- Add controls: "Previous Command" (up) and "Next Command" (down)
- Fix a bug in the console which prevented very long logs in the console
2017-05-10 20:30:30 +03:00
excitedneon
492502ef98
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-10 18:38:40 +03:00
excitedneon
3f022a975c
Add Interactable and a simple blinking lamp to interact with
2017-05-10 18:37:58 +03:00
2a96affea0
Make Syncer a bit neater and change "Client Launched" to "Connecting"
2017-05-10 17:34:16 +03:00
excitedneon
a5d5a7c9ef
Fix PlayerController not getting the CursorHandler
2017-05-10 16:16:19 +03:00
excitedneon
d80bfe84f5
Set best shadows to be more high res and organize TestMap
2017-05-10 16:11:50 +03:00
1d93d2b3ba
Add the test cube mentioned the commit before
2017-05-10 16:06:40 +03:00
8befb7324d
Add SyncBases namespace and add Test-cube for interaction
2017-05-10 16:05:02 +03:00
excitedneon
2debf88683
Fix DebugConsole scaling
2017-05-10 15:52:19 +03:00
excitedneon
7cde91340a
Make non-controlled characters' positions more accurate in the client
2017-05-09 19:42:48 +03:00
excitedneon
105022427b
Fix a serialization bug
2017-05-09 19:06:50 +03:00
excitedneon
419ac77a6a
Fix some more of the movement jitter problems
2017-05-09 18:59:12 +03:00
excitedneon
fc1e8085bc
Fix some of the movement jitter problems
2017-05-09 18:20:10 +03:00
fcd3aef1c9
Update Character.Deserialize so position synicing works
2017-05-09 17:32:17 +03:00
2357aa2da5
Put Character on CConnectedPlayer finally to use
2017-05-09 17:22:52 +03:00
87e3f31f9f
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-09 17:16:10 +03:00
excitedneon
54946df097
Fix accidental command bug in the console and unlink from Unity Services
2017-05-09 17:15:42 +03:00
1b32c0c550
Add basic syncing. Has no actual effect yet.
2017-05-09 17:15:21 +03:00
excitedneon
cbe7769e2b
Fix small but breaking bug from last commit
2017-05-09 13:32:39 +03:00
excitedneon
7a4a380f1a
Clean up lots of different things and add the 'shutdown' command
2017-05-09 13:30:56 +03:00
excitedneon
09c9829973
Modify character 'meshes' and add first person view
2017-05-09 13:11:36 +03:00
2239e336f5
Add timestamps to movement packets
2017-05-09 08:15:24 +03:00
897e797195
Make moving possible between clients
2017-05-09 07:15:34 +03:00
eb23f474c5
Make so that player see eachothers capsules staticly
2017-05-09 06:13:30 +03:00
0df99b4bc8
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-09 04:26:35 +03:00
504b2a08d4
Share network identities throughout clients
2017-05-09 04:25:04 +03:00
excitedneon
8b5c5b8d03
Fix a TODO in DebugConsole.
2017-05-09 01:23:55 +03:00
excitedneon
fca97636ea
Tweak and fix docs-related stuff.
2017-05-09 01:02:18 +03:00
7134c406f3
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-09 00:14:30 +03:00
08f5cdf3cd
Namespace Networking and seperate Client-/Serverside
2017-05-09 00:06:18 +03:00
excitedneon
36dad5e642
Create namespaces.
2017-05-09 00:03:02 +03:00
ac6e5dfe2a
Add docs to Server and NetworkEstablisher
2017-05-08 23:29:18 +03:00
56ff2536b9
Update Networking docs and put publics on top
2017-05-08 23:25:53 +03:00
excitedneon
fad6c0fc0c
Add more docs.
2017-05-08 22:59:35 +03:00
excitedneon
461705d1e3
Merge branch 'master' of github.com:Saltosion/Cyber
2017-05-08 22:15:00 +03:00
excitedneon
b57fd162c8
Add documentation for the console and a doxygen config.
2017-05-08 22:14:52 +03:00
ee393f2b87
Merge branch 'master' of https://github.com/Saltosion/Cyber
2017-05-08 22:13:07 +03:00
db87a13e7f
Make Client and Server Singletons and add Networking docs
2017-05-08 22:12:17 +03:00
excitedneon
4926530a49
Add convenience function for making entities with new IDs.
2017-05-08 21:21:03 +03:00
78dfe42106
Fixed two warnings in SyncDB ~cleanup
2017-05-08 19:39:39 +03:00
excitedneon
1f49f6a6f0
Decoupled IDs from the spawning system.
2017-05-08 06:20:29 +03:00
3bd2e17ab8
Added a small fun chat command
2017-05-08 04:42:18 +03:00
117f2ddfff
Added terminal commands for networking and fixed ui stuff
2017-05-08 04:31:32 +03:00
excitedneon
593f1ca9f8
Moved DebugConsole initialization to the ctr to enable printing in Starts.
2017-05-08 04:16:01 +03:00
