RuiFPB/tyra-linux
1
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity
189 Commits 1 Branch 11 Tags
4a1bca12aa0d1f4de4e2cf9018a89f4bd2086aba
Commit Graph
46 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Mostowik 24bab8464a Merge pull request #3 from Foxar/develop 
Foxar develop->Foxar master-> PR #58 h4570/tyra
 2020-12-10 17:59:09 +01:00
Foxar 4bee938106 PR Review: Memory de-allocation, misc. fixes. 2020-12-10 17:49:53 +01:00
Michał Mostowik 86c48eeca4 Merge pull request #2 from Foxar/master 
PR Review, removing commented line
 2020-12-10 17:43:36 +01:00
Michał Mostowik 97151ffc78 PR Review, removing commented line 2020-12-10 17:37:44 +01:00
Michał Mostowik bc44f598c1 Merge pull request #1 from Foxar/master 
Master to develop
 2020-12-10 16:35:09 +01:00
Foxar 5129d53b27 Added: Missing mine class files. 2020-12-10 16:32:01 +01:00
Foxar 1539aa4108 Merge branch 'master' of https://github.com/Foxar/tyra 
I really freaked last pr up so here's a merge to fix it
 2020-12-10 16:31:12 +01:00
Foxar 0c0512b37f Added: Game over screen 2020-12-10 14:38:12 +01:00
Foxar e7aa4d13cc Added: Mines now explode and hurt the player, added new makefile and made more mines spawn on game start. 2020-12-10 13:52:45 +01:00
Foxar 1c9351e5e9 Added: Sea mines, when fully implemented, will explode and take lifes from player. 2020-12-10 12:52:54 +01:00
Foxar f86a1bf190 Added: Underwater/Above water soundscape, misc sound effects. Reworked player class a bit to contain pointer to the game engine for sound playing. 2020-12-09 14:27:40 +01:00
Michał Mostowik 36a637e5e6 Merge pull request #54 from h4570/hotfix/texture-size-vars 
Texture: Fixed var type bug
 2020-12-08 21:41:14 +01:00
Foxar c4fc52b043 Added: Sprites representing lifes player has left, and life variable. 2020-12-08 19:27:30 +01:00
Foxar 70efbcad46 Merge branch 'master' of https://github.com/Foxar/tyra 2020-12-08 19:24:22 +01:00
Michał Mostowik db635c09ea Merge pull request #4 from h4570/develop 
Develop pull
 2020-12-08 19:24:02 +01:00
Michał Mostowik edf5bd1e55 Merge pull request #50 from h4570/hotfix/draw-mesh-color 
Add mesh color blending to draw()
 2020-12-08 16:50:43 +01:00
Foxar f4421b659d Added: Seabed model/code. 2020-12-08 16:48:43 +01:00
Foxar 220caba84a Fixed: Added MODE_STRETCH to wateroverlay, fixing the tiling issue. 2020-12-08 15:30:48 +01:00
Michał Mostowik 921b482e61 Merge pull request #3 from h4570/develop 
Develop pull
 2020-12-08 14:54:12 +01:00
Foxar 45edf7aedb Added: Static fps member to dolphin.cpp, auto-updated with engine->fps, made player movement multiplied by deltatime of last frame. 2020-12-08 14:42:43 +01:00
Michał Mostowik 4557485cab Fixed datatype typos in dolphin.cpp 2020-12-08 14:20:00 +01:00
Foxar 582b42c29e Changed: Optimization from code review PR #42 2020-12-08 13:36:13 +01:00
Michał Mostowik 62cff819ff Merge pull request #45 from h4570/doc/audio 
Audio: Added small comment to loadADPCM().
 2020-12-07 23:51:13 +01:00
Michał Mostowik 729bcff954 Merge pull request #43 from h4570/feature/ambient-color 
Renderer: added setAmbientLight() and setWorldColor()
 2020-12-07 23:50:41 +01:00
Foxar 83dce5cb92 Changed: Slowed player rotation speed. 2020-12-07 20:09:17 +01:00
Foxar 32422b87eb Added: Collectibles now rotate, float up before disapeparing after being picked up. 2020-12-07 20:08:11 +01:00
Foxar 6292c27c50 Added: Camera automatically shifts to an angle from behind the player. 2020-12-07 19:30:07 +01:00
Michał Mostowik 18f3398687 Merge pull request #40 from h4570/feature/texture-inline 
Marked texture getters as inline
 2020-12-07 17:23:28 +01:00
Michał Mostowik 1c3edb3887 Merge pull request #38 from h4570/feature/sprite-modes 
Sprite modes (stretch/repeat)
 2020-12-07 17:23:06 +01:00
Foxar 0423e484a5 Changed: Dolphin sample FOV is now 75.F, zoomed in the camera, increased the distance for collectibles pickup. 2020-12-07 14:28:56 +01:00
Michał Mostowik ed6c20e5df Merge pull request #2 from h4570/develop 
Develop pull
 2020-12-07 13:37:02 +01:00
Michał Mostowik f95794c181 Merge pull request #36 from h4570/hotfix/vector3 
Fixed sqrt() VU0 calcs on real PS2
 2020-12-07 00:41:34 +01:00
Michał Mostowik 9f4f6f4b18 Merge pull request #34 from h4570/bugfix/path3-lighting 
Fixed path3 lighting on real PS2
 2020-12-07 00:40:26 +01:00
Foxar 9a94d93747 Merge pull request #30 from h4570/bugfix/2d-sprite-size 
Fixed rendering for non square 2D sprites
 2020-12-06 08:24:37 +01:00
Foxar 20b14a5168 Merge pull request #29 from h4570/h4570-patch-1 
Add .gitignore to dolphin sample
 2020-12-05 22:05:55 +01:00
Foxar c0ab97585c Added: collectibles class. Collectibles are strewn around the level and can be 'picked up' (deactivated, won't be rendered), when the player gets close and jumps. 2020-12-05 22:04:38 +01:00
Foxar b547de9cbb Stretched water overlay to fullscreen, made it appear when camera's sugmerged, disabled the invalid rotation during submerging ( issue number #10 ), enlargened and fixed position of the island mesh. 2020-12-04 16:50:25 +01:00
Foxar a05b4fbd0f Merge pull request #1 from h4570/develop 
Updating fork to the current state of main repo's develop branch
 2020-12-04 16:21:39 +01:00
Foxar 3e385f7c84 Merge pull request #6 from h4570/fix/readme 
Urls changes in readme file (ps2-tyra to h4570)
 2020-12-04 10:54:25 +01:00
Foxar 82361e4619 Merge pull request #5 from Foxar/master 
Included the missing dolphin.cpp and hpp files.
 2020-12-04 00:21:57 +01:00
Foxar b48d342adf Included the missing dolphin.cpp and hpp files. 2020-12-04 00:20:43 +01:00
Foxar 17ef6b9fbc Revert "Switched audio filenames to available binaries" 
This reverts commit 51702d5ef7.
 2020-12-03 20:25:13 +01:00
Foxar bae834e599 Added water mesh, jumping animation, skybox and diving. 2020-12-03 18:33:20 +01:00
Foxar 940271fe8c Merge remote-tracking branch 'upstream/master' 
zero
 2020-12-02 20:59:09 +01:00
Foxar 7e676916a0 Added new sample dolphin. 2020-12-02 20:54:19 +01:00
Foxar 51702d5ef7 Switched audio filenames to available binaries 2020-12-01 17:21:07 +01:00