fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1581 Commits
1 Branch
0 Tags
227 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '4e352a7d49'
${ noResults }
Commit Graph

103 Commits (4e352a7d4962c1d80748563ab73b119a4bc5031d)

Author SHA1 Message Date
fjc40 3e04ed12ad Removed raceSinglePlayer.xml and raceThreePlayers.xml as they are identical to raceSixPlayers.xml.
8 years ago
fjc40 5ea4200e67 Some javadoc warning fixes.
8 years ago
Fan-Wu Yang 1ca276ec62 Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323]
8 years ago
Fan-Wu Yang d599df3901 Merge branch 'master' into raceLength
8 years ago
Fan-Wu Yang a33583d67d Fixed racescaling a mark twice and removed println statements #story[1323]
8 years ago
Jessica Syder f1c1fc7063 Race length is affected by slider value.
8 years ago
fjc40 46192af628 Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
8 years ago
fjc40 612b4b455e Added start button for host on the ingameLobby screen.
8 years ago
Fan-Wu Yang f7da497743 Resizing maps to time taking now works #story[1323]
8 years ago
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D
8 years ago
Fan-Wu Yang 92500e13ee Added in windangle for rotated map as it had been lost through merge. #story[1188]
8 years ago
hba56 4c52673fc1 javadoc fixes
8 years ago
hba56 e4dbebfcac Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 fd120edaf9 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Fan-Wu Yang 1cbb24e9fd Merged in master #story[1185]
8 years ago
Fan-Wu Yang 3760a43cfc Merge branch 'master' into HEAD
8 years ago
Fan-Wu Yang e87173ee39 Fixed Tutorial not being able to run #story[1185]
8 years ago
hba56 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
fjc40 d29a47ec23 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Connor Taylor-Brown 83e696b79e Committed merge-related bug fixes
8 years ago
fjc40 2ad947b57d The start time of the race is no longer scaled by the race speed scalar.
8 years ago
fjc40 ab96884dc6 Javadoc.
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
fjc40 9fa1b9ee67 Re-enabled source id allocator check.
8 years ago
Connor Taylor-Brown c94e0af69c Removed remaining println statements
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 108643b59d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu c97706d86e Merge branch 'master' into story70
8 years ago
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
cbt24 70f4a00d12 Scaled down marks and boats to make 3rd person view more realistic
8 years ago
hba56 e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76
8 years ago
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
hba56 5e516b0508 re added the standard race
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
hba56 4c2ab9cc9a Merge branch 'master' into story77
8 years ago
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193]
8 years ago
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix
8 years ago
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
8 years ago
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
David Wu b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
8 years ago
Fan-Wu Yang 71dcc8ee6c Added POlar Linear Interpolation #story[1186]
8 years ago
fjc40 ec58f0c847 Participants can now join during the warning period as well.
8 years ago
David Wu ea029baf22 Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189]
8 years ago