 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 |
|
|
Sandro Sobczyński
|
083c041973
|
Merge pull request #56 from Foxar/master
Added: Sea mines, healing by collectibles, game over screen
|
2020-12-10 14:46:35 +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 |
|
|
h4570
|
a017c3a3b6
|
added color blending for draw()
|
2020-12-08 15:59:24 +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 |
|
|
Sandro Sobczyński
|
d9b5f8a4aa
|
Merge pull request #42 from Foxar/master
Dolphin sample: Controls adjusted, collectibles float up on pickup, camera adjusted.
|
2020-12-08 14:24:02 +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 |
|
|
Sandro Sobczyński
|
6e1c94a112
|
Merge pull request #47 from h4570/samples/floors
Floors sample rework
|
2020-12-08 08:15:52 +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 |
|
|
h4570
|
8a0f5f7b84
|
refactor #2
|
2020-12-07 22:14:36 +01:00 |
|
|
h4570
|
5787b6a920
|
refactor #1
|
2020-12-07 22:11:21 +01:00 |
|
|
h4570
|
6d9b93998a
|
changed paths
|
2020-12-07 22:05:06 +01:00 |
|
|
h4570
|
96fe7c380e
|
added reward
|
2020-12-07 21:51:48 +01:00 |
|
|
h4570
|
11a92c32ee
|
audio changes
|
2020-12-07 21:51:44 +01:00 |
|
|
h4570
|
87ae4b0507
|
added info banner
|
2020-12-07 21:20:08 +01:00 |
|
|
h4570
|
ad855a13d2
|
Merge branch 'develop' into samples/floors
|
2020-12-07 21:09:39 +01:00 |
|
|
h4570
|
14b688c6cb
|
Merge branch 'feature/ambient-color' into develop
|
2020-12-07 21:06:07 +01:00 |
|
|
h4570
|
0474fc07a5
|
doc: usefull tip for loadADPCM()
|
2020-12-07 21:05:46 +01:00 |
|
|
h4570
|
e00e677d1e
|
fixed naming convention
|
2020-12-07 21:04:38 +01:00 |
|
|
h4570
|
3284c5a598
|
added setAmbientLight(), setWorldColor()
|
2020-12-07 21:02:06 +01:00 |
|
|
h4570
|
dd49fc165e
|
lot of changes in floors
|
2020-12-07 20:47: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 |
|
|
h4570
|
4b158781af
|
fixed var type bug
|
2020-12-07 17:31:37 +01:00 |
|
|
h4570
|
cad2623649
|
Merge branch 'feature/sprite-modes' into samples/floors
|
2020-12-07 17:27:18 +01:00 |
|
|
h4570
|
d94f51623c
|
Merge branch 'feature/texture-inline' into samples/floors
|
2020-12-07 17:27:14 +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 |
|
|
h4570
|
5fb6858678
|
marked getters as inline
|
2020-12-07 17:19:34 +01:00 |
|
|
h4570
|
8a1bc254c5
|
added sprite modes (stretch/repeat)
|
2020-12-07 17:18:43 +01:00 |
|