Search:
Login
Preferences
Lost Password?
Help/Guide
Wiki
Home
Index
Recent Changes
Tickets
Reports
Query
New Ticket
Defect
Enhancement
Feature
Task
Recent Changes
Code
Browse
Recent Changes
Timeline
Roadmap
Doxygen
Jenkins
Mail
Search
Context Navigation
←
Previous Change
Next Change
→
Changeset
6417
for
code/trunk/src/libraries/network/synchronisable/Serialise.h
Timestamp:
Dec 25, 2009, 10:23:58 PM (
14 years
ago)
Author:
rgrieder
Message:
Merged presentation2 branch back to trunk.
Major new features:
Actual GUI with settings, etc.
Improved space ship steering (human interaction)
Rocket fire and more particle effects
Advanced sound framework
Location:
code/trunk
Files:
1 edited
1 copied
.
(modified)
(
1 prop
)
src/libraries/network/synchronisable/Serialise.h
(copied)
(copied from
code/branches/presentation2/src/libraries/network/synchronisable/Serialise.h
)
code/trunk
Property
svn:mergeinfo
changed
/code/branches/ingamemenu
(added)
merged:
6003,6018-6020,6022-6023
/code/branches/menu
(added)
merged:
5941,5944,5952,6024,6032,6036,6047-6049,6051,6145-6146,6148
/code/branches/particles2
(added)
merged:
6050,6059,6065-6068,6076,6078-6082,6086-6087,6098-6099,6101,6109
/code/branches/presentation2
(added)
merged:
6106-6108,6110-6124,6127-6141,6143-6144,6147,6149-6162,6164-6197,6199,6201-6210,6212-6219,6222-6224,6226-6228,6230-6239,6241,6243-6245,6247-6248,6250-6252,6254-6262,6265-6266,6268-6273,6276-6287,6289-6293,6295,6298-6303,6305-6307,6310-6316,6318-6329,6332,6334-6336,6338-6389,6391-6404,6406-6411,6413,6415-6416
/code/branches/sound3
(added)
merged:
5941,5943,5946,5954,5956-5957,5962,5982,6031,6046,6069-6072,6074,6088,6093,6097,6100,6102
/code/branches/steering
(added)
merged:
5979,5981,5984,5993,6001,6033,6045,6052,6055,6058,6091
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive