Commit graph

35 commits

Author SHA1 Message Date
ManDude dee8feb003
fix a game bug and add a new compiler feature (#1758)
* dont crash on inline static value array

* [goalc] add support for non-static inline arrays of values

* add a kernel group to jak1

* move and cleanup pc debug code

* random cleanup in `hud-classes`

* pc port fix for gondola spools

* format

* address feedback (wow it was actually just changing 1 line all along...)

* minor decomp cleanup

* ref test
2022-08-15 18:46:29 -04:00
Matt Dallmeyer bbfdd45de0
Support 4 controllers (#1751)
* Detects all controllers properly on boot now

* warn -> info

* linting

* add comments to deftype changes
2022-08-14 17:21:38 -04:00
ManDude 9ce3f8e718
fix invincibility cheat codes + some japan-specific changes (#1750)
* fix invincibility cheat not working properly and fixed requirement

* typo

* added YMD for japan version of the game

* remove language cheat

* use language checks instead of territory checks in title logo

* forgot this call
2022-08-10 18:35:34 -04:00
ManDude 26f19e8b14
cleanup cheats menu + change game territory logic + some subtitles (#1733)
* use `game-text-id->string` function here

* small cleanup to pc progress code

* better way to handle "locked" texts

* this is better

* fix potential incompatibilities with merc & ocean renderers

* show cheat requirements in menu + change requirements

* increase size of money starburst

* split some more subtitles

* potentially fix a vsync bug?

* change territory encoding logic

* pass game territory to compiler

* ugh LOL
2022-08-06 11:57:19 -04:00
ManDude 5148523917
more small cleanupses (#1722)
* reduce max supersampling options in progress menu

* cleanup knuth rng file

* save & load cheats

* allow keyboard controls when cpad is connected

* ignore key presses when imgui is being used

* save settings when quitting game
2022-08-03 21:51:13 -04:00
ManDude 3e538dabe6
more random cleanup (#1716)
* correct some comments

* change `pc-cheats?` macro to be more generic

* more generic custom fps stuff

* better subtitle timings

* oopsie!

* fix burn effect stacking

* fix some windows scripts

* fix project

* cleanup this func

* more fix

* oops

* ???
2022-08-02 18:48:10 -04:00
Ethan Lafrenais 88856ba5e0
Add in-game option to switch fullscreen monitor (#1700)
* Add in-game option to switch fullscreen monitor

* mmm undefined memory :)

* Fix type consistency

* Optimize get_monitor and get_monitor_count since they're called often

* Address PR feedback

* Track fullscreen mode and minimized state to reduce GLFW calls per frame
2022-07-31 13:31:17 -04:00
Matt Dallmeyer a04bdff80d
RNG - mimic Java's Util.Random (#1672)
* initial java Util.Random mimic

* add comment referencing java impl

* fix 64 bit stuff

* copy scf-time definition into math.gc, use for initial seed

* rename java -> knuth

* move knuth-rand to separate file

* move knuth-rand to separate file

* PR comments
2022-07-29 20:04:22 -04:00
Hat Kid d53f0ccd35
Add German subtitles (#1502)
* subtitles: add german subtitles for new progress menu options

* subtitles: add german subtitles for village1, beach

* missed some strings

* jungle, firecanyon, finalboss cutscenes

* add framrate options to progress menu

* fix samos line

* add citadel cutscenes

* add text version to subtitles

* add text version to text file

* `sidekick` hints

* fix up `mayor-introduction`

* oops

* `training` hints

* `village1` hints

* `lavatube` hints

* `snowy` and `spidercave` hints

* `finalboss` hints

* `firecanyon` hints and cutscenes

* `beach` hints

* update game text file

* finish up subtitles

* add german to progress menu sub setting

* split all bad lines and fix a few small errors

* remove test block
2022-07-29 19:58:27 -04:00
Hat Kid acd2ac20f4
game: add text language to debug menu (#1696) 2022-07-22 10:03:39 +01:00
Ethan Lafrenais 3cfb2ff681
Some more high FPS fixes (#1687)
* Fix rat game camera speed > 60fps

* (Mostly) fix swamp balance platforms at high fps

I think there's other physics stuff factoring into this, but these changes should cover what's specific to the platforms.

* forgot notes

* Fix baby spider wiggling too fast on high fps

* Rat game camera now takes into account lag frames
2022-07-21 18:08:45 -04:00
Ethan Lafrenais bb323c2ebe
Depth Cue (#1676)
* Initial depth-cue implementation

* Oops

* Finish merge + fix issues with letterboxing

* Fix alpha blending

* Add some debug options + profiler stats

* More debug options + respect xyoffset GS register

* Clean up GOAL code

* Disable depth-cue by default

* typo

* very important typo

* depth-cue disable, but better
2022-07-19 18:34:30 -04:00
ManDude d2f104cd43
implement a cheats menu + a few bug fixes (#1677)
* raise particles cap to 10x

* change a text line

* allow sound bank load during vag

* fix default settings and fps setting

* keep "auto save disabled" option in menu

* cheats menu!

* Update game_text_ja.gs

* fix battle hud crash

* add cheats menu to title

* update settings version

* Update all-types.gc

* disable envmap fade out with hires actor lod setting

* disable merc fadeout if not using ps2 actor lods

* dont update aspect ratio if game size is bad

* set vsync later

* increase memory for generic, sprite and dma.

* fix issues with aspect ratio not saving

* split forcing envmap to a separate toggle

* too slow, dont expose to users yet
2022-07-18 19:54:38 -04:00
Hat Kid e7ff3fbb51
game: add secrets menu, music player and some more pc settings to the debug menu (#1664)
* add secrets menu, music player and some more pc settings

* remove todos

* rename string funcs

* replace cases

* add `game-text-id->string` function, refactor player menu generation

* remove process check, `cons` -> `dcons`, `strncpy`
2022-07-18 02:22:04 +01:00
water111 7c04cf6a11
[graphics] fix flutflut eye drawing with merc (#1674)
fix flutflut eye
2022-07-17 20:43:37 -04:00
ManDude edbc7af256
make aux list not get cleared when game is paused (#1673)
* make aux list not get cleared when game is paused

* remove unnecessary hud hack
2022-07-17 20:16:41 -04:00
Zedb0T 4c3e23bcb9
Pc port debug small qol (#1663)
* Enable L2 'boost if cheatmode is on and PC PORT

Nice QOL

* Enable daxter intro CS skip in retail mode on PC_PORT

* Add empty jak1 folder in ISO_DATA

We can revert this if we want but yeah I just think its more convenient by a tiny tiny tiny amount

* Fix typo in comment to be consistant

This probably isn't a typo but like a EU/US thing or something however I changed it just to be consistent with the other 382 instances in the port.

* Add gitignore back to root ISO_Data folder

* Remove early mention of Jak 2

* Update .gitignore

!**/.gitignore
2022-07-17 14:14:57 -04:00
ManDude 12fd8a09b1
allow select pause in retail mode (#1665) 2022-07-16 19:28:40 -04:00
water111 8005af05ee
[gfx] fix merc/generic eye detection (#1657) 2022-07-16 19:23:14 -04:00
water111 193712a236
[gfx] add more annoying opengl texture initialization (#1654)
* [gfx] add more annoying opengl texture initialization

* fix catastrophic typo
2022-07-15 19:16:36 -04:00
Ethan Lafrenais 3b558e093e
Fix instanced sprite distort renderer not always using the most recent sine table (#1646)
* Fix instanced sprite distort renderer not always using the most recent sine table

Sometimes the game won't update the sine table on the same frame the aspect ratio changes (for example if the player is in a cutscene), but the renderer assumed that it was always up-to-date on the next frame. This caused it to occasionally use outdated vertex/tex coord data that usually made the distort sprites a little too small/big.

* Same fix, but better
2022-07-15 18:16:46 -04:00
water111 04f440b7cc
improvements to custom level blender import (#1649) 2022-07-14 23:38:29 -04:00
ManDude 20ab48796d
split game framebuffers to allow custom resolutions/shaders (#1641)
* split rendering framebuffer

* fix blackout

* unhardcode c++ stuff

* optimization

* implement goal side of all this

* fix msaa

* sprite distort fixes

* fix resolution menu options

* save & load msaa

* linear filtering on the game screen

* fix bad texture units

* fun!

* unused

* make screenshot button capture the framebuffer and not the window buffer

* panik

* screenshot settings

* fix black screen on first frame of new framebuffer

* default fullscreen resolution to the screen size

* hide funny resolutions in windowed since it makes no sense
2022-07-14 21:37:03 -04:00
Brent Hickey 8c940ea529
fix typo (#1645)
fix typo and simplify
2022-07-14 06:21:25 +01:00
ManDude 163e86130f
separate language settings into 3 settings/options (#1636)
* only show subtitle notices during a subtitle context

* move language & subtitles (back) to game options

* remove "accessibility" menu and put its option in "misc"

* new subtitle language selection

* properly split audio & text language

* Update game_text_en.gs

* misc setting size fixes

* better fix for subtitle notice

* final touches

* subtitle fixes & uk-english subtitles

* more english fixes
2022-07-12 18:00:52 -04:00
Ethan Lafrenais 6eb4750242
Some high FPS fixes (#1634)
* Fix floating rigidbodies at high FPS

- Caused the 'player impact' sound to play many times
- Simulation speed was also sped up in general (platforms would snap back to the neutral angle/position much faster)

* Fix lightning moles being a pain to chase on higher framerates

* Add high fps note

* Fix swamp rats wiggling too fast on high fps

* Fix 'kermit' moving super fast while airborne on high fps

* Fix low health animation for high fps

* Fix low eco animation for high fps

* Fix launcher cam rotating too fast with the analog stick at high fps

* Tweak high fps comments

* Fix zoomer heat HUD flashing too quickly on high fps

* Forgot a comment
2022-07-10 19:11:24 -04:00
Ethan Lafrenais 8ba010ca97
Sprite Distort (#1626)
* [WIP] initial sprite distort implementation

* Clean up

* More clean up + document sprite distort VU program

* Format code

* Address CI issues

* Adjust hacks in distort fragment shader

* oops

* Optimize sprite distort rendering down to one draw call

~2x speed up

* Format file

* Clean up distort rendering and add separate profile scopes

* Fix glVertexAttribPointer

* Fix sprite distort getting messed up when the viewable area doesn't fit the window perfectly

* Add debug option to disable sprite distort

* One evil space to fail CI...

* oops

* Increase sprite-aux-list size when PC_BIG_MEMORY is true

* Address lints
2022-07-08 21:56:38 -04:00
ManDude 9ede08977f
add text messages for subtitle toggling + subtitle editor fixes (#1617)
* add final cutscene subtitle and fix some editor bugs

* `title` and `finalboss` hints

* messages and notices for subtitle toggling

* fix colors in currently selected cutscene menu

* subtitle positioning fixes

* Update game_subtitle_en.gd
2022-07-06 18:09:01 -04:00
ManDude b74399ed57
rework goal_src structure for jak 1 a bit (#1615)
* move files

* update game.gp
2022-07-05 16:00:09 -04:00
ManDude 9821304f44
add vibration option back in + make new aspect ratio menu (#1610)
* add vibration option back in + make new aspect ratio menu

* update this notice...

* add 900p resolution

* fix test

* typo
2022-07-05 13:49:37 -04:00
ManDude 5de9547d07
fix wrong vag stream playing sometimes (#1608) 2022-07-05 12:14:05 -04:00
ManDude 7084742a3d
fix seagulls at high fps (#1607) 2022-07-05 12:11:05 -04:00
ManDude 87d24dd291
add "disable autosave" option to menu and change memcard warning (#1592)
* add "disable autosave" option to menu and change memcard warning

* reduce duplication

* fix test
2022-07-03 17:27:55 -04:00
ManDude 9676100039
finish out english subtitles (#1586)
* put some duplicated code in a func

* make jak 2 text "work"

* group up all subtitles c++ code into one folder

* compact single-line subtitles

* fix a couple compiler crashes

* Update game_subtitle_en.gd

* `rolling` and `sunken`

* `swamp`

* `ogre`

* `village3`

* `maincave`

* `snow`

* `lavatube`

* `citadel`

* Update .gitignore

* clang

* fix encoding and decoding for quote

* properly fix quotes

* subtitle deserialize: sort by kind, ID and name

* sub editor: fix line speaker not being converted

* cleanup game text ids 1

* update text ids 2

* update source

* update refs
2022-07-03 17:25:28 -04:00
Tyler Wilding 36dc015d62
jak2: Create goal_src skeleton (#1576) 2022-06-29 22:20:09 -04:00