Commit graph

126 commits

Author SHA1 Message Date
FrozenCow
4ae5707505 Merge remote-tracking branch 'kilandor/master' 2011-03-10 12:03:56 +01:00
Jason Booth
15e7417807 Fix client side timestamp problem
Added Support for standalone webchat by reading a json file
Fix for jsonfile-interval in code
Added working php script with spam prevention, for webchat
2011-03-10 00:11:43 -06:00
Jason Booth
912dd0694b Cleanup Moved CSS and JS to matching folders 2011-03-09 17:43:24 -06:00
Arthur Mayer
6e5ee07aab important fix for css, forgotten in my last commit, FrozenCow, please
pull
2011-03-09 17:36:15 +01:00
FrozenCow
78041a4168 Fixed not being able to follow players. 2011-03-08 01:22:03 +01:00
FrozenCow
d06a0ecb4b Changed chat-mechanism a bit. 2011-03-07 22:07:34 +01:00
FrozenCow
b5f9d68127 Renamed embedded.css to embedded_example.css. 2011-03-07 21:04:37 +01:00
Arthur Mayer
8e0ba28efa another fix 2011-03-07 08:14:41 +01:00
Arthur Mayer
1b0b513e1f css fixes, allow to use dynmap embedded into a website or standalone. 2011-03-07 08:10:30 +01:00
Arthur Mayer
8d2066d280 fix, json has boolean, so checking for boolean and not string.
thanks dashkal for testing that
2011-03-07 07:48:46 +01:00
Arthur Mayer
aba85ac512 added option to disable webchat input 2011-03-07 07:07:48 +01:00
Arthur Mayer
4c552eb6ba merged latest changes, added ability to embed dynmap into a website. 2011-03-07 03:45:42 +01:00
FrozenCow
e613a59aa3 Added prefix to flatmap. 2011-03-06 14:45:26 +01:00
FrozenCow
a29c29ae2b Fixed unfollowing when panning to another player. 2011-03-05 17:43:41 +01:00
FrozenCow
fe0ece8235 Fixed map-icons. 2011-03-05 17:42:07 +01:00
FrozenCow
429e6a4880 Changed skin url from minecraft.net to s3.amazonaws.com. 2011-03-01 18:21:15 +01:00
FrozenCow
2209934068 Merge remote-tracking branch 'flames/master' 2011-03-01 02:01:51 +01:00
FrozenCow
9eb2d1a6a0 Implemented FlatMap fullrender + required clientlib. 2011-03-01 01:59:33 +01:00
Arthur Mayer
4458d5e399 moved all images to separate folder 2011-03-01 00:01:35 +01:00
FrozenCow
7bff552a62 Added shitty-looking top-down flat map. 2011-02-28 19:26:05 +01:00
FrozenCow
0210635822 Better error status message. 2011-02-28 19:23:25 +01:00
FrozenCow
fba2345811 Alertbox does not open when opening page anymore. 2011-02-26 21:33:02 +01:00
FrozenCow
f4dcfe77a9 Nicer invalid update-url handling (for invalid world-names or non-existing worlds). 2011-02-26 20:27:54 +01:00
FrozenCow
344c95e9b6 Reverted back to "== '13'" like flames suggested before. This seemed to raise incompatiblities for Firefox and Safari on Mac, not on Linux. 2011-02-24 00:38:46 +01:00
FrozenCow
c70d3266fc Small cleanup. 2011-02-24 00:16:10 +01:00
FrozenCow
857c57b8ae Change for the inner nerd in me. 2011-02-24 00:06:36 +01:00
Arthur Mayer
835ce85c0c lechd updated override example 2011-02-23 23:28:28 +01:00
Arthur Mayer
acf9698102 lechd's new override style to let the sidebar always open and hides
also the icon
2011-02-23 23:03:26 +01:00
Arthur Mayer
8a19ea8ffc fixed chat sending messages from web.
event.keyCode === '13', where the strict equal operator seem to break
safari, firefox and chrome (different value types? keydown event seem
not to provide either a string nor an integer)
2011-02-23 21:26:51 +01:00
FrozenCow
32277d9433 Simplified tile-mechanism again (a bit like hMod's version). 2011-02-23 14:06:13 +01:00
FrozenCow
aa36ae6f69 Applied style-change of lechd. 2011-02-23 12:40:05 +01:00
FrozenCow
aa62f36c11 Merge remote-tracking branch 'kilandor/master' into nowebserver
Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlayerListener.java
	src/main/java/org/dynmap/DynmapPlugin.java
	web/map.js
2011-02-22 17:58:39 +01:00
FrozenCow
af319952f8 Applied some suggestions by JSLint. 2011-02-22 15:38:49 +01:00
FrozenCow
5504761670 Player per world support @ client. 2011-02-22 14:49:03 +01:00
FrozenCow
8a24ae87f0 Added entry for css overrides and cleaned up styles by lechd. 2011-02-20 23:55:16 +01:00
FrozenCow
4ffa2a0026 New buttons and example override css by lechd. 2011-02-20 22:11:28 +01:00
FrozenCow
a7316ef893 Added lechd's new images. 2011-02-20 18:47:18 +01:00
Arthur Mayer
82f3cc213b removed forgotten comma 2011-02-20 02:02:45 +01:00
Arthur Mayer
11296264f2 a lot of changes. chat and ui related. thanks FrozenCow & lechd 2011-02-20 01:58:53 +01:00
Jason Booth
8469b323d3 Added timestamp support to Update Tiles and Chat.
New web config to handle for jsonfile method
Modified webclient to handle timestamps to prevent duplication.
Removed duplicate code in JsonTimerTask.java
2011-02-19 18:55:01 -06:00
FrozenCow
3f1ba85456 Made chatinput reset after send. 2011-02-19 21:16:14 +01:00
FrozenCow
85720cce0a Made sendmessage url relative. 2011-02-19 21:08:14 +01:00
Arthur Mayer
f3078e5c3b many ui iprovements by lechd 2011-02-19 20:51:21 +01:00
FrozenCow
9d2af0f641 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-19 16:31:36 +01:00
FrozenCow
a71fa73361 Added WebChat back to web. 2011-02-19 16:31:13 +01:00
Arthur Mayer
512ed19429 removed my custom url, made it relative 2011-02-19 08:26:40 +01:00
Arthur Mayer
b8dd0abb0c corrected the json string in sendChat() 2011-02-18 20:15:18 +01:00
Arthur Mayer
e82f1fd7ef uups. removed debug alert, added function call 2011-02-18 11:15:05 +01:00
Arthur Mayer
71d29198bd added chatSend() function 2011-02-18 10:21:55 +01:00
Arthur Mayer
b5654208ee chat interface added, config option changed from showchatballoons:
ture/false to showchat: balloons/modal
2011-02-18 07:08:29 +01:00