Commit Graph

17168 Commits

Author SHA1 Message Date
hiker
2df97ebc39 Disable skipping of ready-set-go in artist debug mode when networking
(can desynchronise client and server).
2017-01-04 08:18:41 +11:00
hiker
e5c5870564 Removed debug output. 2017-01-04 08:11:17 +11:00
hiker
069e916dc0 Added state updates, not fully working yet. 2016-12-30 13:35:48 +11:00
hiker
31619aecff Merge remote-tracking branch 'origin/master' into game_protocol 2016-12-20 10:31:24 +11:00
hiker
084869263d Use a sort function to sort the rewind info events and network events,
so that the merge function can be used to combine them. The RewindManager
is now threadsafe.
2016-12-20 09:41:50 +11:00
auria.mg
da795b69ed Better fix for #2687 2016-12-17 18:49:00 -05:00
auria.mg
2b13a5643e Ignore the "applesmc" accelerator as input device. see #2691 2016-12-17 17:43:03 -05:00
Deve
f314c1ff2a Some improvements for multitouch steering GUI
- move it to separate class, so that it can be displayed in Overworld too
- add a possibility to scale the interface (atm. only in config.xml)
- touch steering buttons are created only for single player races

I removed unused drawEnergyMeter function from Overworld GUI. The reason was that I use this function from race_gui.cpp for nitro button and this function in overworld breaks it. And still the proper drawEnergyMeter function is available in race_gui.cpp and can be moved to RaceGuiBase if it will be needed in Overworld in future.

I moved the font size computation to the top of constructor because I use it to check available space for minimap.
2016-12-17 23:28:22 +01:00
auria.mg
488af78fa3 Fix #2687, reset cameras properly 2016-12-16 21:03:05 -05:00
auria.mg
fc9a51b7f4 Reset cameras when resetting 3 strikes battle. Fixes #2687 2016-12-16 20:33:30 -05:00
auria.mg
5f0a65a07b Fix bug where an animated texture matrix could never be reset to identity. Fixes #2692 2016-12-16 20:21:09 -05:00
hiker
1e372d6e77 Added separate queue for storing network events (to reduce synchronisation);
replaced vector with std::list in preparation for making the RewindManager
threadsafe.
2016-12-17 10:32:21 +11:00
hiker
5cde8f785f Fix crash in normal race (RaceEventManager NULL). 2016-12-16 23:26:34 +11:00
hiker
77c14152c2 The server now uses the RewindManager to receive network events
and takes the kart input from this queue of events.
2016-12-15 08:12:04 +11:00
hiker
95ca3fcac1 Try to fix rare GUI crash, likely caused by pushing a screen in the
network thread while the gui is being drawn. Made the messages
causing this synchronous, i.e. executed by the main thread.
2016-12-15 08:10:04 +11:00
hiker
177c8c8f63 Merge remote-tracking branch 'origin/simplify-world' into game_protocol 2016-12-13 17:17:25 +11:00
hiker
4ee6f6315f Made World::m_weather a singleton to further remove dependencies on World. 2016-12-13 17:14:29 +11:00
hiker
32f2196201 Removed unnecessary #include world.hpp. 2016-12-13 17:13:54 +11:00
hiker
ed7574ca85 Merge remote-tracking branch 'origin/master' into simplify-world 2016-12-13 09:19:24 +11:00
hiker
4d406490e1 Made ScriptingEngine a singleton and removed it from World, which reduces
more dependencies on world.
2016-12-13 09:18:59 +11:00
hiker
b12453e9ca Made Physics a singleton, removing the accessor functions from World.
Removes dependency on World for a few files.
2016-12-13 08:31:08 +11:00
hiker
cd149ab5d7 Moved m_track out of World into a static m_track in Track. Makes
world smaller and removes a few dependencies on World.
2016-12-13 07:53:33 +11:00
auria.mg
044e8c52e1 Fix tabs added in previous commit, used spaces instead... 2016-12-11 20:19:58 -05:00
auria.mg
ab7ded308a Make presentation of kart characteristics uniform and indepdendent of difficulty. Fixes #2684, fixes #2539 2016-12-11 20:16:44 -05:00
Corentin Pazdera
aaecd58fc0 Adding appveyor config file (#2652)
I am unfamiliar with appveyor myself but I can merge the file. Next step would be for someone to take a look at settuping an account
2016-12-11 19:52:15 -05:00
Daniel Ölschlegel
62e1a2ddcc Add a little more BSD detection (#2685)
Tested for NetBSD, the same signature has DragonFly(http://fxr.watson.org/fxr/source/sys/endian.h?v=DFBSD#L42)
2016-12-11 19:16:47 -05:00
Daniel Butum
244c812cf3 Add travis server only matrix configuration (#2682)
Also increase number of threads for the gcc builds
2016-12-11 19:15:37 -05:00
hiker
8785ddf148 Moved force-fog settings into track. 2016-12-12 08:05:07 +11:00
samuncle
ae0b1136f5 better shader for underwater vegetation 2016-12-09 11:38:56 -05:00
hiker
22092e6459 Moved background/clear color from world to irr_driver. 2016-12-09 17:14:04 +11:00
hiker
b73d08d089 Removed unnecessary cast. 2016-12-09 16:39:59 +11:00
hiker
0a2ea4bd08 Removed unused functions. 2016-12-09 16:39:37 +11:00
hiker
a8d3b6b0df Fixed compiler warning. 2016-12-09 09:18:56 +11:00
hiker
04d1d4817a Removed KartUpdate protocol (which breakes online play). 2016-12-09 09:00:20 +11:00
hiker
4d065f67e6 Started to introduce GameProtocol (which will combine several
individual protocols.
2016-12-09 08:55:06 +11:00
hiker
dbfaf2105b Merge remote-tracking branch 'origin/master' into nw 2016-12-08 13:36:36 +11:00
hiker
fed12f774c Fixed potential deadlock, made debug output more useful. 2016-12-08 09:46:44 +11:00
Deve
66f57ada61 Fixed a crash when GLES device is re-created 2016-12-07 00:08:16 +01:00
hiker
32daf4ce29 Removed unused functions. 2016-12-07 09:34:33 +11:00
Deve
5fad8a135e Destroy egl context on exit 2016-12-06 23:32:04 +01:00
Deve
c013fcea61 Allow to log messages to file on android 2016-12-06 23:31:49 +01:00
hiker
95e627c004 Fixed pi compilation. 2016-12-07 00:28:36 +11:00
hiker
63fe4373a8 Removed unnecessary #ifdef. 2016-12-06 21:50:23 +11:00
hiker
8b806dd35a Fixed compiler warnings. 2016-12-06 18:46:03 +11:00
hiker
1939075a1b Merge remote-tracking branch 'origin/master' into nw 2016-12-06 18:45:17 +11:00
hiker
fdfb56ddf8 Fix server-only compilation. 2016-12-06 18:10:31 +11:00
hiker
746bac00ce Merge remote-tracking branch 'origin/new-pi' into nw 2016-12-06 09:26:07 +11:00
hiker
526b2a8f0d Added two more graph connections. 2016-12-06 09:22:13 +11:00
hiker
79ad569542 Only allow LAN connections for LAN servers (previously anyone with
the IP address could connect, even from the outside). Added new
--public-server command line option to enable public WAN server.
2016-12-06 09:10:05 +11:00
Deve
23883b83c1 Fixed a crash on startup.
As written in the documentation: "The returned modifiers string is owned by Xlib and should not be modified or freed by the client."
2016-12-04 23:23:09 +01:00