Compare commits

...

214 Commits

Author SHA1 Message Date
Hersi 8101e2737b Merge pull request 'Improved Countdown Timer' (#47) from feature/eventmode-countdown-timer into master
Reviewed-on: #47
2023-11-23 11:25:59 +00:00
Hersi d846014d18 update changelog 2023-11-23 12:24:50 +01:00
Hersi ebc01d1eeb create timer number textures, implement timer component 2023-11-23 12:24:11 +01:00
Hersi 6b51ddd739 Merge pull request 'Radar LAG in songselect' (#48) from feature/radar into master
Reviewed-on: #48
2023-11-23 11:23:22 +00:00
Hersi 841ca2892a update changelog 2023-11-23 12:22:13 +01:00
Hersi d0b1bcfb79 add check for updating the effect radar only when it is enabled (to reduce lag) 2023-11-23 12:21:17 +01:00
Hersi a2bb617959 Merge pull request 'Effect Radar Implementation v1' (#46) from feature/radar into master
Reviewed-on: #46
2023-11-23 06:41:14 +00:00
Hersi 4f3131a388 update changelog 2023-11-23 07:37:48 +01:00
Hersi 0951fc029c add effect radar toggle in skin settings 2023-11-23 07:29:10 +01:00
Hersi bc191e45f0 fix bug where radar is seen when filter is active 2023-11-18 09:30:38 +01:00
Hersi 2363b381ed radar calc rewrite 2023-11-18 09:30:13 +01:00
Hersi a0ceb0bd01 clear lua linting errors and warnings in songwheel.lua
fix(?) volforce indicator
2023-11-14 07:44:28 +01:00
Hersi e9d848d92f radar positioning and colors in songwheel.lua 2023-11-14 07:41:51 +01:00
Hersi cba1ebd790 finish radar component
text "stroke" is a dimmed color instead of black
add text alignment to radar attributes
fix radar rotation (rotate 90deg ccw)
optimize some angle and vertex position calculations
add some warnings to buggy code
2023-11-14 07:39:48 +01:00
Hersi 52cc1beb7d add dump() to utils 2023-11-14 07:35:48 +01:00
Hersi e876def36f doc update 2023-11-14 07:35:27 +01:00
Hersi d6e4c84a43 Add Continuum fonts 2023-11-14 07:35:06 +01:00
Hersi 48b503ac83 doc update 2023-11-13 01:42:13 +01:00
Hersi 7768ae2175 initial radar implementation 2023-11-13 01:41:52 +01:00
Hersi d7e5dbd2d1 0.3.0-rc3 changelog 2023-11-10 12:04:40 +01:00
Hersi 256ebc3c0f Merge branch 'fdigl-develop' 2023-11-10 11:49:00 +01:00
Hersi 430678ad23 Merge branch 'assets' 2023-11-10 11:42:14 +01:00
Hersi 79a0325e20 remove redundant track image 2023-11-10 11:39:47 +01:00
Hersi ac4ba5b1a4 add tintable laser cursor tails 2023-11-10 11:37:43 +01:00
Hersi 65ed417b26 Merge branch 'feat/local/laser_colors' 2023-11-10 11:30:48 +01:00
Hersi 52f948508c fix empty username fallback 2023-11-10 11:13:32 +01:00
Hersi a04890dab9 better handling of highscore username in songwheel 2023-11-10 11:09:34 +01:00
Hersi 9d04551ef3 fix challengeresult not getting username from GameConfig 2023-11-10 10:38:45 +01:00
Hersi b68a8022b6 0.3.0-rc2 changelog 2023-11-10 08:24:51 +01:00
Hersi 30214f58fa Merge branch 'feature/fix-username-labels' 2023-11-10 08:00:34 +01:00
Hersi 7694a23368 Merge branch 'feature/local-highscores-usernames' 2023-11-10 08:00:24 +01:00
Hersi 7f7b6da7d9 set default language to english in case of wrong config 2023-11-10 07:59:18 +01:00
Hersi 9274c216d6 add result table references for easier debugging 2023-11-10 07:58:46 +01:00
Hersi 2d7dbe74f1 Fix usernames on several user interface panels 2023-11-10 07:55:55 +01:00
Hersi f1e75e07b1 Add usernames on local highscores when available
Update songwheel skin api docs
2023-11-10 02:42:08 +01:00
Hersi b766b99324 multiplayer stubbed to default until working impl 2023-11-09 12:09:44 +01:00
Hersi 9dc6f598ae 0.3.0 release 2023-11-09 08:45:01 +01:00
Hersi 529da2d440 Merge branch 'master' into release 2023-11-08 23:42:30 +01:00
Hersi 3785898e40 Merge pull request 'implement handling xcd difficulty' (#45) from xcd-difficulty-impl into master
Reviewed-on: #45
2023-08-18 19:57:54 +00:00
Hersi 590662c9a9 implement handling xcd difficulty 2023-08-18 21:48:48 +02:00
Hersi 20600b9ca5 Merge pull request 'Fix crash on invalid idol animation' (#44) from 43-fix-crash-invalid-crew into master
Reviewed-on: #44
2022-11-12 12:10:03 +00:00
Hersi 028a1e9f74 fix crash on invalid idol animation 2022-11-12 12:53:55 +01:00
Hersi 9c4b7fdbe9 Merge pull request 'Disabled result transitions for auto screenshots' (#42) from 41-automatic-screenshot-capture into master
Reviewed-on: #42
2022-11-12 11:38:14 +00:00
doczi-dominik bbc74a8d7e Disabled result transitions for auto screenshots 2022-11-12 02:13:44 +01:00
Hersi dc1b444c92 fix crash on invalid idol animation 2022-09-18 20:35:00 +02:00
Hersi 0b2257fd27 Merge pull request 'Added console glow effects (knobs disabled)' (#40) from 28-restore-console-bt-fx-lights into master
Reviewed-on: #40
2022-08-11 09:50:42 +00:00
domdoc 35ac51be7d Added console glow effects (knobs disabled) 2022-07-19 18:02:11 +02:00
Hersi 313b9819dd Merge pull request 'Fix crashes on chalresult + fix wrong diff rectangles on chalresult' (#37) from fix/chalresult-crashes into master
Reviewed-on: #37
2022-07-11 23:02:02 +00:00
Katoski 6d342c883f / crashes on chalresult & / diffrects having wrong difficulty displayed 2022-06-25 23:20:38 +02:00
Hersi 0d36dbebdc Merge pull request 'Fixed BT/FX chips being too thin + Scaling changes' (#36) from domdoc-develop into master
Reviewed-on: #36
2022-06-06 14:31:48 +00:00
domdoc 614dcfe9b7 Fixed scaling for setUpTransforms 2022-05-31 21:30:52 +02:00
domdoc c3ad3b6323 Merge branch 'master' into domdoc-develop 2022-05-31 14:54:57 +00:00
domdoc 1eedcbe5cd Fixed BT/FX chips being too thin 2022-05-31 16:51:23 +02:00
Hersi 47372bf14f fix exceed difficulty code missing 2022-05-30 02:51:24 +02:00
Hersi 2c2068b5f0 Merge pull request 'HitFX, Early/Late display with ms' (#35) from domdoc-develop into master
Reviewed-on: #35
2022-05-27 09:17:11 +00:00
domdoc 96f331e1e3 Fixed Early/Late text or ms show when it shouldn't 2022-05-26 12:21:11 +02:00
domdoc e5594c5978 Adjusted STANDARD Early/Late position 2022-05-26 12:00:22 +02:00
domdoc b4f7709a3e Adjusted landscape UPPER+ EarlyLate position 2022-05-26 11:40:26 +02:00
domdoc d1d620a599 Added Digital-Serial-ExtraBold for Early/Late 2022-05-26 11:36:20 +02:00
domdoc 39631eb320 Added separate landscape/portrait Early/Late pos. 2022-05-25 20:32:50 +02:00
domdoc 962f2c27d7 Early/Late scaling + Digital-Serial-Bold font 2022-05-24 11:04:06 +02:00
domdoc 8bbea73be5 Adjusted Early/Late display colors 2022-05-16 11:21:19 +02:00
domdoc ee2ab97f45 Adjusted Early/Late fontsize 2022-05-16 11:02:06 +02:00
domdoc 3b1860db70 Commented HitFX scaling on FX buttons 2022-05-16 10:44:36 +02:00
domdoc 4be2617944 Lowered cursor tail alpha 2022-05-16 10:35:11 +02:00
domdoc ecd362a98a Moved cursor rendering to overlay 2022-05-16 10:32:41 +02:00
domdoc e86ff7754a Added cursor tail (LiqidWave placeholder texture) 2022-05-16 10:21:31 +02:00
domdoc f2288ecf71 Added laser HitFX 2022-05-15 11:07:07 +02:00
domdoc 48d1424b63 Added hold animations 2022-05-14 19:35:35 +02:00
domdoc 5b34b1313b Early/Late display with ms + settings 2022-05-14 10:54:17 +02:00
domdoc 1dafc383bb Fixed hit anims showing for Idle hits 2022-05-12 15:12:25 +02:00
gskbladez b18b6c8a82 '7' texture updates, new exceed textures, footer texture fix 2022-05-05 23:28:10 -04:00
gskbladez 0fde02b132 minor texture changes for splash, hitanims. 2022-04-27 00:15:10 -04:00
Local Atticus 7f3dc98cbf Lasers and cursors can be recolored 2022-04-27 00:09:30 -04:00
Hersi cd26ac2b16 hotfix nil error in UpdateDialogField 2022-04-27 03:09:05 +02:00
Hersi badbaabe2b Merge branch 'master' into titlescreen-refactor 2022-04-27 02:49:17 +02:00
Hersi 98544e5e8a change class instantiation implementation 2022-04-27 02:49:04 +02:00
local d75982154e Merge pull request 'Nears now' (#16) from feat/local/hitfx into master
Reviewed-on: #16
2022-04-27 00:47:15 +00:00
Local Atticus 265c8fcf8f Add nears 2022-04-26 20:45:37 -04:00
Hersi 5598431951 Merge branch 'master' into titlescreen-refactor 2022-04-27 02:40:38 +02:00
Hersi 9937f56a4d new() doesn't need to be a class method 2022-04-27 02:40:22 +02:00
Local Atticus 54b1fac8d7 Add useFootGun 2022-04-26 20:12:19 -04:00
local b07d72879c Merge pull request 'Get basic ht anims working' (#15) from feat/local/hitfx into master
Reviewed-on: #15
2022-04-27 00:04:45 +00:00
Local Atticus 20a7100521 Refactor based on feedback and fix bugs 2022-04-26 20:03:42 -04:00
Local Atticus 5268ac47a5 Get basic ht anims working 2022-04-26 18:12:14 -04:00
Hersi 3ea1429eab refactor class.lua (because Local is a bulli) 2022-04-27 00:06:42 +02:00
gskbladez 2d8fc019c8 new hitanims 2022-04-25 17:26:02 -04:00
Hersi d1458d2ee2 Fix IR docs 2022-04-25 23:21:02 +02:00
Hersi ecdeab919c account filename for linux build 2022-04-25 22:22:11 +02:00
Hersi 789038d24f Merge branch 'feat/titlescreem-redo' 2022-04-25 17:29:35 +02:00
Hersi 02f9a05e34 bootpage implementation done
implemented update dialog
made UpdateDialogField into a generic DialogField
2022-04-24 15:07:52 +02:00
Hersi 9fcef8c9e5 why tf is there no game.LOGGER_DEBUG? 2022-04-24 01:43:15 +02:00
Hersi e9908b6014 better docs for IR function parameters 2022-04-24 01:42:56 +02:00
Hersi e8552b44a4 bootpage implementation 2022-04-24 01:39:48 +02:00
Hersi eb55b8ffa0 add clear() to PageView 2022-04-24 01:38:28 +02:00
Hersi 9cab4201c6 ServiceField uppercase label 2022-04-24 01:35:51 +02:00
Hersi 0b809dc798 add logging to titlescreen and filereader 2022-04-24 01:29:17 +02:00
Hersi a3ae25cfad why tf is there no game.LOGGER_DEBUG? 2022-04-24 01:18:05 +02:00
Hersi 27431215c3 better docs for IR function parameters 2022-04-24 00:06:48 +02:00
Hersi f44ba3743b tldr; bootpage initial implementation, fixes for page management code
added supporting functions for BootPage
removed init() from classes, it was stupid to begin with
handleButtonInput() and handleKnobInput no longer optional
added callback member to SelfTestField
placement position value fixes
use gfx.Translate instead of explicitly setting off-origin x,y values
added MARGIN and PADDING calculations to fields
removed unnecessary gfx.BeginPath() calls
2022-04-15 04:54:47 +02:00
Hersi 868d5b9798 use generics in class creation functions' docstrings 2022-04-14 23:14:13 +02:00
Hersi 509dd46e37 fix lua api docs for GetKnob() 2022-04-12 23:46:31 +02:00
Hersi 5e5c00272f implemented ListField
added refreshFields() to ContainerFields
added a message object parameter to Field:activate(), focus() and deactivate() methods
added anti-stupidity measures to InputButtonField and InputKnobField
fixed some multi-inheritance order mixup (yay! lua hacks)
replaced unnecessary importing of the common.dimensions module
removed unnecessary stop_processing variable from handleButtonInput() methods
fixed MainMenuPage
added PAGE_PADDING static member to ServicePage
wrote in-code documentation for members and methods
2022-04-12 23:45:28 +02:00
Hersi fe7e60af05 fix lua api docs for GetKnob() 2022-04-12 23:35:18 +02:00
Hersi eae3ab452e Merge branch 'assets' into feat/titlescreem-redo 2022-04-12 01:03:52 +02:00
Hersi b7bf357238 fix function name 2022-04-12 01:03:37 +02:00
Hersi a7594d9ec2 fix nil values getting into matches in FindPatterns() 2022-04-11 19:37:51 +02:00
Hersi 556bb9048d help me, god, why have you forsaken me
renamed linkfield to servicelinkdfield to differentiate between the two
modified Inherit() to accept multiple base classes
applied code format (oh god, oh f*ck, all the changed lines)
handleScreenResponse now doesn't crash when nil is passed
added boot screen module to titlescreen.lua
added a utility function to cycle indexes
added a containerfield (biggest brain addition)
refactored how class construction is implemented (declare it a class at the end of the constructor, this way the default values are correctly imparted)
added init() to the Field class
added a getParentPage() to the Field class, for easy nav handling
added offsets and bounding box size variables to the Field class
the Field class will now scissor itself into it's bounding box
LinkField now has clearer logs
added init() to the Page class
added skeleton field classes for boot page
2022-04-11 18:47:26 +02:00
gskbladez c9a9fa4de6 updated near splash fx 2022-04-09 23:47:31 -04:00
Hersi 2f034c99c1 add page getter to PageView
removed unnecessary comments from service.lua
2022-04-05 23:55:50 +02:00
Hersi df66b1592b add __tostring fields to classes 2022-04-05 23:53:19 +02:00
Hersi 83c3504e7d make file and folder names consistent 2022-04-05 17:32:55 +02:00
Hersi d3853485f8 fix module paths 2022-04-05 17:31:02 +02:00
Hersi c366753c36 refactored directory structure 2022-04-05 17:17:25 +02:00
Hersi b62dc2764a added game file reader utilities
added more fields to VersionInfoPage
2022-04-05 06:36:11 +02:00
Hersi aa2ba01550 added VersionInfoPage service page
added a way to update USC from the skin
added game configuration reader helper functions
added version string getters to version.lua
2022-04-04 01:58:10 +02:00
Hersi b08c1fb580 added ColorCheckPage and ColorGradientField
fixed ServicePage references in functions
added lerp function to util.lua
2022-04-03 23:24:17 +02:00
Hersi a0ba0b7390 added ScreenCheckPage 2022-04-03 22:08:31 +02:00
gskbladez f28f2e6abf new title screen things 2022-04-03 14:51:11 -04:00
Hersi 6e42ccafc6 Added MainMenuPage
Added LinkField and LinkServiceField
Added state handling functions to Field
Added Page refreshFields to ServicePage
2022-04-03 19:51:56 +02:00
Hersi 297cd161bd Added class creation helper functions
Added a refreshFields function in Page
Fixed typo from selectedIndex/selectedIdx to self.selectedIndex
Added custom input handling to InputCheckPage
2022-04-03 19:47:09 +02:00
Hersi 515d3aa54a added InputCheckPage
added ServiceField class and derived classes
removed redundant function from Field
added a replace method to pageview
2022-04-03 04:59:43 +02:00
Hersi e8f7471663 preliminary version of credits splash 2022-04-03 03:02:16 +02:00
Hersi aecfc1c925 fix sample not playing when exiting from service screen 2022-04-03 02:10:26 +02:00
Hersi 984051205d move "skip" text to the bottom left 2022-04-03 01:45:54 +02:00
Hersi 5eb141b840 Merge branch 'assets' into feat/titlescreem-redo 2022-04-03 01:43:27 +02:00
gskbladez c5aee2b46a usc name fix 2022-04-02 19:40:13 -04:00
Hersi b1649fa80f BEEEG "reimplementation" of service screen
new pager/page management library
2022-04-03 01:35:41 +02:00
gskbladez 07906b8ec0 teamexceed 2022-04-01 20:38:37 -04:00
gskbladez f450ec3b3b new subtitle textures 2022-04-01 20:36:42 -04:00
Hersi e19763a9bf fixed song settings dialog 2022-03-30 18:47:31 +02:00
Hersi e1c726265c add dimensions module to songwheel, filterwheel 2022-03-30 17:40:39 +02:00
gskbladez 8ea2652839 Merge branch 'feat/titlescreem-redo' into assets 2022-03-30 10:56:31 -04:00
Hersi f75859f7ce Merge branch 'master' into feat/titlescreem-redo 2022-03-30 16:51:25 +02:00
gskbladez 1208a7a202 Merge branch 'feat/titlescreem-redo' into assets 2022-03-30 10:41:18 -04:00
Kuenaimaku 776fd6035b Merge pull request 'add jacketPath to challengesCache' (#14) from bugfix/TASK-55-fix-challenge-wheel into master
Reviewed-on: #14
2022-03-30 02:34:49 +00:00
Kyle Humphrey ea9c39cead add jacketPath to challengesCache 2022-03-29 21:33:52 -05:00
gskbladez 44c2a10783 1 file name change, updated title text 2022-03-29 21:01:25 -04:00
Hersi 819b220357 added base classes for service page management 2022-03-30 02:53:27 +02:00
Hersi 9dffa1332a start revamping service screen structure
implemented some generic drawing functions
also removed that god damned ";" endings from everywhere, this is lua, not C
2022-03-29 04:29:28 +02:00
Hersi 0831597d3a fix transition color in splash screen 2022-03-29 04:27:37 +02:00
Hersi 7704c45dd0 use the resource table for audio samples 2022-03-29 04:27:12 +02:00
Hersi f227df0dee implemented mouse controls for titlescreen mode_select
added supporting functions to util and dimensions
2022-03-27 03:54:02 +02:00
Kuenaimaku 20700c4631 Merge pull request 'feature/TASK-26-timing-windows' (#13) from feature/TASK-26-timing-windows into master
Reviewed-on: #13
2022-03-27 01:27:22 +00:00
Kyle Humphrey 5951529809 update bottom panel 2022-03-26 20:25:20 -05:00
Kyle Humphrey 24a20a2e87 add timing graph and suggested offset to results 2022-03-26 00:26:29 -05:00
Kyle Humphrey 0fb98a8abf Merge pull request 'fix Max Chain not resetting on gameplay restart (f5)' (#12) from feature/TASK-19-reset-max-chain-on-restart into master
Reviewed-on: #12
2022-03-26 05:23:52 +00:00
Hersi 5d3e4457eb refactor and format document for mode_select
add wallpaper and dim modules to mode_select
2022-03-26 02:21:54 +01:00
Hersi 408feed832 got rid of the reference shenanigans from dimensions 2022-03-26 00:38:30 +01:00
Kyle Humphrey 4a293e70ae fix Max Chain not resetting on gameplay restart (f5) 2022-03-25 17:21:02 -05:00
Kyle Humphrey c3e4eff904 Merge pull request 'fix challengewheel' (#11) from feature/TASK-6-Special-Diff-Boxes into master
Reviewed-on: #11
2022-03-25 05:08:20 +00:00
Kyle Humphrey e77799c4c0 fix challengewheel 2022-03-25 00:07:39 -05:00
Kyle Humphrey b2417276f5 Merge pull request 'why was this shim even there in the first place' (#10) from feature/TASK-6-Special-Diff-Boxes into master
Reviewed-on: #10
2022-03-25 04:57:42 +00:00
Kyle Humphrey 26798bbd67 why was this shim even there in the first place 2022-03-24 23:57:00 -05:00
Kyle Humphrey 53e646ec30 Merge pull request 'haha fixing data structures' (#9) from feature/TASK-6-Special-Diff-Boxes into master
Reviewed-on: #9
2022-03-25 04:47:00 +00:00
Kyle Humphrey 7c1ab29712 haha fixing data structures 2022-03-24 23:45:51 -05:00
Kyle Humphrey a2446b8954 Merge pull request 'fix special difficulty boxes within result and gameplay screens' (#8) from feature/TASK-6-Special-Diff-Boxes into master
Reviewed-on: #8
2022-03-25 04:04:52 +00:00
Kyle Humphrey 0e93e60aea fix special difficulty boxes within result and gameplay screens 2022-03-24 23:02:54 -05:00
Kuenaimaku c76e174b58 Merge pull request 'fix edge case where songwheel would break if there is no song in index' (#7) from bugfix/filterwheel-collections-no-song-fix into master
Reviewed-on: #7
2022-03-23 22:53:48 +00:00
Kyle Humphrey cc73423b6a fix edge case where songwheel would break if there is no song in index 2022-03-23 17:52:06 -05:00
Kuenaimaku 90421885f5 Merge pull request 'add letter on scrollbar in SongWheel' (#6) from feature/TASK-21-Scrollbar-fix into master
Reviewed-on: #6
2022-03-16 07:25:03 +00:00
Kyle Humphrey a3fa6350c1 add letter on scrollbar in SongWheel 2022-03-16 02:24:02 -05:00
Kuenaimaku fd39df9099 Merge pull request 'reimplement scrollbar for songSelect and folderSelect' (#5) from feature/TASK-21-Scrollbar-fix into master
Reviewed-on: #5
2022-03-16 04:54:32 +00:00
Kyle Humphrey 841fb1fa35 reimplement scrollbar for songSelect and folderSelect 2022-03-15 23:51:53 -05:00
Kuenaimaku 007592554c Merge pull request 'add gauge flags on results screen' (#4) from feature/TASK-16-Results-Gauge-Flags into master
Reviewed-on: #4
2022-03-14 22:43:02 +00:00
Kyle Humphrey e077c44159 add gauge flags on results screen 2022-03-14 17:40:33 -05:00
gskbladez 537cdd66ce Merge branch 'master' of https://git.hersi.changeip.net/hersi/ExperimentalGear 2022-03-12 17:52:16 -05:00
gskbladez 1d83e05160 Random minor things 2022-03-12 17:52:14 -05:00
Kuenaimaku 8838562f2a Merge pull request 'feature/TASK-4-Search-Bar-Rework' (#3) from feature/TASK-4-Search-Bar-Rework into master
Reviewed-on: #3
2022-03-12 22:48:51 +00:00
Hersi edcb7b8407 auto-formatting 2022-03-12 15:18:41 +01:00
Hersi 6e011b19eb add triggers to titlescreen 2022-03-12 15:18:24 +01:00
Hersi 9add99e777 titlescreen documentation and restructure 2022-03-12 15:17:20 +01:00
Kyle Humphrey 4cabc5990f implement skin config for search controls window 2022-03-10 19:02:48 -06:00
Kyle Humphrey 59cf769508 update search info textures 2022-03-10 17:43:19 -06:00
Kyle Humphrey 20e4cb4150 add searchbar transition, darken bg, and search info 2022-03-09 02:24:21 -06:00
Hersi b96e80d490 add missing IR documentation 2022-03-04 16:02:19 +01:00
Hersi af71838493 added skipIntro skin setting
moved json.lua into common
renamed common.lua to util.lua
moved stopMusic() into common/sound.lua
moved numbers.lua into components
removed unused shared directory
removed unused settingswheel.lua
2022-03-04 04:06:19 +01:00
Hersi 98ab8bfb62 Removed log spam
renamed function to be more appropriate
2022-03-03 04:01:54 +01:00
Hersi b586a217a3 Implemented splash screen 2022-03-03 03:55:46 +01:00
Hersi 2f01f9f96c Added "wallpaper" component
Added common dimensions script
2022-03-03 03:55:19 +01:00
Hersi 514a22f793 Merge branch 'master' into feat/titlescreem-redo 2022-03-02 17:28:46 +01:00
Hersi 35be46bc45 better gitignore crew folder 2022-02-28 16:40:20 +01:00
Hersi 7a8c3c54e0 Merge pull request 'cleanup' (#2) from cleanup into master
Reviewed-on: #2
2022-02-28 12:15:49 +00:00
Hersi 5292e69527 re-add RealFD to credits 2022-02-27 23:53:21 +01:00
Hersi 56971a58a1 removed unused fonts 2022-02-27 23:32:15 +01:00
Hersi f988ae3ac8 removed old scripts 2022-02-27 23:32:03 +01:00
Hersi e5c0ecb0b8 Merge branch 'master' into cleanup 2022-02-27 23:13:23 +01:00
gskbladez 85963734aa the most minor of edits to song panel 2022-02-27 13:05:16 -05:00
gskbladez 29e5373b7e song panel update 2022-02-27 12:58:45 -05:00
gskbladez da810d8a4e minor multi changes 2022-02-26 17:58:39 -05:00
gskbladez 4588c18958 WIP MULTI UPDATE 2022-02-26 15:39:48 -05:00
fdigl 3617862364 add special folder case for lowercase nautica
Nautica downloader created a folder with all lowercase letters, this may
not be detected by the specified key.
2022-02-22 18:12:15 -08:00
fdigl 2188f4dbce add additional special folder keys
Apparently I'm special and name things different from everybody else
2022-02-22 18:08:06 -08:00
Hersi d38372ae31 fix typo in titlescreen.lua 2022-02-22 17:16:09 +01:00
Hersi d725b118c2 cleaner gitignore 2022-02-22 17:15:56 +01:00
Hersi e669dfc009 removed unused textures 2022-02-22 16:28:14 +01:00
fdigl 62839291de image optimization
all image resources passed through optimizing algorithm v3.4.0.1
2022-02-21 22:03:24 -08:00
Hersi 206ad5c60d add RealFD to credits 2022-02-20 17:40:58 +01:00
Hersi d0c2932c5b normalize line endings 2022-02-20 17:27:27 +01:00
Hersi 83130bb2c3 Merge branch 'hu_lang' 2022-02-20 15:58:07 +01:00
Hersi 6b4eac23e2 Added crew folder 2022-02-20 15:52:54 +01:00
Hersi b6f4901c59 crit_line update 2022-02-20 05:01:15 +01:00
gskbladez 1e0f27b6dd ksm wav 2022-02-17 18:34:42 -05:00
FajsiEx b43223b636 Merge https://git.hersi.changeip.net/hersi/ExperimentalGear
Merge stuff
2022-02-17 18:12:51 +01:00
FajsiEx b78640f99f - redacted 2022-02-17 18:11:35 +01:00
FajsiEx 535eaac269 ^ 0.2.2 & - debug text & * activate debug info with skin setting 2022-02-17 18:06:25 +01:00
FajsiEx 0c4bf73857 - that god awful eye sore bg 2022-02-17 17:55:44 +01:00
FajsiEx 06dd404285 + versionnumber to title screen 2021-12-21 19:49:11 +01:00
FajsiEx ae7b9d8824 + title screen to titlescreen (fuck) 2021-12-21 19:39:34 +01:00
FajsiEx 634c85436c + splash1 sfx 2021-12-20 15:38:54 +01:00
FajsiEx f7b6a0c0e9 + better dummy service menu items & + children, color and 'back' type support 2021-12-20 01:34:41 +01:00
FajsiEx bd967aeef1 + service menu 2021-12-20 00:39:38 +01:00
FajsiEx e2c8403a92 + begining of titlescreen redo 2021-12-19 23:16:19 +01:00
Hersi 10e417714b hungarian lang definition 2021-12-01 23:33:53 +01:00
1312 changed files with 52188 additions and 12499 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
* text=auto

18
.gitignore vendored
View File

@ -1,7 +1,21 @@
# IDE files
.vscode
# secret(?) assets
_asset _asset
song-assets song-assets
skin-assets skin-assets
# generated skin files
nautica.json nautica.json
skin.cfg skin.cfg
.vscode
/textures/crew/ # any crew that's not the default one, we do not package crew
textures/crew/*
!textures/crew/appeal_card.png
!textures/crew/frame.png
!textures/crew/portrait.png
!textures/crew/make-a-crew/frame_glow.png
!textures/crew/make-a-crew/frame_metal.png
!textures/crew/make-a-crew/instructions.txt
!textures/crew/anim/nothing

BIN
CHANGELOG Normal file

Binary file not shown.

View File

@ -3,12 +3,14 @@
Project Starter: GSK Bladez Project Starter: GSK Bladez
## Coding ## Coding
- FajsiEx - [REDACTED]
- Hersi - Hersi
- RealFD
- fdigl - fdigl
- Hoshikara - Hoshikara
- GSK Bladez - GSK Bladez
- Local - Local
- Kuenaimaku
## Graphics ## Graphics
- GSK Bladez - GSK Bladez

BIN
audio/titlescreen/ksm.wav Normal file

Binary file not shown.

Binary file not shown.

View File

@ -205,7 +205,7 @@ local bgs = {
-- Layer={Tex={"electro1.jpg", "electro1-c.jpg"}, brightenLayer=0.6}, u={Pivot=0.35}} -- Layer={Tex={"electro1.jpg", "electro1-c.jpg"}, brightenLayer=0.6}, u={Pivot=0.35}}
-- }, -- },
-- electro2={Bg={Layer={Tex={"electro2.jpg", "electro2-c.jpg"} }, u={Pivot=0.3}}}, -- electro2={Bg={Layer={Tex={"electro2.jpg", "electro2-c.jpg"} }, u={Pivot=0.3}}},
plasmaTunnel={Bg={Layer={Tex={"plasmatunnel.jpg", "plasmatunnel-c.jpg"}, }, u={Pivot=0.37}}, speed=0.75, bright=true}, -- plasmaTunnel={Bg={Layer={Tex={"plasmatunnel.jpg", "plasmatunnel-c.jpg"}, }, u={Pivot=0.37}}, speed=0.75, bright=true}, -- my eyes are burning
-- xcalibur={Bg={Base={Tex={"anim/xcalibur.jpg", "anim/xcalibur-c.jpg"}}, u={Pivot=0.36}}, speed=0.3}, -- xcalibur={Bg={Base={Tex={"anim/xcalibur.jpg", "anim/xcalibur-c.jpg"}}, u={Pivot=0.36}}, speed=0.3},
goldleaves={ goldleaves={
Bg={Base={Tex={"anim/goldleaves.jpg", "anim/goldleaves-c.jpg"}}}, Bg={Base={Tex={"anim/goldleaves.jpg", "anim/goldleaves-c.jpg"}}},

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 MiB

After

Width:  |  Height:  |  Size: 9.8 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 239 KiB

After

Width:  |  Height:  |  Size: 200 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 149 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 KiB

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 941 KiB

After

Width:  |  Height:  |  Size: 868 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 KiB

After

Width:  |  Height:  |  Size: 216 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 KiB

After

Width:  |  Height:  |  Size: 190 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 279 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 KiB

After

Width:  |  Height:  |  Size: 386 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 369 KiB

After

Width:  |  Height:  |  Size: 351 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 KiB

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 195 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 KiB

After

Width:  |  Height:  |  Size: 226 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 354 KiB

After

Width:  |  Height:  |  Size: 351 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 498 KiB

After

Width:  |  Height:  |  Size: 474 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 KiB

After

Width:  |  Height:  |  Size: 216 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 KiB

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Some files were not shown because too many files have changed in this diff Show More