github.com/opensuspect/opensuspect commits | Ecosyste.ms: OpenCollective

Droping items at map swithcing debugged

17216229e2a8caef99b2e53d0bfbba430b1eecf5 authored over 2 years ago

Adds tilemap, and basic map layout

7921c655bf394e163c34b16fe0d5313c71182675 authored over 2 years ago

Merge branch 'main' into item-system

71792daac3e88731bd989180485d0737d0fbe270 authored over 2 years ago

Merge pull request #89 from moxvallix/exit-menu-quickfix

Added fullscreen exit menu as scene to be overlayed

fdc927687a36cf1effb9ecbfbaa543f9ec9696a9 authored over 2 years ago

Merge pull request #88 from opensuspect/item-system

Item system working prototype implemented.

423b93d53ef4f0097b5adb847e69936ca34fb5a8 authored over 2 years ago

Special item can activate its ability

* The ability activation related functions are refined
* The flask can now be emptied.

15281287951be4eaef13764480dcd409cad50db3 authored over 2 years ago

Items can now have abilities and when picked up, their icons appear

ffa5e91babcee32e51aeed80f0600915b6edee20 authored over 2 years ago

Making it possible to create items with special properties.

* Item resource refactored for better sprite handling
* The flask item as an item with special...

e2a9fd1511e7a11204d4c3f6528100aaf07d7edb authored over 2 years ago

Added fullscreen exit menu as scene to be overlayed

fd6b28cbe2040e603603adafe0f06fe085d4009d authored over 2 years ago

Item system developent

* New item: flask added
* Refactored creation of new items

a31412c7ae18758abce9115178ccf8f3f719a901 authored over 2 years ago

dead people drop items.

fe9a91039f6fa184c988653c184226618080cdba authored almost 3 years ago

Item dropping implemented, item pickup refined.

226e39862700334bb135fbe800bf415d51fc7026 authored almost 3 years ago

Refined pick up button, added item drop button

0b556e87869da621c86320e9d00129a1227bcc90 authored almost 3 years ago

Items can be picked up.

* Items are created on the server and synced.
* Item pick up goes through the server and...

75386764e7ff6bebea9bdfa3d68bb3748d234002 authored almost 3 years ago

Refined item pick up buttons

ef494393515c74ae1960090d15f1dae0d3428b2d authored almost 3 years ago

interaction button for items in pick-up range

92f7c3a4b9eb3418e86bc7138654bffca180fe89 authored almost 3 years ago

Added a storage room full of items, item node debugged

00252b7a03dfc06563ca1aaebf557d4f2cc01cf9 authored almost 3 years ago

Merge branch 'main' into item-system

5685c0164d4820a402c2e22eb7199f78dbc190bb authored almost 3 years ago

Merge pull request #86 from opensuspect/history-fixup

History fixup

5bedc83b32368530dbfd8df233f6bedfd5d58549 authored almost 3 years ago

Merge branch 'main' into history-fixup

8cc7de18783cc3eccc42bcca02cea95c6572620d authored almost 3 years ago

Merge branch 'main' into controlflow

187ee8c41fcb2923a19f24d5400afec3fd27e666 authored almost 3 years ago

Merge branch 'main' into handle-disconnect

5d594534a7ef66f877519e5435502b24031504e7 authored almost 3 years ago

Merge branch 'main' into map-template

ba7722a7ee3d0969ed57a1c48e3b62ed89c672a1 authored almost 3 years ago

