Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-09-25 13:27:12 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,701 Commits 3 Branches 13 Tags
6767249558cb58ba1b82ac61714760220db0cbd2
Commit Graph
60 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Terry Cavanagh 766782da5d Merge pull request #749 from InfoTeddy/general-bug-fixes-2 
Fix tower camera invincibility inconsistencies
 2021-05-25 13:05:07 +10:30
Terry Cavanagh 330162d1cb Merge pull request #743 from InfoTeddy/general-improvements 
Separate pressing Enter to open map from pressing Enter to interact
 2021-05-19 17:54:52 +10:30
Terry Cavanagh d749e7e6e8 Merge pull request #682 from InfoTeddy/general-bug-fixes-4 
Add finalmode check to drawfinalmap call
 2021-05-17 18:56:32 +10:30
Terry Cavanagh 569403b7e2 Merge pull request #681 from InfoTeddy/general-bug-fixes-3 
Remove final_colorframe assignments when entering minitowers
 2021-05-17 18:55:52 +10:30
Terry Cavanagh 85bd009dce Merge pull request #758 from InfoTeddy/general-bug-fixes 
Allow using Esc in Super Gravitron quit menu
 2021-05-15 08:08:54 +10:30
Terry Cavanagh 07c425b2f8 Merge pull request #730 from InfoTeddy/general-improvements 
Axe mouse cursor config option in favor of automatically toggling mouse
 2021-04-17 18:10:57 +10:30
TerryCavanagh 8b1efb4335 Default to 60 FPS mode (fixes #702) 2021-04-09 20:40:22 +10:30
TerryCavanagh eee98b0e07 Clean up of options menus for v2.3 (fixes #696) 2021-04-09 20:39:12 +10:30
TerryCavanagh d9d5cbbab2 Changed the wording on "Invincibility" and "Game Speed" accessibility options 
I've wanted to do this one for a very long time
 2021-04-09 17:53:15 +10:30
Terry Cavanagh 4ebbfe476a Merge pull request #588 from InfoTeddy/general-bug-fixes 
Fix tile of disappearing platforms during final stretch
 2021-04-02 17:51:30 +10:30
Terry Cavanagh 886a57ab83 Merge pull request #667 from InfoTeddy/general-improvements 
Add text outlines to textboxless textboxes and gravitron text
 2021-04-02 17:49:20 +10:30
Terry Cavanagh 9fbc3804c8 Merge pull request #668 from InfoTeddy/general-bug-fixes-2 
Fix oversight with unfocus pause screen in Flip Mode
 2021-04-02 17:47:27 +10:30
Terry Cavanagh 6490af8783 Merge pull request #680 from InfoTeddy/pr-template-update 
Remove 2.3 example from pull request template
 2021-03-25 11:57:34 +10:30
Terry Cavanagh 1163a8cca4 Merge pull request #647 from InfoTeddy/general-bug-fixes-4 
Copy blend mode to recreated surfaces, fixing room name background during menu animation in Flip Mode
 2021-03-06 16:56:28 +10:30
Terry Cavanagh 4f27c9366b Merge pull request #646 from InfoTeddy/general-bug-fixes-3 
Fix up/down controls being reversed in in-game menu in Flip Mode
 2021-03-06 16:55:55 +10:30
Terry Cavanagh bf3b141cfc Merge pull request #645 from InfoTeddy/general-bug-fixes-2 
Reverse menu animation direction in Flip Mode
 2021-03-06 16:54:37 +10:30
Terry Cavanagh 1dd4634298 Merge pull request #641 from InfoTeddy/general-improvements 
Add previous song option to editor music screen
 2021-03-05 21:58:31 +10:30
Terry Cavanagh 261e898267 Merge pull request #547 from InfoTeddy/general-bug-fixes 
Fix Secret Lab Time Trial trophies having wrong colors
 2021-01-09 19:02:25 +10:30
Terry Cavanagh 98effeee58 Merge pull request #554 from InfoTeddy/general-improvements 
Allow pressing ACTION to skip the fake loading screen
 2020-12-22 00:01:42 +10:30
Terry Cavanagh 9f5f697dda Update License exceptions.md 2020-11-23 16:33:54 +10:30
Terry Cavanagh f014ed6fe8 Merge pull request #467 from InfoTeddy/general-improvements 
Remove checks to prevent having both warp lines/BGs in editor
 2020-09-06 14:46:56 +10:30
Terry Cavanagh 76b326aac3 Added License exception for Sega Dreamcast port 2020-08-13 12:19:54 +10:30
Terry Cavanagh 9de61c5b76 Merge pull request #293 from InfoTeddy/general-improvements 
Make elephant not be flashy if screen effects are disabled
 2020-06-16 11:15:08 +10:30
Terry Cavanagh 798268f8a8 Merge pull request #295 from v6cord/hex-entities 
Support hex entities in metadata
 2020-06-16 11:11:55 +10:30
Terry Cavanagh a10265787d Merge pull request #143 from InfoTeddy/general-bug-fixes 
Add and draw one more row to all rooms with room names
 2020-05-20 13:13:56 +10:30
Terry Cavanagh 172ab9195d Merge pull request #158 from AllyTally/entertoreturn 
Make "[Press ENTER to return to editor]" fade out after a bit
 2020-02-10 18:41:13 +01:00
Terry Cavanagh 4e378b6057 Merge pull request #147 from InfoTeddy/general-bug-fixes-5 
Make hardest room "Dimension VVVVVV" if it has no room name
 2020-02-06 16:37:37 +01:00
Terry Cavanagh 3d8c84bbbf Merge pull request #149 from FredrIQ/master 
Make tiles in tower mode consistent with tower tileset elsewhere
 2020-02-06 16:36:21 +01:00
Terry Cavanagh b32c91a6e9 Added Haiku links 2020-02-05 15:59:51 +01:00
Terry Cavanagh e439949d7d Merge pull request #135 from InfoTeddy/code-quality-improvements 
Make obj accessible from everywhere
 2020-02-01 00:59:59 +01:00
Terry Cavanagh ab68cd98c8 Merge pull request #134 from InfoTeddy/general-bug-fixes 
Fix text() centering with x=-1
 2020-01-31 23:37:06 +01:00
Terry Cavanagh 98151b4c2f Merge pull request #126 from FredrIQ/master 
Fix and improve handling of cancelling roomtext/scripttext input
 2020-01-30 15:36:18 +01:00
Terry Cavanagh 5afba66d2e Merge pull request #127 from InfoTeddy/general-bug-fixes 
Don't re-draw horizontal and vertical warp backgrounds if gotoroom()ing to the same room in custom levels
 2020-01-28 19:16:33 +01:00
Terry Cavanagh 12497f6478 Added a general exception for any package of the Make and Play edition 2020-01-27 14:27:24 +01:00
Terry Cavanagh 782ce95d11 Merge pull request #115 from FredrIQ/master 
Make the level editor use font outlines
 2020-01-23 14:59:53 +01:00
Terry Cavanagh 5934802fca Added a technicality I just realised, lol 2020-01-22 12:59:09 +01:00
Terry Cavanagh b6ca9ea039 Added Ved to License exceptions 2020-01-20 22:47:34 +01:00
Terry Cavanagh 88f90f50a8 Merge pull request #101 from InfoTeddy/general-bug-fixes-2 
Reset the Direct Mode property of each room in editorclass::reset()
 2020-01-20 10:28:22 +01:00
Terry Cavanagh 05229255f6 typo 2020-01-17 16:56:27 +01:00
Terry Cavanagh 396d0eaf5f Update License exceptions.md 2020-01-17 15:19:56 +01:00
Terry Cavanagh 4fb9bfbd7e Merge pull request #92 from InfoTeddy/general-bug-fixes 
Don't render "[Press ENTER to return to editor]" if "- Press ACTION to advance text -" is also being rendered
 2020-01-17 14:18:47 +01:00
Terry Cavanagh d6d2b79514 Merge pull request #93 from InfoTeddy/typo-fixes 
Fix "Exausted?" and "scentists" typos in mobile version
 2020-01-17 14:18:02 +01:00
TerryCavanagh b3bc8d565c Found another dumb comment, removed 
see https://github.com/TerryCavanagh/VVVVVV/commit/b0ffdf01537f708febbb89708d3495b7bbddcb80
 2020-01-17 13:47:34 +01:00
Terry Cavanagh 1c7c4d8c34 Updated link to cursed_vvvvvv.exe, changed links to shortcuts 2020-01-16 15:01:07 +01:00
TerryCavanagh adde99dfe6 Re-added the mouse cursor (reverted https://github.com/TerryCavanagh/VVVVVV/pull/15) 
Hiding the mouse cursor does makes sense in a lot of situations I agree, but it's very much a preference thing, and I don't see a good reason to change the original behavour. Some people (i.e. me) don't like cursors disappearing in windowed mode when you move the cursor over the screen, but most importantly, it makes the editor much less pleasant to use (since you're relying on the 30fps editor cursor box).

I'd be happy to support, say, a setting that allowed you to disable the mouse cursor, or even a 15 second time-out which makes the cursor disappear if not moved (and reappear once moved), but just having it off by default feels wrong to me.
 2020-01-16 14:47:37 +01:00
Terry Cavanagh ede2456af4 Merge pull request #71 from InfoTeddy/general-improvements 
Re-add the font outline from the Flash and mobile versions
 2020-01-16 14:40:11 +01:00
Terry Cavanagh 5b32446d50 Merge pull request #89 from InfoTeddy/typo-fixes 
Correct capitalization of song names
 2020-01-16 14:38:31 +01:00
TerryCavanagh b0ffdf0153 Removed a dumb word I used in a comment 
Yikes. Somebody brought this to my attention, I didn't even remember that I'd written it. "Spa" or "Spastic" is kind of a south park esque slang term that used to be pretty common in Ireland, which I used without even thinking about it. It's definitely not something I would say anymore, 10 years on, and it's something I shouldn't have said at the time either. I'm sorry :(

(somebody on twitter was asking me about how much cleaning up of the source code I did before launching this. I think this commit kinda answers that)
 2020-01-16 14:31:01 +01:00
Terry Cavanagh 6f8d2dc90b Merge pull request #83 from InfoTeddy/typo-fixes 
Fix "Exausted?" typo in roomname
 2020-01-15 13:43:56 +01:00
Terry Cavanagh 8eeb6f419b Updated link to Make and Play edition 2020-01-13 19:38:36 +01:00
Terry Cavanagh 5b4de5b065 Updated link to make and play edition 2020-01-13 19:38:16 +01:00
Terry Cavanagh b4012c9731 Updated link to Make and Play edition 2020-01-13 19:37:50 +01:00
Terry Cavanagh 8be05ca40f Merge pull request #64 from AllisonFleischer/master 
Fix a stray "seperate" in Secret Lab dialogue
 2020-01-13 14:57:54 +01:00
Terry Cavanagh edfe1206ba Update License exceptions.md 2020-01-13 13:27:20 +01:00
Terry Cavanagh 21d3f0b79e Added VVVVVV: Community Edition and VVVVVVwasm to License exceptions 
Both projects can distribute the game's original assets, provided they compile with the makeandplay define set, and do not distribute the original levels.
 2020-01-13 13:26:33 +01:00
Terry Cavanagh 32e602946f Create License exceptions.md 2020-01-12 22:58:51 +01:00
TerryCavanagh 8db7bd24a1 Adding original mapping tools for the sake of completeness 2020-01-12 19:49:24 +01:00
Terry Cavanagh c90b7316d6 Update README.md 2020-01-10 19:28:58 +01:00
Terry Cavanagh 07542ef91b Update README.md 2020-01-10 19:28:27 +01:00
Terry Cavanagh 9e5e9f3e67 Update README.md 2020-01-10 17:45:29 +01:00