186 Commits

Author SHA1 Message Date
PeekabooSteam
3e8564bafe Styled units in info control panel. 2023-03-13 17:47:35 +00:00
PeekabooSteam
1d043b1d2d Unit info panel done - probably. 2023-03-13 15:05:54 +00:00
PeekabooSteam
da2dd7e0fd Updated unit icons. 2023-03-13 12:41:46 +00:00
PeekabooSteam
dedf8ab08f Added aircraft selected states. 2023-03-13 11:43:50 +00:00
Dogma
875cec485f
Updates to icons 2023-03-13 21:58:26 +11:00
dpassoni
bb55a2d0c1 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-13 10:59:18 +01:00
dpassoni
1e502c4869 Readded demo data 2023-03-13 10:59:09 +01:00
Dogma
694ff48d92
Added selected state for ground / naval units 2023-03-13 20:11:44 +11:00
PeekabooSteam
1120c8c237 Fixed vertical scroll on icon menu. 2023-03-12 18:57:04 +00:00
PeekabooSteam
212c1344f2 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-12 18:08:13 +00:00
PeekabooSteam
28aba62733 Added missiles. 2023-03-12 18:08:06 +00:00
Pax1601
a214ef6537 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-12 18:23:24 +01:00
Pax1601
70b3e78514 Fuel indicator on units completed 2023-03-12 18:23:19 +01:00
PeekabooSteam
1fb3de23f5 Updated AI pilot unit selection selector. 2023-03-12 17:09:37 +00:00
PeekabooSteam
429841f589 Fixed ammo showing on dead aircraft. 2023-03-12 16:47:14 +00:00
PeekabooSteam
6d57327ff7 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-12 16:38:51 +00:00
PeekabooSteam
107c655e4c Fixed units not selecting. 2023-03-12 16:38:45 +00:00
Pax1601
e043f85c47 Merge confilcts resolution 2023-03-12 17:38:11 +01:00
Pax1601
f00ac8d974 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0
# Conflicts:
#	client/public/stylesheets/olympus.css
#	client/views/unitcontrolpanel.ejs
2023-03-12 17:34:41 +01:00
Pax1601
cc0dfb9a7a Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0
# Conflicts:
#	client/src/units/unit.ts
#	scripts/unitPayloads.lua
2023-03-12 17:32:36 +01:00
PeekabooSteam
db7627ddda Fixed unit control panel unit icon. 2023-03-12 16:31:53 +00:00
Pax1601
955fd7541a More core work, completed time tagged measures
Split back unit info panel
2023-03-12 17:27:59 +01:00
PeekabooSteam
04cdf68738 Switched to element selectors, because sexy. 2023-03-12 16:25:57 +00:00
PeekabooSteam
4f90078b9f Added dead state for air units; other minor CSS improvments. 2023-03-12 14:06:06 +00:00
PeekabooSteam
df6210bec9 Resolved conflict. 2023-03-12 10:55:41 +00:00
PeekabooSteam
9cab555ca1 Did more icon stuff in the ui kit. 2023-03-10 22:12:23 +00:00
dpassoni
6e203c09f9 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-10 17:44:00 +01:00
dpassoni
a896916204 Completed contextmenu, only missing is callback for smoke spawning 2023-03-10 17:43:54 +01:00
PeekabooSteam
3a210243ea Added dark icons 2023-03-10 16:30:14 +00:00
PeekabooSteam
ec5235d142 Fixed measure tool direction bug. 2023-03-10 15:58:41 +00:00
PeekabooSteam
2ef76a619b RuLes Of EngAGEmeNT iCoNs & ThrEAt ReAcTIoNs. 2023-03-10 15:47:03 +00:00
PeekabooSteam
ceec65fb37 Smartened the button toggle logic. Could be smarter, though. 2023-03-10 13:39:40 +00:00
PeekabooSteam
ecaf646375 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-10 13:30:17 +00:00
PeekabooSteam
7e6c9606eb Added proper checkboxes to coalition toggles. 2023-03-10 13:30:09 +00:00
dpassoni
3a9e321e67 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0
# Conflicts:
#	client/public/stylesheets/olympus.css
2023-03-10 13:09:19 +01:00
dpassoni
3dadff6d42 Completed aircraft spawn contextmenu 2023-03-10 13:07:19 +01:00
PeekabooSteam
37e212686b Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-10 10:36:39 +00:00
PeekabooSteam
cc4f0a28df Added sample content to loadout. 2023-03-10 10:36:36 +00:00
Dogma
69a476af2e
Add files via upload 2023-03-10 21:36:04 +11:00
Dogma
cb78b6b3c3
Added Action, ROE, formation and threat icons 2023-03-10 21:34:14 +11:00
dpassoni
60d7b364b6 (WiP) More work on contextmenu 2023-03-10 10:02:37 +01:00
PeekabooSteam
8e5ca6c992 Fixed tooltip on mouse panel. 2023-03-09 22:05:59 +00:00
Pax1601
a81125729e Fixed css error in data-coalition 2023-03-09 22:40:56 +01:00
PeekabooSteam
8c6af31893 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-09 18:32:37 +00:00
PeekabooSteam
56370f5baf More mouse info work. 2023-03-09 18:32:28 +00:00
dpassoni
1fd424a3d3 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-09 19:14:10 +01:00
PeekabooSteam
e670b8ed19 Tweaked measure tool data 2023-03-09 17:14:30 +00:00
PeekabooSteam
b39da9c562 Added reciprocal to measure tool 2023-03-09 17:09:03 +00:00
dpassoni
839357b52c Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-09 17:55:41 +01:00
dpassoni
406e515fa6 (WiP) Unit spawn menu 2023-03-09 17:55:35 +01:00