Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
4574890
I need a better way to deal with this config thing
floomby Oct 19, 2022
4e9b3a3
Merge branch 'master' into live
floomby Oct 19, 2022
85441f1
Merge branch 'master' into live
floomby Oct 19, 2022
287a220
Merge branch 'master' into live
floomby Oct 20, 2022
f74189d
Merge branch 'master' into live
floomby Oct 26, 2022
f9ab98f
Merge branch 'master' into live
floomby Oct 26, 2022
c538a2e
Add missing query for looking up available ships
floomby Oct 26, 2022
6896ba4
Merge branch 'master' into live
floomby Oct 26, 2022
9e10df9
Merge branch 'master' into live
floomby Oct 26, 2022
e690ca4
Merge branch 'master' into live
floomby Oct 26, 2022
0bc751b
Merge branch 'master' into live
floomby Oct 26, 2022
a9c8078
Merge branch 'master' into live
floomby Oct 27, 2022
729eb2f
Merge branch 'master' into live
floomby Oct 27, 2022
1f4ad14
Merge branch 'master' into live
floomby Oct 27, 2022
15c72d5
Merge branch 'master' into live
floomby Oct 28, 2022
d20b33d
Merge branch 'master' into live
floomby Oct 28, 2022
479d237
Merge branch 'master' into live
floomby Oct 28, 2022
867454c
Merge branch 'master' into live
floomby Oct 29, 2022
fc6ce99
Fix text
floomby Oct 29, 2022
4b6df1f
Fix conflict
floomby Oct 29, 2022
99ff052
Merge branch 'master' into live
floomby Oct 29, 2022
0b82baa
Merge branch 'master' into live
floomby Oct 29, 2022
825eb32
Merge branch 'master' into live
floomby Oct 29, 2022
b9763df
Merge branch 'master' into live
floomby Oct 30, 2022
2a35f3a
Merge branch 'master' into live
floomby Oct 30, 2022
eddc4ea
Merge branch 'master' into live
floomby Oct 30, 2022
f3d16c4
Merge branch 'master' into live
floomby Oct 30, 2022
f41dec6
Merge branch 'master' into live
floomby Oct 30, 2022
c59b995
Merge branch 'master' into live
floomby Oct 30, 2022
43d1407
Merge branch 'master' into live
floomby Oct 30, 2022
961f0dd
Merge branch 'master' into live
floomby Oct 30, 2022
f5a4df5
Merge branch 'master' into live
floomby Oct 30, 2022
2459fa8
Merge branch 'master' into live
floomby Oct 30, 2022
a2969ce
Merge branch 'master' into live
floomby Oct 30, 2022
7992a31
Merge branch 'master' into live
floomby Oct 31, 2022
364acc6
Merge branch 'master' into live
floomby Oct 31, 2022
d6ff19b
Merge branch 'master' into live
floomby Oct 31, 2022
a0365e9
Merge branch 'master' into live
floomby Oct 31, 2022
2c52edd
Merge branch 'master' into live
floomby Oct 31, 2022
9a9a47a
Merge branch 'master' into live
floomby Nov 1, 2022
08ad85a
Merge branch 'master' into live
floomby Nov 1, 2022
b79f3d5
Merge branch 'master' into live
floomby Nov 2, 2022
b3c74b0
Merge branch 'master' into live
floomby Nov 2, 2022
f4918c1
Merge branch 'master' into live
floomby Nov 3, 2022
1cdc5fe
Merge branch 'master' into live
floomby Nov 3, 2022
bd34e6e
Merge branch 'master' into live
floomby Nov 4, 2022
557ba75
Merge branch 'master' into live
floomby Nov 5, 2022
eac7ffa
Merge branch 'master' into live
floomby Nov 5, 2022
ec98eb5
Merge branch 'master' into live
floomby Nov 5, 2022
8676dfb
Merge branch 'master' into live
floomby Nov 8, 2022
50b8867
Merge branch 'master' into live
floomby Nov 8, 2022
b95801f
Merge branch 'master' into live
floomby Nov 8, 2022
a34e8db
Merge branch 'master' into live
floomby Nov 8, 2022
65e28c3
Merge branch 'master' into live
floomby Nov 8, 2022
37ce454
Merge branch 'master' into live
floomby Nov 8, 2022
1fc803f
NPCs can go to new sectors
floomby Nov 9, 2022
05331e6
Merge branch 'master' into live
floomby Nov 9, 2022
839116b
Merge branch 'master' into live
floomby Nov 9, 2022
1ee1a62
Merge branch 'master' into live
floomby Nov 9, 2022
e3456db
Merge branch 'master' into live
floomby Nov 9, 2022
392ff6a
Merge branch 'master' into live
floomby Nov 10, 2022
e84c91c
Merge branch 'master' into live
floomby Nov 10, 2022
e59e1d0
Merge branch 'master' into live
floomby Nov 10, 2022
5515554
Merge branch 'master' into live
floomby Nov 10, 2022
4eff3b2
Merge branch 'master' into live
floomby Nov 11, 2022
025c31a
Merge branch 'master' into live
floomby Nov 11, 2022
5d7cfd6
Merge branch 'master' into live
floomby Nov 11, 2022
1675a59
Merge branch 'master' into live
floomby Nov 12, 2022
6ce6f8b
Merge branch 'master' into live
floomby Nov 12, 2022
7eb2271
Merge branch 'master' into live
floomby Nov 12, 2022
18e9736
Merge branch 'master' into live
floomby Nov 12, 2022
f34acf5
Merge branch 'master' into live
floomby Nov 12, 2022
f12d06a
Merge branch 'master' into live
floomby Nov 12, 2022
dfe3ac8
Merge branch 'master' into live
floomby Nov 12, 2022
d9950c7
Merge branch 'master' into live
floomby Nov 12, 2022
2a411e0
Merge branch 'master' into live
floomby Nov 12, 2022
1aa0bcb
Merge branch 'master' into live
floomby Nov 13, 2022
aa58cdb
Merge branch 'master' into live
floomby Nov 13, 2022
c621096
Merge branch 'master' into live
floomby Nov 13, 2022
44ab4c3
Merge branch 'master' into live
floomby Nov 13, 2022
a1d258c
Merge branch 'master' into live
floomby Nov 13, 2022
8dad417
Merge branch 'master' into live
floomby Nov 14, 2022
e6f09cb
Merge branch 'master' into live
floomby Nov 14, 2022
1465a85
Merge branch 'master' into live
floomby Nov 14, 2022
caea83f
Merge branch 'master' into live
floomby Nov 14, 2022
f3422a6
Merge branch 'master' into live
floomby Nov 15, 2022
940bd3c
Merge branch 'master' into live
floomby Nov 16, 2022
9a907be
Merge branch 'master' into live
floomby Nov 16, 2022
4d1f336
Merge branch 'master' into live
floomby Nov 16, 2022
a952290
Merge branch 'master' into live
floomby Nov 16, 2022
0a6c336
Merge branch 'master' into live
floomby Nov 16, 2022
ffc3d01
Merge branch 'master' into live
floomby Nov 16, 2022
fc3e322
Merge branch 'master' into live
floomby Nov 16, 2022
b5d7c53
Merge branch 'master' into live
floomby Nov 18, 2022
329bac3
Merge branch 'master' into live
floomby Nov 18, 2022
48c3cb6
Merge branch 'master' into live
floomby Nov 18, 2022
d9008f9
Merge branch 'master' into live
floomby Nov 19, 2022
df42ff7
Merge branch 'master' into live
floomby Nov 19, 2022
3f6e512
Merge branch 'master' into live
floomby Nov 19, 2022
29bfe21
Merge branch 'master' into live
floomby Nov 19, 2022
ab78828
Merge branch 'master' into live
floomby Nov 20, 2022
a2234fe
Merge branch 'master' into live
floomby Nov 20, 2022
fd4b2e5
Merge branch 'master' into live
floomby Nov 23, 2022
c608dce
Merge branch 'master' into live
floomby Nov 24, 2022
b90b0a6
Merge branch 'master' into live
floomby Nov 24, 2022
7a54609
Merge branch 'master' into live
floomby Nov 24, 2022
7e602fa
Merge branch 'master' into live
floomby Nov 24, 2022
f43819d
Merge branch 'master' into live
floomby Nov 24, 2022
8923030
Merge branch 'master' into live
floomby Nov 24, 2022
b6fd9f0
Merge branch 'master' into live
floomby Nov 24, 2022
6aa6b12
Merge branch 'master' into live
floomby Nov 25, 2022
97b37aa
Merge branch 'master' into live
floomby Nov 25, 2022
d1ed12b
Merge branch 'master' into live
floomby Nov 25, 2022
0051730
Merge branch 'master' into live
floomby Nov 27, 2022
ea9768f
Merge branch 'master' into live
floomby Nov 28, 2022
6a2e04f
Merge branch 'master' into live
floomby Nov 30, 2022
b44b5d4
Merge branch 'master' into live
floomby Nov 30, 2022
c74f5bf
Merge branch 'master' into live
floomby Dec 15, 2022
da5e6f2
Merge branch 'master' into live
floomby Dec 15, 2022
a730238
Merge branch 'master' into live
floomby Dec 15, 2022
322f1b3
Add video preview image to repo
floomby Dec 15, 2022
96bf9a0
Merge branch 'master' into live
floomby Dec 15, 2022
834da43
Merge branch 'master' into live
floomby Dec 15, 2022
3f79d19
Merge branch 'master' into live
floomby Dec 16, 2022
d8bbf99
Merge branch 'master' into live
floomby Dec 16, 2022
4283d41
Merge branch 'master' into live
floomby Dec 16, 2022
170880e
Merge branch 'master' into live
floomby Dec 16, 2022
11ea6fb
Merge branch 'master' into live
floomby Dec 17, 2022
5e39c45
Merge branch 'master' into live
floomby Dec 17, 2022
f350d80
Merge branch 'master' into live
floomby Dec 17, 2022
1b9667c
Fix cloaking weapon text rasterization
floomby Dec 20, 2022
5296e1b
Merge branch 'master' into live
floomby Dec 20, 2022
53ec31b
Merge branch 'master' into live
floomby Dec 22, 2022
b91ebb1
Merge branch 'master' into live
floomby Dec 22, 2022
91da816
Merge branch 'master' into live
floomby Dec 22, 2022
9dfd651
Merge branch 'master' into live
floomby Dec 23, 2022
507e148
Merge branch 'master' into live
floomby Dec 23, 2022
8ba47a3
Merge branch 'master' into live
floomby Dec 24, 2022
c364162
Merge branch 'master' into live
floomby Dec 25, 2022
323a539
Merge branch 'master' into live
floomby Dec 25, 2022
853a073
Merge branch 'master' into live
floomby Dec 25, 2022
190cbbc
Merge branch 'master' into live
floomby Dec 26, 2022
e306ad6
Merge branch 'master' into live
floomby Dec 26, 2022
7e981d1
Merge branch 'master' into live
floomby Dec 26, 2022
c2177b5
Merge branch 'master' into live
floomby Dec 27, 2022
64da9c0
Merge branch 'master' into live
floomby Dec 27, 2022
192389b
Merge branch 'master' into live
floomby Dec 27, 2022
de95db2
Merge branch 'master' into live
floomby Dec 27, 2022
fe1893a
Merge branch 'master' into live
floomby Dec 27, 2022
d23a279
Merge branch 'master' into live
floomby Dec 28, 2022
c758f36
Merge branch 'master' into live
floomby Dec 28, 2022
f03df39
Merge branch 'master' into live
floomby Dec 28, 2022
41f940d
Merge branch 'master' into live
floomby Dec 28, 2022
ba770fe
Merge branch 'master' into live
floomby Dec 28, 2022
65b5e7e
Merge branch 'master' into live
floomby Dec 29, 2022
63cb109
Merge branch 'master' into live
floomby Dec 29, 2022
9dd67ce
Merge branch 'master' into live
floomby Dec 30, 2022
fb2ffbb
Merge branch 'master' into live
floomby Dec 30, 2022
9e5e6af
Merge branch 'master' into live
floomby Dec 30, 2022
9de411f
Merge branch 'master' into live
floomby Dec 30, 2022
21480ee
Merge branch 'master' into live
floomby Dec 30, 2022
09db92b
Merge branch 'master' into live
floomby Dec 30, 2022
84dd29a
Merge branch 'master' into live
floomby Dec 30, 2022
a6e18fe
Merge branch 'master' into live
floomby Dec 30, 2022
fa6e3c8
Merge branch 'master' into live
floomby Jan 1, 2023
6746d74
Merge branch 'master' into live
floomby Jan 1, 2023
7855d0f
Merge branch 'master' into live
floomby Jan 2, 2023
d2adee5
Merge branch 'master' into live
floomby Jan 2, 2023
518e6f7
Merge branch 'master' into live
floomby Jan 2, 2023
e82ca1e
Merge branch 'master' into live
floomby Jan 2, 2023
a5d8c11
Merge branch 'master' into live
floomby Jan 3, 2023
ada8425
Merge branch 'master' into live
floomby Jan 3, 2023
b99b6d2
Merge branch 'master' into live
floomby Jan 3, 2023
1883eca
Merge branch 'master' into live
floomby Jan 3, 2023
e2b6342
Update certs
floomby Jan 10, 2023
745546c
Merge in master
floomby Jan 10, 2023
55a8d68
Merge branch 'master' into live
floomby Jan 10, 2023
367de88
Use SNI
floomby Jan 10, 2023
02727dd
Maybe this works
floomby Jan 10, 2023
41f40cd
Return the tls context
floomby Jan 10, 2023
6d02300
Merge branch 'master' into live
floomby Jan 11, 2023
f30f4f4
Merge branch 'master' into live
floomby Jan 11, 2023
df06bb5
Merge branch 'master' into live
floomby Jan 11, 2023
a0868fa
Merge branch 'master' into live
floomby Jan 12, 2023
fa4697a
Merge branch 'master' into live
floomby Jan 12, 2023
b82f441
Merge branch 'master' into live
floomby Jan 12, 2023
7b747d6
Server peering and pre rework refactoring
floomby Jan 13, 2023
a7980f1
Disable things that the map rework will break
floomby Jan 13, 2023
1cc5973
Can switch servers at will (no warping even required)
floomby Jan 14, 2023
bd45c91
Server sector assignments
floomby Jan 14, 2023
0fd322f
Load the stations from the database
floomby Jan 14, 2023
8567e4d
Respawning and map topology
floomby Jan 14, 2023
1492c43
Can now switch server before client initialization
floomby Jan 14, 2023
708b3d6
Fix map, asteroids, sector info, and station repairing to work with t…
floomby Jan 15, 2023
e319ce3
Sector awareness for dynamic sectors creation probably needs a sepera…
floomby Jan 15, 2023
794d081
Fix server sector awareness messages
floomby Jan 15, 2023
ca50a37
Friend warping (displaed location is incorrect still)
floomby Jan 15, 2023
7481749
Need to rework peer communication
floomby Jan 15, 2023
8644bc6
Replace all zeromq code with axon instead
floomby Jan 16, 2023
53f06ad
Friend last location
floomby Jan 16, 2023
c41751d
Preparation for sector transfering
floomby Jan 16, 2023
f1e72b8
Transfer sectors (without players)
floomby Jan 16, 2023
6b0984c
Non npc sector transfers for players
floomby Jan 16, 2023
19e52b1
Stations can transfer
floomby Jan 16, 2023
978114e
Transfer delayed actions between sectors
floomby Jan 16, 2023
ad580ca
NPC transfers
floomby Jan 16, 2023
0a09409
Transferable actions
floomby Jan 17, 2023
a392c67
Both transferable actions for the tutorial transfer
floomby Jan 17, 2023
24d9d35
Tutorial works with transfers (mostly, but enough that I am done with…
floomby Jan 17, 2023
77f49e7
Mission completion checks serialization
floomby Jan 17, 2023
4b825ba
Switch rendering of models over to using vaos
floomby Jan 18, 2023
4df98c4
Re-enable overworld npcs
floomby Jan 19, 2023
b0e74d0
Make npc code safer
floomby Jan 20, 2023
8f0ed10
Add emp mine
floomby Jan 20, 2023
4addb44
Add deployable gun platform
floomby Jan 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
"Prifecite",
"Prifetium",
"rasterization",
"Reconstructors",
"Respawned",
"Russanite",
"Russium",
"unselectable",
"websockets",
"Zirathium"
],
"files.associations": {
Expand Down
10 changes: 9 additions & 1 deletion TODO.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
### Broken by new multi server system

- Current player information (works except logout)
- Deployment
- Alternative background (Going to ignore for now)
- Some admin routes

### Server stuff

- The tutorial respawn breaks if the tutorial sector is transferred while the player is dead in the tutorial (low priority)
- Anti chat spam (low priority)
- Killed/killed by messages??

### Gameplay

### User Interface

- Map css grid is being janky
- I may want friend location/online notifications (idk if I should have a client subscribe model or just have the server figure it out and send it to the client)

### Effects
Expand All @@ -21,7 +30,6 @@

### WebGL optimizations that can be done (in estimated order of performance gain)

- move a bunch of the vbos into vaos to avoid setting the attributes over and over
- instanced rendering for projectiles
- instanced rendering for other things
- use ubos for the lights and particle emitters
Expand Down
Loading