Updating controlflow graphs for documentation (#84)

* maps are now inheriting from a map template

* WIP: updating controlflow for create and join...

d7be4237bc198130eb6128f8987cd9010977294b authored almost 3 years ago

Merge branch 'main' into controlflow

882079036ab7237bccd7b640a35d6c0899b3d23d authored almost 3 years ago

Teams and roles, kill mechanics (#85)

* handle disconnecting players

* fix misnomer in connections.gd

* handle disconnect more s...

af4f95d9a8656451be293ce871ae12da73ed05b9 authored almost 3 years ago

Merge pull request #83 from nicemicro/teams-roles

Development started on teams and roles assignment

cfafbbf7ce6e11b07b6bebe1336a266eb923b064 authored almost 3 years ago

Merge branch 'main' into teams-roles

731d2518edc9546403c3438822ce546aa534dc3d authored almost 3 years ago

Merge branch 'main' into development

75d0bcd1bf597972dc37d9b696694d94baf40a9d authored almost 3 years ago

Kill and reload mechanism prototype finalized

* Gun icon and reload icon look nice now
* Gun actually kills a player
* Player can die and c...

43c8835bd9c794211189fb9da99d4dccc21403f4 authored almost 3 years ago

maps are now inheriting from a map template (#82)

Co-authored-by: Ian Flynn <[email protected]>

24de09f1f64787f993c1f1379d3101d99e5a3abd authored almost 3 years ago

Merge branch 'main' into map-template

bb9e3d16a8b180c32834ce4504f735d0d541f6ce authored almost 3 years ago

Handle disconnect (#69)

* handle disconnecting players

* fix misnomer in connections.gd

* handle disconnect more s...

2021b81dfb04aa8a5c788c063704bed2e4ee329a authored almost 3 years ago

re-add variable declaration

4853c84d6b9210724dd5a9a0500e03db71fdc7af authored almost 3 years ago

Merge branch 'main' into handle-disconnect

cdb6d1020ddc1629694d8eb4db87d82e5f8b1560 authored almost 3 years ago

Killing with guns can be validated by server

35a3dae95b2e53c9f3d49423774d84bff77ca39b authored almost 3 years ago

Merge branch 'development' into teams-roles

8ce7af1af5543b2c1e66df56a899a92f770bc727 authored almost 3 years ago

Merge branch 'main' into development

a3f71322ea4bd3ea38b743e93fdd4316acc2aee4 authored almost 3 years ago

dummy button for abilities added

403b29c54d9a0c8bf6175a7d876acd75e04966ac authored almost 3 years ago

added special abilities for infiltrators

68fc8a18381ba9e0200c761554a10dc67ee48296 authored almost 3 years ago

return to lobby resets teams, roles, name colors

d1cd25a84de51acd8310213eeb7883a688f56ed1 authored almost 3 years ago

Merge branch 'handle-disconnect' into teams-roles

72c25c02e63c08e6cc94118a863ce8194925c78f authored almost 3 years ago

role display code debugged

a77ba4b12549865eba1908fe951d3587b2684c9e authored almost 3 years ago

role announcement only shows a selection of team/roles

6e082be4c6dd871aa296771883ab50f7b1e123a5 authored almost 3 years ago

Characters appear on role announce screen

ef7686e10af38475b829502ce5246fb585493899 authored almost 3 years ago

rationalizing how players see others' roles

7f78f69d262d7d9ad415d442d90dacf5271ea774 authored almost 3 years ago

Colored character names based on team / role

* Characters have their names shown on the map
* The names are colored besad on the team/role ...

9fc6d2bfbe6f06c70f9d31a99e9f73d66da0cc94 authored almost 3 years ago

Copyright info for leather-jacket-girl corrected

93d3ca703d47a1cf6392f3554fb1718c516f8af6 authored almost 3 years ago

Leather jacket girl template made

cae56aed1142885154975ab4a5cc49249892fc5a authored almost 3 years ago

Teams+roles visible are set up locally based on the map aliases

* The game.gd is used to interpret the alias list
* role_assignment.tscn has a placeholder for...

d4405d11e296f2cde2c8814eeaa0ab80cdc054c3 authored almost 3 years ago

role aliases added to chemical laboratory map

2478e559de4694c99ab9a65fd8a9e59807f0f1a9 authored almost 3 years ago

Merge pull request #77 from opensuspect/playable-character

Playable character partial implementation

cba3ad63cab4cbb8a5df135a2b9e589d8e326a4b authored almost 3 years ago

Prototype mechanism for hidden roles and teams

21f3265f617158c6beb162033cabcd2b1a481ae9 authored almost 3 years ago

interactive role announcement screen dummy

0412ed5d52ccbb97441f9d8f5e085c070ae7de46 authored almost 3 years ago

Role and team assignment screen dummy added

* Dummy blank screen with timer for role assign
* Roles are assigned by the server and distrib...

f77e0c0341d54907d89af33ed0b9c53c9778fb20 authored almost 3 years ago

initial templates for team and role assignment

c0ff6798df3c348fcdbe107a43a56b2fe23bc0db authored almost 3 years ago

graph of sending character data

3d466588cc3b18c624abb1fdab2e06d91cbfdbed authored almost 3 years ago

graph for requesting all customization data

7e5a9985fc87f56cdfe82d9546924957e1073b3d authored almost 3 years ago

Merge pull request #81 from nicemicro/playable-character

* Code revision with suggestions by TheSecondReal0
* Merge back everything that is already in...

9880633cc34a9dda729c5953a84e951824e000e5 authored almost 3 years ago

Merge commit 'ab38734' from scene-autoload into playable-character

* This is supposed to merge in the scene-autoload branch and also
resolve the merge conflicts

98da3afa71d070044572edebd753db346630bd06 authored almost 3 years ago

Merge pull request #79 from opensuspect/scene-autoload

eb964883e406cfb14ab73039a9495b01d05ef892 authored almost 3 years ago

movement sync documentation refreshed

0b2d7570cd57b88b99edc8f7a71de4157f77abb3 authored almost 3 years ago

Merge branch 'development' into controlflow

8e18aaf215ebff248f475575c1dad706842b59f9 authored almost 3 years ago

Merge branch 'playable-character' into development

47cccc57efe9a45e3b4adbeaa5b711d0369a9218 authored almost 3 years ago

bulk character data is only intended for those who request it

6ca9d162b1765b602bad58ddbb44ade93c6775a3 authored almost 3 years ago

WIP: updating controlflow for create and join

046bcd72350ffd753649a4287b36fda437ef744c authored almost 3 years ago

Merge branch 'map-template' into development

6717058347dfe96fb3ee43e80911361478bc8e2a authored almost 3 years ago

Merge branch 'scene-autoload' into development

ab387342fc1c2e6adc057908bf278a5b087e8d39 authored almost 3 years ago

Merge pull request #78 from nicemicro/map-template

working on a map template system

ed8cfabf2c6f98005fbe02d03f1c98c2f996ec62 authored almost 3 years ago

Merge pull request #80 from nicemicro/scene-autoload

scene loader loads overlay scene onto a CanvasLayer

f7daa0ee779075d50471fcae82b3a033d8e0f7e1 authored almost 3 years ago

Merge conflicts resolved between branches scenes-autolad and

playable-character

2fa929b7ae4c2735cf94461e01af1db76e6ddb21 authored almost 3 years ago

Merge branch 'playable-character' into development

5f6c1957d36bfa00f01fbd41362d3358770b26a1 authored almost 3 years ago

Code revision with suggestions by TheSecondReal0

* The setMainCharacter function in the characternode now takes a bool
argument
* The charac...

6d598013613fcc52413b35a67d573815d7af6abe authored almost 3 years ago

Code revision with suggestions by TheSecondReal0

* Functions renamed to show they sync all data not just position
* Bug caused by sending empty...

dba0084a8dea7ac8369987cd67f19e0563a52e5a authored almost 3 years ago

Merge pull request #74 from daniel071/main

Port builds and CI system

ac990ef072b6a045711d64032da1773eaca71bf4 authored almost 3 years ago

variable name changed to conform to guidelines

817aa2d47b991d9719aad7326e35271a39e62efb authored almost 3 years ago

updated documentation

9ced5e2ef46b43fedc073a4b0ee15da13059150c authored almost 3 years ago

overlays are always added to the CanvasLayer

1621715fde4e5ad7f9ab34652a21835d131f9915 authored almost 3 years ago

sceneOrder is now populated in the correct order

95c1bfe9ac9fb25872e0ec50330bb3766ce59ca7 authored almost 3 years ago

hud is now separated into an other scene, scene loader can load to a separate CanvasLayer

1eab9c6342f23537454a460331155f46fda55241 authored almost 3 years ago

Merge pull request #68 from moxvallix/transition-testing

fd7a80563e0f2ad20a8d073a923afbe4238cfbe2 authored about 3 years ago

Quick fix for start game

95ddb2ab557bc04b255bb0b0074bc22370258085 authored about 3 years ago

Merge pull request #75 from moxvallix/resources-debug

f1a500b239051c8dc94b00fb21080fd1cbe062c2 authored about 3 years ago

maps are now inheriting from a map template

98783467f5ba2d9c8b3f6ceba51b294749b17064 authored about 3 years ago

Merge pull request #70 from nicemicro/playable-character

Continuos development of playable characters

74716d03a3e605ac8ff47caf84aed224a371683e authored about 3 years ago

Camera follows main character

c7cec1f4dac48d2e6d8ffe5ac81d876a5d2a0ff0 authored about 3 years ago

Finish commenting in the autoload

fa5494cc3e2e8b3b790a223dfa8abbb4f431acd6 authored about 3 years ago

Rework transition handler to work with updated Scenes API

4b72f3c5d9874b9422754051fc7334a8b419a46d authored about 3 years ago

Merge branch 'transition-testing' of github.com:moxvallix/opensus into transition-testing

ec135fb0731be30686f28c394961e1c620843949 authored about 3 years ago

Merge pull request #67 from nicemicro/scene-autoload

b06c8dc0aad51b7d30b13bda64350b368fdddd68 authored about 3 years ago

Fix Resources autoload to work when exported

aa53a39ba8fe178bd4c02817c0f8a583bebf75c3 authored about 3 years ago

macOS support

543cda7307a07e4d51b5767e10912b91fc0c03e5 authored about 3 years ago

Fix build (probably)

c27e5ef47d332296db1abbeccd175f61ac836048 authored about 3 years ago

Merge branch 'main' of github.com:daniel071/opensus

Merge

ca9a52f1517856e5b82c4a268a96f0cec5f919d1 authored about 3 years ago

Port export configs, fix builds

03af4d679039b512e425de836d23a0ba53bb6f6b authored about 3 years ago

Port opensuspect CI to refactor

da3d872534ba7bf1d85cb2351f50899d6f2f8fce authored about 3 years ago

Merge pull request #66 from nicemicro/item-system

f62cc059129a1ceefbca3e0a8ac881785c39b842 authored about 3 years ago

Characters now go behind each other and collide

41bed7bebcc7a0a4a9a73cf4a77db9d63faff7b2 authored about 3 years ago

directory renamed to follow conventions

d59568472f4f73abdcede7e14112e15935c1d48e authored about 3 years ago

Merge pull request #50 from vincens2005/handle-disconnect

Initial work on handling disconnecting players

4846c70685b2dca46e571e4b95742053a2adf92f authored about 3 years ago