Skip to content
This repository was archived by the owner on Feb 14, 2022. It is now read-only.

[WIP] v1.1.0 #3

Open
12joan wants to merge 309 commits into
base: master
Choose a base branch
from
Open

[WIP] v1.1.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
309 commits
Select commit Hold shift + click to select a range
43f54b9
Fire bullets from centre of game object
Aug 20, 2019
5621894
Adjust difficulty of turret weapon
Aug 20, 2019
6759974
Adjust style of turret bullets
Aug 20, 2019
b67d1fd
Enable all implemented phases
Aug 20, 2019
933d421
Reduce scene to a serialisable data structure
Aug 21, 2019
f118146
Implement saving and loading
Aug 22, 2019
f8ebdde
Remove depencencies on deprecated GameDataController
Aug 23, 2019
45c31b5
Save at the end of each phase (HP only)
Aug 23, 2019
9533a8a
Save camera position and zoom
Aug 23, 2019
4d20a39
Save boss fight phase
Aug 23, 2019
dcd10cd
Make generators stay destroyed after load
Aug 23, 2019
c9a62e8
Keep as not working when destroyed after load
Aug 23, 2019
186973f
Save number of bullets
Aug 23, 2019
8f7156c
Use saving to skip dialogue after death lvls 1, 2
Aug 23, 2019
6952477
Autosave on levels 1 and 2
Aug 24, 2019
ba4f007
Save gremlin HP and position
Aug 24, 2019
5bf00a7
Retain whether or not an object was destroyed
Aug 24, 2019
5ed3347
Make lvl 2 fully compatible with autosave
Aug 24, 2019
e262417
Fix exploit to avoid dying by quitting the game
Aug 24, 2019
1576d32
Fix: HitPoints sends callbacks when already zero
Aug 24, 2019
1a3b62a
Fix reload indicator positioning in lvl 2
Aug 24, 2019
f15057c
Fix enemy flashing in lvls >1
Aug 24, 2019
bc6b763
Redesign UI in game over menu
Aug 24, 2019
62fcc13
Speed up fade in and out on landing menu
Aug 25, 2019
c057374
Redesign UI in landing menu
Aug 25, 2019
434ab6f
Refactor fade and music logic into GenericMenuEvents
Aug 26, 2019
599bc33
Update main menu to use GenericMenuEvents
Aug 26, 2019
42f83af
Update game over screen to use GenericMenuEvents
Aug 26, 2019
001fa7e
Major visual redesign of main menu
Aug 26, 2019
2540f29
Fix type error in Pixie prefab
Aug 27, 2019
ebe6e23
Zoom out wider on all levels
Aug 27, 2019
935e8c5
Reimplement enemy AI
Sep 4, 2019
5ec947b
Activate gremlins in room that player enters
Sep 4, 2019
31128b0
Fix: Gremlin phase ends too soon when second gremlins are killed
Sep 4, 2019
ddb4d98
Use updated buttons in dialogue prompts
Sep 4, 2019
8280e0a
Add support for Xbox One S controller
Sep 4, 2019
f62800b
Support keyboard while controller is connected
Sep 4, 2019
36f547f
Add fast and really fast dialogue skip buttons
Sep 4, 2019
ff91c22
Fix event systems on menus
Sep 4, 2019
a8a01a3
Add support for HJKL -- It's about time.
Sep 4, 2019
a0bea0f
Add support for PS4 controller
Sep 5, 2019
1242a09
Merge branch 'level-3' into improve-menus
Sep 5, 2019
8c0971f
Merge branch 'improve-menus' into level-3
Sep 5, 2019
1596cf7
Show a pulse animation when the player shoots
Sep 5, 2019
d53f57f
Fix: PS4 doesn't register when paired wirelessly
Sep 6, 2019
7d6a589
Bullet trails linger and exposion spawns on hit
Sep 6, 2019
ac8cac1
Slightly darken white tiles on lvl 1 bg
Sep 6, 2019
f9ce243
Reimplement HUD bars using canvas images
Sep 6, 2019
3ac78ff
Fix game over text wrap on lower resolutions
Sep 6, 2019
213c829
Fix: Game data path is calculated incorrectly
Sep 6, 2019
6346c6f
Wire up continue button and ask before new game
Sep 7, 2019
206b695
Fix: Hovered button stays highlighted when other buttons are selected
Sep 7, 2019
59c4e82
Turn off player shoot pulse
Sep 7, 2019
caab5d4
Fix: Player can reload while not in playing state
Sep 7, 2019
e0cebbb
Enable tap (rather than hold) to reload
Sep 7, 2019
b30d9a1
Handle speed modifiers at the movement manager level
Sep 7, 2019
dbe7a0d
Show controller-specific button for reload indicator
Sep 7, 2019
133a2d8
Show close button on lore window
Sep 7, 2019
18a25fe
Update version number to 1.1.0
Sep 7, 2019
4de1b36
Show fire and roll buttons all the time in HUD
Sep 7, 2019
755bcc2
Fix: Accidentally left FadeLayer disabled
Sep 7, 2019
72e8dfb
Update Ogg Player audio file
Sep 7, 2019
672d7ab
Update Pop Pixie Tales audio file
Sep 7, 2019
5ec7c0c
Convert all music audio files to wav
Sep 7, 2019
ddf545c
Update This isn't the end audio file
Sep 7, 2019
0272c17
Show current and latest version numbers on landing
Sep 8, 2019
06e218f
Button takes users to GitHub when new version
Sep 8, 2019
e010b1c
Prevent gremlins from getting stuck in lore items
Sep 8, 2019
b2c3ff2
Use can sprite as app icon
Sep 9, 2019
bbd9a9d
Clean up can sprite
Sep 9, 2019
25e2170
Disable resolution config window
Sep 9, 2019
5e80cc2
Set gremlins in left room to follow player
Sep 9, 2019
225cd2d
Centre button text in game over screen
Sep 9, 2019
2e265bb
Implement pause menu with resume button
Sep 10, 2019
20ae373
Enable pause on all levels
Sep 10, 2019
ec6fc5d
Add blur effect on pause menu
Sep 10, 2019
33e59a7
Switch to GetButtonDown where possible
Sep 10, 2019
2c0aca1
Implement quit game button on pause menu
Sep 10, 2019
2a6b212
Implement inspect button for lore items and elevators
Sep 12, 2019
286d903
Fix: Inspect button skips first line of skippable dialogue
Sep 12, 2019
5806288
Revert "Fix: Inspect button skips first line of skippable dialogue"
Sep 12, 2019
36a8bd3
Fix: Implement inspect button for lore items and elevators (again...)
Sep 12, 2019
d01b48e
Fix: Inspect button sometimes still skips lines...
Sep 12, 2019
769a798
Stop bullets moving when not in playing state
Sep 12, 2019
ef972a5
Fix: Lasers continue to sweep when the game is paused
Sep 13, 2019
06b56e0
Lasers do not pass through turrets
Sep 13, 2019
7e4b68c
Add second turret and adjust difficulty
Sep 13, 2019
114abec
Require continued no line of sight before stopping to look for player
Sep 13, 2019
953f97f
Fix: Gremlin movement rate is fps-dependent
Sep 14, 2019
7445342
Recalibrate gremlin speeds in light of bug fix
Sep 14, 2019
6006853
Save lore items with UniqueId's as read
Sep 14, 2019
9e4c518
Create editor shortcut to load autosave
Sep 15, 2019
3b1e4a7
Rename and assign ids to all lore items
Sep 15, 2019
a102f61
Show window with back button on Discovered items
Sep 16, 2019
fe4b158
Fix: Hovering inactive buttons deselects current button
Sep 16, 2019
6b45209
Show an additional button for each read lore item
Sep 16, 2019
c35abc0
Swtich to escape for cancel and return for alt. confirm
Sep 16, 2019
126556f
Switch to escape for pause
Sep 16, 2019
73598e7
Show humanised unique id as lore item button text
Sep 16, 2019
c1dcdce
Call callback with lore item when button is pressed
Sep 16, 2019
b3b9acd
Refactor level-specific stuff out of lore manager
Sep 16, 2019
f238e98
Open lore window when a discovered item button is pressed
Sep 16, 2019
06379bd
Update controls in README
Sep 16, 2019
ea9f6bb
Update controller-related copy in README
Sep 16, 2019
382229c
Vertically position pause menu buttons automatically
Sep 16, 2019
315737f
Fix: Lore items have large empty space under text
Sep 19, 2019
158a912
Turn off elasticity on lore item scroll
Sep 19, 2019
65c93c3
Implement music volume button (ineffective)
Sep 19, 2019
356fb33
Implement sounds volume button (also ineffective)
Sep 19, 2019
e244236
Improve how the MusicController handles volume
Sep 19, 2019
cda9c9b
Fix: Intermittent audio pops when on < 100% volume
Sep 19, 2019
6417e4c
Respect user selected music volume
Sep 19, 2019
07096a0
Use SoundController for playing all sounds
Sep 19, 2019
eeb98dc
Respect user selected sound volume
Sep 19, 2019
618cfb7
Add boss sprite which jumps down
Sep 23, 2019
be04697
Play smoke effect when boss jumps down
Sep 23, 2019
f8a8dfd
Boss follows player and performs gorilla smash
Sep 23, 2019
afaa464
Play charging up animation before gorilla smash
Sep 23, 2019
37b85ac
Track boss HP in health bar
Sep 23, 2019
ea06300
Fix: Turret phase never finishes
Sep 23, 2019
e97c0d1
Boss performs thunder clap attack
Sep 23, 2019
57acaa9
Boss picks random attack each time
Sep 23, 2019
25cabdd
Show radius of boss's smash attack using circle
Sep 24, 2019
95427cf
Do not run the same attack twice in a row
Sep 27, 2019
daeece5
Show thunder clap line while attack charges
Sep 27, 2019
c2f6c28
Boss performs sweeping fire attack
Sep 28, 2019
291c65e
Speed up the pace of the fight by x4
Sep 28, 2019
e98962a
Restore order of phases in boss fight
Sep 28, 2019
5ba9889
Fix: boss progress bar does not fade out
Sep 29, 2019
cc28897
Fix: gremlins are visible outside the room
Sep 29, 2019
401b947
Decrease roll cooldown by half
Sep 29, 2019
ff78676
Restore player HP on load save
Sep 29, 2019
7c0f007
Implement WIZARD MODE!!
Sep 29, 2019
abf43bb
Fix: Starting a scene through WIZARD MODE!! skips content
Sep 29, 2019
0267c35
Play sparkley death animation when gremlins die
Nov 2, 2019
f2cb62a
Apply death animation to Level 3 boss
Nov 3, 2019
96e66a7
Roll constant distance regardless of stick magnitude
Nov 5, 2019
ca71800
Create test level for ring pulls
Dec 18, 2019
1d49a32
Create ring pull sprite
Dec 18, 2019
0c24e88
Idly rotate ring pull around Y axis
Dec 18, 2019
ed57c1f
Bob rings pulls up and down
Dec 18, 2019
4202b20
Move ring pull into canvas space on collide with player
Dec 18, 2019
4a8f5a5
Flying ring pull flies off in random direction
Dec 18, 2019
627b5c6
Ring pulls fly towards corner of screen and disappear
Dec 18, 2019
3d1433b
Show ring pull counter on HUD
Dec 18, 2019
de68dac
Track number of ring pulls collected
Dec 18, 2019
6403bd8
Randomise initial rotation and bob of ring pulls
Dec 18, 2019
838366e
Sofa breaks when shot
Dec 18, 2019
a4ddd82
Sofa drops ring pulls when broken
Dec 18, 2019
a852143
Gremlins drop 7 ring pulls
Dec 18, 2019
6b39296
Incoprorate ring pulls into level 3
Dec 18, 2019
7a5e007
Scatter ring pulls throughout levels
Dec 18, 2019
69ba847
Make boss thunder clap easier to dodge
Dec 18, 2019
1e621c2
Fix: Boss thunder clap line stays when boss dies
Dec 18, 2019
59816a8
Play click sound when collecting ring pulls
12joan Dec 20, 2019
9f5ce7d
Re-implement music to allow for resuming songs
12joan Dec 20, 2019
2367d88
Play song UpLIFTing music during elevator rides
12joan Dec 20, 2019
561ca96
Fade out music after levels and elevator rides
12joan Dec 21, 2019
0a14a01
Fix: Ring pulls respawn when quitting and loading
12joan Dec 21, 2019
0b30da8
Fix: Sofa becomes collidable again after reload
12joan Dec 21, 2019
95b832f
Fix: Boss keeps firing when killed during sweeping attack
12joan Dec 21, 2019
8f000dc
Fix: Roll button sometimes doesn't register
12joan Dec 21, 2019
f2383a8
Redesign layout of level 3
12joan Dec 30, 2019
21b6acd
Update placeholder level graphics
12joan Dec 30, 2019
16678a1
Fix: Particle effects look different in build
12joan Dec 30, 2019
44ac586
Fix: Can select music and sounds buttons while in discovered items menu
12joan Dec 30, 2019
94379ee
Fix: Laser and laser beam have same layer
12joan Dec 30, 2019
e3258ce
Fix: Song playback time isn't restored in build
12joan Dec 30, 2019
884c50c
Play reload sound
12joan Dec 30, 2019
4388687
Lay out controller calibration scene
12joan Jan 1, 2020
393999a
[WIP] Cycle through buttons, waiting for controller input
12joan Jan 1, 2020
9361cfd
Show button icons depending on controller type
12joan Jan 1, 2020
db3d83b
Store key codes in game data
12joan Jan 1, 2020
a569314
Add calibrate controller button to pause menu
12joan Jan 1, 2020
28fed25
Respect calibration in WrappedInput
12joan Jan 1, 2020
2530e3b
Refactor Controls --> Buttons
12joan Jan 6, 2020
6599be8
Fix directory name typo
12joan Jan 6, 2020
30b1e84
Refactor PhaseScheduler out of Level3Started
12joan Jan 8, 2020
464e405
Move phases code into Core Scripts
12joan Jan 8, 2020
b26bce9
Use PhaseScheduler in calibration process to simplify implementation
12joan Jan 8, 2020
cff15c1
Determine joystick axis and signs
12joan Jan 8, 2020
9c663cc
Use gamepad axis where available
12joan Jan 8, 2020
3ee1d0d
Refactor AData out of GameData
12joan Jan 9, 2020
5cad23d
Refactor DataOperation and SaveGame out of GameData
12joan Jan 9, 2020
26b77f0
Refactor SceneData out of GameData
12joan Jan 9, 2020
c6672c2
Create ConfigData for non-gameplay related data
12joan Jan 9, 2020
b9e2684
Use ConfigData for controller calibration
12joan Jan 9, 2020
b3297da
Store controller type in ConfigData
12joan Jan 9, 2020
9c2d1de
Use stored controller type for button images
12joan Jan 9, 2020
e6cde3d
Prompt the player to calibrate controller first time
12joan Jan 9, 2020
cf4370b
Implement Level NaN
12joan Feb 14, 2020
06a2bfb
Implement multiple weapons
12joan Mar 12, 2020
b76ccf1
Use layout elements for positioning parts of the HUD
12joan Mar 12, 2020
3b87d43
Rearrange HUD
12joan Mar 12, 2020
850c9dd
Make HUD bar background transparent
12joan Mar 12, 2020
d6ebfc8
Fix: Bottom row is independent of screen height
12joan Mar 19, 2020
ebfddc0
Cancel reload on weapon switch
12joan Mar 19, 2020
0764c89
Persist equipped weapon on save and reload and across levels
12joan Mar 19, 2020
6c01c13
Snap weapon aim to cursor continuously
12joan Mar 19, 2020
dd12d0d
Support storing axis-based buttons in config data
12joan Mar 20, 2020
acf3d2e
Install Rewired
12joan Mar 22, 2020
5d2c765
[Internal Unity data changes]
12joan Mar 22, 2020
81b5490
Configure WrappedInput to use on Rewired
12joan Mar 22, 2020
c41a552
Remove deprecated Controller Callibration system
12joan Mar 22, 2020
a0323ef
Add custom mapping for Dualshock 4
12joan Mar 22, 2020
d0a2b35
Change button icon set from pause menu
12joan Mar 22, 2020
403050e
Update button icon files
12joan Mar 22, 2020
6342814
Remove controller calibration scene from build
12joan Mar 22, 2020
c86f14e
Diable attack AI on Level 1 gremlin
12joan Mar 23, 2020
c5c8a55
Consider enemies "dead" before death animation has finished
12joan Mar 23, 2020
f7316b0
Apply direction scatter to player weapons
12joan Mar 23, 2020
05ec79f
Decrease delay durations throughout the game
12joan Mar 23, 2020
e569b24
Merge branch 'master' into level-3
12joan Mar 23, 2020
5b7c273
Reduce laser damage to make first round survivable
12joan Mar 23, 2020
fb6f088
Add intro dialogue
12joan Mar 23, 2020
355b20f
Add WIP boss fight music
12joan Mar 23, 2020
51520a6
Conditionally play hint dialogue after first laser cycle
12joan Mar 23, 2020
cd04434
Implement end of Level 3
12joan Mar 24, 2020
7bef2aa
Redesign End of Game screen
12joan Mar 24, 2020
68a2163
Merge branch [REDACTED] into level-3
12joan Mar 24, 2020
583b198
Fix: Player can't move after entering End of Game
12joan Mar 24, 2020
b894a50
Move common level components into a single prefab
12joan Mar 25, 2020
b7c80ab
Fix: Lore window cuts off lower portion of text
12joan Mar 25, 2020
a623145
Implement ranged gremlins
12joan Mar 25, 2020
ceed540
Add new background image for Level 3
12joan Mar 26, 2020
af23bc2
Fix: Null reference exception when laser hits no collider
12joan Mar 26, 2020
75098f8
Fix all compile time warnings
12joan Mar 26, 2020
a8e11d0
Redesign dialogue, lore and popup windows
12joan Mar 26, 2020
6909ad1
Reduce font size on lore items
12joan Mar 26, 2020
642dae8
Make gremlin sounds quieter and less frequent
12joan Mar 26, 2020
d28cc74
Add weapon shoot sounds for pixie and gremlins
12joan Mar 27, 2020
eae6122
Add shoot sound to everything that shoots
12joan Mar 27, 2020
b18ce78
Reduce volume of all gremlin sounds
12joan Mar 27, 2020
31dee11
Play roll animation
12joan Mar 28, 2020
d70f06a
Add walk animation for Pixie
12joan Mar 29, 2020
e6b9e6e
Automatically flip player sprite left and right
12joan Mar 29, 2020
01d1c9c
Change Pixie and gremlins to face based on direction managers
12joan Mar 29, 2020
55fa6e9
Add gremlin walk animation
12joan Apr 1, 2020
dd9fc52
Add equipped weapon sprite to player sprite
12joan Apr 1, 2020
eba1970
Fix: Walk animation can play when not in playing state
12joan Apr 1, 2020
e2afa85
Add lore item to Level 3
12joan Apr 2, 2020
16e8d66
Update Pixie prefabs in Elevator and End of Game
12joan Apr 2, 2020
a7f4a42
Add menu to Elevator scene
12joan May 8, 2020
5b5929e
Wire up "Quit game" button on Elevator menu
12joan May 8, 2020
2880edc
Create and wire up Shop scene
12joan May 8, 2020
468aa31
Save and resume game while on the Elevator scene
12joan May 8, 2020
3ef2267
Fix: Ceasing perusal after loading save causes Continue to fail
12joan May 8, 2020
752ccaa
Create weapon grid layout for shop
12joan May 10, 2020
b8e1c87
Fill out shop layout with all weapons and ring pull coutner
12joan May 10, 2020
a0afefb
Wire weapon tile data up to script
12joan May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,16 @@
[Bb]uilds/
Assets/AssetStoreTools*

*.swp

# Visual Studio cache directory
.vs/

Pop Pixie/Assets/TextMesh Pro
Pop Pixie/Assets/TextMesh Pro.meta
Pop Pixie/Assets/Rewired
Pop Pixie/Assets/Rewired.meta

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
Expand Down
2 changes: 1 addition & 1 deletion Pop Pixie/Assets/Core Scripts/Game Over.meta → Pop Pixie/Assets/Animations.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pop Pixie/Assets/Core Scripts/Main Menu.meta → Pop Pixie/Assets/Animations/Gremlin.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading