weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
169 Commits 7 Branches 23 Tags
Commit Graph

75 Commits

Author SHA1 Message Date
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
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
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
cc4f0a28df Added sample content to loadout. 2023-03-10 10:36:36 +00:00
dpassoni
60d7b364b6 (WiP) More work on contextmenu 2023-03-10 10:02:37 +01: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
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
PeekabooSteam
fbaface592 Mostly done the mouse info panel. 2023-03-09 16:47:08 +00:00
PeekabooSteam
b7ed3ebd8a Styled the connection panel; tweaked the app-logic to allow UI to decide presentation. 2023-03-09 14:29:44 +00:00
PeekabooSteam
b1faa88538 Removed the fuel display in the unit control panel 2023-03-08 21:43:34 +00:00
PeekabooSteam
7c4f11591e Tarted up the unit control panel a bit more. 2023-03-08 21:42:14 +00:00
PeekabooSteam
549eeb7c2e Some styling to the unit control panel and changeable unit name. 2023-03-08 14:19:57 +00:00
PeekabooSteam
a4a0ee7ba2 Commiting from the correct directory. 2023-03-07 22:43:12 +00:00
dpassoni
10e0abfad3 Added bold and bolder fonts 2023-03-07 15:28:46 +01:00
PeekabooSteam
f45d7651b5 More aircraft fixing 2023-03-07 14:21:30 +00:00
PeekabooSteam
cc37587bd7 Added visibility switches that 'should' work - at least for aircraft. 2023-03-07 13:05:15 +00:00
PeekabooSteam
274544d034 Navbar visibility toggles, only active for now. No function. 2023-03-07 11:47:18 +00:00
PeekabooSteam
bdf240ed4a Added the icon for the map type; commented out the map location dropdown; minor UI improvements. 2023-03-07 09:57:58 +00:00
PeekabooSteam
11a495f4ac Added .ol-select in a select (icon menu) and some title/tooltips. 2023-03-07 08:59:36 +00:00
PeekabooSteam
3911b8fefe Started to look at the unit control panel. 2023-03-06 20:45:11 +00:00
PeekabooSteam
8741585294 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-06 16:53:49 +00:00
PeekabooSteam
92bd55a587 Tweaked the not-yet-buttons' labels 2023-03-06 16:53:46 +00:00
dpassoni
0fa29284c8 Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0 2023-03-06 17:45:56 +01:00
dpassoni
a7a41e60c4 Incorporated unit info panel into unit control panel 
Converted callbacks to events
Mouse info drawing moved to mouseinfopanel.ts
 2023-03-06 17:45:50 +01:00
PeekabooSteam
da6841d134 Added menu options for icon in navbar. 2023-03-06 16:29:07 +00:00
PeekabooSteam
5b400d7cba Added icon to nav, changed ol-select to click 2023-03-06 15:04:55 +00:00
dpassoni
8e83621b22 Added client support for server URIs 2023-03-06 14:42:59 +01:00
dpassoni
6a599a12a1 Moved uikit to view 2023-03-06 12:15:41 +01:00
dpassoni
5fe125beff Merge remote-tracking branch 'remotes/origin/units' into v0.1.0 
# Conflicts:
#	client/public/stylesheets/olympus.css
#	client/public/stylesheets/style.css
 2023-03-06 11:18:21 +01:00
dpassoni
1a32d5ad17 Started working on navbar contents 2023-03-06 10:54:35 +01:00
Pax1601
360c85b563 Reorganized client source code 
Removed many useless and old classes
Started transition to new CSS
Added URIs for specific REST requests
 2023-03-05 21:29:58 +01:00
Pax1601
980cd7766d Merge remote-tracking branch 'remotes/peekaboo/Pax1601-main' into v0.1.0 
# Conflicts:
#	client/public/stylesheets/olympus.css
#	client/public/stylesheets/uikit.css
#	client/public/uikit.html
#	client/src/aic/aic.ts
#	client/src/index.ts
#	client/src/units/unitmarker.ts
#	client/views/unitcontrolpanel.ejs
 2023-03-03 19:03:09 +01:00
Pax1601
c5a1b00cfd Better unitmarker.ts integration. Added scheduler load divider. Rationalized units.ts and added interfaces (to be completed) 2023-02-26 20:19:31 +01:00
Pax1601
2350bc499a Merge remote-tracking branch 'remotes/origin/main' into v0.1.0 2023-02-25 18:04:08 +01:00
Pax1601
93b1ac8f81 Started event handling 2023-02-25 18:03:31 +01:00
PeekabooSteam
1c1e60146d
Pax1601 main (#52) 
* GA initial data

* First commit of crude functionality.

* More AIC work so I don't lose it. (Best commit message ever.)

* Restructured to use 'phrases'.

* Set to a working state.

* Committing so I don't lose work.

* Added ai-formation feature swtich and UI kit stuff.

* Added plane units to UI kit.
 2023-02-25 18:03:03 +01:00
PeekabooSteam
01c3a062bf Merge branch 'main' of https://github.com/Pax1601/DCSOlympus into Pax1601-main 2023-02-22 16:30:16 +00:00