Jonathan Payne
e7396702f1
Merge branch 'master' of https://github.com/stepmania/stepmania
2014-09-20 03:22:22 -07:00
Kyzentun
38fedca9a2
Not sure why git had a conflict, fixed.
2014-09-19 15:40:57 -06:00
Jonathan Payne
b8c6631fe2
Update OptionsCustomizeProfile
2014-09-18 20:33:35 -07:00
Jonathan Payne
c40d8f371b
Merge branch 'master' of https://github.com/stepmania/stepmania
2014-09-18 19:07:48 -07:00
freem
6f8c999089
update changelog with a few things
...
(I'm not really sure it's ready for beta 4 unless others do)
2014-09-18 20:10:53 -05:00
Kyzentun
efd11c5851
Added character setting and minor documentation to ScreenOptionsCustomizeProfile.
2014-09-18 17:28:53 -06:00
freem
00a79970f6
Merge branch 'master' of github.com:stepmania/stepmania
2014-09-18 01:49:30 -05:00
freem
28e725b0b8
reverting part of the war on -Werror because there's no decent reason this should be crashing 3/4ths of the time I load StepMania with this screen in TestInitialScreen/reload it from the debug menu.
2014-09-18 01:49:08 -05:00
Kyzentun
b0d40eca3d
Merge branch 'theme-updates' of https://github.com/Midiman/stepmania
2014-09-17 14:40:05 -06:00
Jonathan Payne
b09c7e8af4
OptionsCustomizeProfile, HeartEntry improvements
2014-09-17 12:20:55 -07:00
Kyzentun and Jonathan Payne
bfd2d88ec9
Fixed SSM StageDisplay to update when the song changes and SG StageDisplay to fetch curStage at the correct time to set its color.
2014-09-17 11:13:14 -07:00
freem and Jonathan Payne
facc086721
fix another small error in ScreenNameEntryTraditional underlay
2014-09-17 11:13:14 -07:00
freem and Jonathan Payne
f723947d8b
fix a small error in ScreenNameEntryTraditional underlay
2014-09-17 11:13:13 -07:00
Jonathan Payne
d7cdf759e6
Arcade improvements
2014-09-17 11:13:12 -07:00
Jonathan Payne
1570f941f7
ScreenCaution improvements
2014-09-17 11:13:11 -07:00
Jonathan Payne
97c8e2d23c
SelectStyle, SelectMode improvements
2014-09-17 11:13:10 -07:00
Jonathan Payne
b7e8b5efbf
Font improvements
2014-09-17 11:13:09 -07:00
Jonathan Payne
e3e5ae97ca
ScreenDebugOverlay improvements
2014-09-17 11:13:07 -07:00
Jonathan Payne
0221915c38
MusicWheel highlight improvements
2014-09-17 11:13:05 -07:00
Kyzentun
1186840ef0
Fixed SSM StageDisplay to update when the song changes and SG StageDisplay to fetch curStage at the correct time to set its color.
2014-09-17 03:13:31 -06:00
Kyzentun
01185e97bd
Merge branch 'theme-updates' of https://github.com/Midiman/stepmania
2014-09-17 01:45:00 -06:00
freem
ccd8cfc5a7
fix another small error in ScreenNameEntryTraditional underlay
2014-09-17 02:09:10 -05:00
freem
2d57e27558
fix a small error in ScreenNameEntryTraditional underlay
2014-09-17 00:57:21 -05:00
Jonathan Payne
426148ebdd
Arcade improvements
2014-09-16 17:14:07 -07:00
Jonathan Payne
38e3a778d0
ScreenCaution improvements
2014-09-16 17:06:06 -07:00
Jonathan Payne
8d0f86d240
SelectStyle, SelectMode improvements
2014-09-16 17:05:19 -07:00
Jonathan Payne
c651143128
Font improvements
2014-09-16 17:02:38 -07:00
Jonathan Payne
abb6c302e3
ScreenDebugOverlay improvements
2014-09-16 16:58:37 -07:00
Jonathan Payne
60fee09021
MusicWheel highlight improvements
2014-09-16 16:50:45 -07:00
Kyzentun
c45b5f053a
Added ScreenContinue:ContinueEnabled metric. Changed Actor:hidden and Lua scoring to emit errors because they are deprecated.
2014-09-15 05:09:27 -06:00
freem
b8d5bce272
Merge branch 'master' of github.com:stepmania/stepmania
2014-09-15 03:59:18 -05:00
freem
5649b5f61b
thify_number replicates FormatNumberAndSuffix; use that instead.
2014-09-15 03:58:16 -05:00
freem
9ed45e1bc9
thify_number replicates FormatPercentScore; use that instead.
2014-09-15 03:54:02 -05:00
freem
a7307fd87e
add a split point for sm5 beta 3 in the changelog
2014-09-15 03:30:14 -05:00
Kyzentun
4df1940633
Updated Changelog_sm5.txt to include every theme-visible change since 2014/02/08.
2014-09-15 00:48:32 -06:00
Kyzentun
2f37e9d8a9
Merge branch 'DefaultHeart' of https://github.com/kyzentun/stepmania
2014-09-14 21:07:54 -06:00
Kyzentun
5ffe5f7157
Removed unused is_stage_final function from default.
2014-09-14 21:07:34 -06:00
Kyzentun
1dbdca6b0a
Merge branch 'StageDispFixes' of https://github.com/kyzentun/stepmania
2014-09-14 21:06:27 -06:00
Kyzentun
fa7502b7b0
Added ScreenOptionsCustomizeProfile to _fallback and default.
2014-09-14 20:04:10 -06:00
freem
64cd9f898d
Various changes to things in the Docs folder:
...
* remove unused WindowsNotes.txt
* various sm-ssc -> StepMania (and similar) changes
* Rewrote a bit of recommended_practices.txt
* Fix a copy/paste typo in anatomy_of_an_actor.lua
* many other things I can't remember; namely newlines at the end of files
2014-09-14 19:17:17 -05:00
Jonathan Payne
20e6120fd3
Improve HeartEntry screen
2014-09-14 15:30:02 -07:00
Jonathan Payne
937b99b87d
Improve HeartEntry screen
2014-09-14 15:20:13 -07:00
Jonathan Payne
abe170fe22
Merge branch 'DefaultHeart' of https://github.com/kyzentun/stepmania into b4-heartRate
2014-09-14 15:18:08 -07:00
Kyzentun
64acd77c68
New NumPadEntry actor, used by ScreenHeartEntry.
2014-09-13 19:48:04 -06:00
Jonathan Payne
5fcf3e1466
Merge branch 'master' of https://github.com/stepmania/stepmania
2014-09-13 16:29:28 -07:00
Kyzentun
f87afa8a4b
Added ScreenHeartEntry to default theme.
2014-09-12 15:07:46 -06:00
freem
b20fe48bba
fix some of the errors in the luadoc; doc returns
2014-09-11 17:03:39 -05:00
Kyzentun
17ccc0cef5
Merge pull request #311 from foresto/debfixes
...
Fix #300 : files are inappropriately marked executable
2014-09-11 05:28:05 -06:00
Forest
35d3094cfd
Merge remote-tracking branch 'upstream/master' into debfixes
2014-09-11 04:10:10 -07:00
Forest
8b866c9584
Remove the execute bit from non-executable files.
...
Fixes stepmania/stepmania#300 .
2014-09-11 04:03:32 -07:00
Jonathan Payne